Commit acf8c193 authored by Carlos Manso's avatar Carlos Manso
Browse files

Merge branch...

Merge branch 'feat/147-integrate-support-for-ip-e2e-optical-sdn-controllers-to-manage-hierarchical-virtual' of https://labs.etsi.org/rep/tfs/controller into feat/147-integrate-support-for-ip-e2e-optical-sdn-controllers-to-manage-hierarchical-virtual
parents 1359da7a 0303c9a3
Loading
Loading
Loading
Loading
+1 −1
Changes for src/e2e_orchestrator/service/E2EOrchestratorServiceServicerImpl.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -238,4 +238,4 @@ class E2EOrchestratorServiceServicerImpl(E2EOrchestratorServiceServicer):

            path.connections.append(conn)

        return path
+0 −7
Changes for src/nbi/service/__main__.py: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -82,13 +82,6 @@ def main():
    rest_server.start()

    register_context_subscription()
    LOGGER.debug('Configured Resources:')
    for resource in rest_server.api.resources:
        LOGGER.debug(' - {:s}'.format(str(resource)))

    LOGGER.debug('Configured Rules:')
    for rule in rest_server.app.url_map.iter_rules():
        LOGGER.debug(' - {:s}'.format(str(rule)))

    LOGGER.debug('Configured Resources:')
    for resource in rest_server.api.resources:
+2 −3
Changes for src/nbi/service/rest_server/nbi_plugins/tfs_api/Resources.py: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -13,18 +13,17 @@
# limitations under the License.

import json
import logging
from flask.json import jsonify
from flask_restful import Resource, request
from werkzeug.exceptions import BadRequest
from common.proto.context_pb2 import Empty
from common.proto.context_pb2 import Empty, LinkTypeEnum
from common.tools.grpc.Tools import grpc_message_to_json
from context.client.ContextClient import ContextClient
from device.client.DeviceClient import DeviceClient
from service.client.ServiceClient import ServiceClient
from slice.client.SliceClient import SliceClient
from vnt_manager.client.VNTManagerClient import VNTManagerClient
import logging
from common.proto.context_pb2 import LinkTypeEnum

from .Tools import (
    format_grpc_to_json, grpc_connection_id, grpc_context, grpc_context_id, grpc_device,
+1 −1
Changes for src/nbi/service/rest_server/nbi_plugins/tfs_api/Tools.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ from common.tools.grpc.Tools import grpc_message_to_json
from common.tools.object_factory.Connection import json_connection_id
from common.tools.object_factory.Context import json_context_id
from common.tools.object_factory.Device import json_device_id
from common.tools.object_factory.Link import json_link_id, json_link
from common.tools.object_factory.Link import json_link_id
from common.tools.object_factory.PolicyRule import json_policyrule_id
from common.tools.object_factory.Service import json_service_id
from common.tools.object_factory.Slice import json_slice_id
+0 −1
Changes for src/nbi/service/rest_server/nbi_plugins/tfs_api/__init__.py: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ from .Resources import (
    Device, DeviceIds, Devices,
    DummyContexts,
    Link, LinkIds, Links,
    VirtualLink, VirtualLinkIds, VirtualLinks,
    PolicyRule, PolicyRuleIds, PolicyRules,
    Service, ServiceIds, Services,
    Slice, SliceIds, Slices,
+19 −19

File changed.

Contains only whitespace changes.