diff --git a/manifests/ztpservice.yaml b/manifests/ztpservice.yaml
index 98a31c86b63aba6fabafaebf0831469505a3ba6b..53ce98b22f55cf98e3d16023b03bb660b9de4917 100644
--- a/manifests/ztpservice.yaml
+++ b/manifests/ztpservice.yaml
@@ -104,22 +104,22 @@ spec:
limits:
cpu: 2000m
memory: 2048Mi
-# ---
-# apiVersion: autoscaling/v2
-# kind: HorizontalPodAutoscaler
-# metadata:
-# name: ztpservice-hpa
-# spec:
-# scaleTargetRef:
-# apiVersion: apps/v1
-# kind: Deployment
-# name: ztpservice
-# minReplicas: 1
-# maxReplicas: 10
-# metrics:
-# - type: Resource
-# resource:
-# name: cpu
-# target:
-# type: Utilization
-# averageUtilization: 80
+# ---
+# apiVersion: autoscaling/v2
+# kind: HorizontalPodAutoscaler
+# metadata:
+# name: ztpservice-hpa
+# spec:
+# scaleTargetRef:
+# apiVersion: apps/v1
+# kind: Deployment
+# name: ztpservice
+# minReplicas: 1
+# maxReplicas: 10
+# metrics:
+# - type: Resource
+# resource:
+# name: cpu
+# target:
+# type: Utilization
+# averageUtilization: 80
diff --git a/src/e2e_orchestrator/service/E2EOrchestratorServiceServicerImpl.py b/src/e2e_orchestrator/service/E2EOrchestratorServiceServicerImpl.py
index bb8e66aa63d103f6bea9f11509c6c011253f7659..4fc0ea3ba45a85bb3b1dccb18191dc1b4e380404 100644
--- a/src/e2e_orchestrator/service/E2EOrchestratorServiceServicerImpl.py
+++ b/src/e2e_orchestrator/service/E2EOrchestratorServiceServicerImpl.py
@@ -238,4 +238,4 @@ class E2EOrchestratorServiceServicerImpl(E2EOrchestratorServiceServicer):
path.connections.append(conn)
-
+ return path
diff --git a/src/nbi/service/__main__.py b/src/nbi/service/__main__.py
index 70917e7882a05e9e5af11f83bc657c2cfd0e19bc..fb735f8a775e8cce1bc696ed4f148b2ab0ec9dcc 100644
--- a/src/nbi/service/__main__.py
+++ b/src/nbi/service/__main__.py
@@ -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:
diff --git a/src/nbi/service/rest_server/nbi_plugins/tfs_api/Resources.py b/src/nbi/service/rest_server/nbi_plugins/tfs_api/Resources.py
index d2bf2f889e98575989073dc5ac823b09c5ad22bd..28f94887a1aa9895a337baa40b3896e3d7e95dc1 100644
--- a/src/nbi/service/rest_server/nbi_plugins/tfs_api/Resources.py
+++ b/src/nbi/service/rest_server/nbi_plugins/tfs_api/Resources.py
@@ -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,
@@ -297,7 +296,7 @@ class Links(_Resource):
class Link(_Resource):
def get(self, link_uuid : str):
- return format_grpc_to_json(self.context_client.GetLink(grpc_link_id(link_uuid)))
+ return format_grpc_to_json(self.context_client.GetLink(grpc_link_id(link_uuid)))
def put(self, link_uuid : str):
link_json = request.get_json()
diff --git a/src/nbi/service/rest_server/nbi_plugins/tfs_api/Tools.py b/src/nbi/service/rest_server/nbi_plugins/tfs_api/Tools.py
index 6ed1d7be905fdb8b5fef3f96ea20b1e8a7b75429..bb10ee375f0ecdf7b63459b300dd0ff0fed40615 100644
--- a/src/nbi/service/rest_server/nbi_plugins/tfs_api/Tools.py
+++ b/src/nbi/service/rest_server/nbi_plugins/tfs_api/Tools.py
@@ -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
diff --git a/src/nbi/service/rest_server/nbi_plugins/tfs_api/__init__.py b/src/nbi/service/rest_server/nbi_plugins/tfs_api/__init__.py
index 22bc52dc0c55c2a93809e3fb59159048c1355b7c..ac3e0b1b765ce0b61405760c5684bc7b3aaa6b25 100644
--- a/src/nbi/service/rest_server/nbi_plugins/tfs_api/__init__.py
+++ b/src/nbi/service/rest_server/nbi_plugins/tfs_api/__init__.py
@@ -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,
@@ -31,38 +30,38 @@ URL_PREFIX = '/tfs-api'
# Use 'path' type since some identifiers might contain char '/' and Flask is unable to recognize them in 'string' type.
RESOURCES = [
# (endpoint_name, resource_class, resource_url)
- ('api.context_ids', ContextIds, '/context_ids'),
- ('api.contexts', Contexts, '/contexts'),
- ('api.dummy_contexts', DummyContexts, '/dummy_contexts'),
- ('api.context', Context, '/context/<path:context_uuid>'),
+ ('api.context_ids', ContextIds, '/context_ids'),
+ ('api.contexts', Contexts, '/contexts'),
+ ('api.dummy_contexts', DummyContexts, '/dummy_contexts'),
+ ('api.context', Context, '/context/<path:context_uuid>'),
- ('api.topology_ids', TopologyIds, '/context/<path:context_uuid>/topology_ids'),
- ('api.topologies', Topologies, '/context/<path:context_uuid>/topologies'),
- ('api.topology', Topology, '/context/<path:context_uuid>/topology/<path:topology_uuid>'),
+ ('api.topology_ids', TopologyIds, '/context/<path:context_uuid>/topology_ids'),
+ ('api.topologies', Topologies, '/context/<path:context_uuid>/topologies'),
+ ('api.topology', Topology, '/context/<path:context_uuid>/topology/<path:topology_uuid>'),
- ('api.service_ids', ServiceIds, '/context/<path:context_uuid>/service_ids'),
- ('api.services', Services, '/context/<path:context_uuid>/services'),
- ('api.service', Service, '/context/<path:context_uuid>/service/<path:service_uuid>'),
+ ('api.service_ids', ServiceIds, '/context/<path:context_uuid>/service_ids'),
+ ('api.services', Services, '/context/<path:context_uuid>/services'),
+ ('api.service', Service, '/context/<path:context_uuid>/service/<path:service_uuid>'),
- ('api.slice_ids', SliceIds, '/context/<path:context_uuid>/slice_ids'),
- ('api.slices', Slices, '/context/<path:context_uuid>/slices'),
- ('api.slice', Slice, '/context/<path:context_uuid>/slice/<path:slice_uuid>'),
+ ('api.slice_ids', SliceIds, '/context/<path:context_uuid>/slice_ids'),
+ ('api.slices', Slices, '/context/<path:context_uuid>/slices'),
+ ('api.slice', Slice, '/context/<path:context_uuid>/slice/<path:slice_uuid>'),
- ('api.device_ids', DeviceIds, '/device_ids'),
- ('api.devices', Devices, '/devices'),
- ('api.device', Device, '/device/<path:device_uuid>'),
+ ('api.device_ids', DeviceIds, '/device_ids'),
+ ('api.devices', Devices, '/devices'),
+ ('api.device', Device, '/device/<path:device_uuid>'),
- ('api.link_ids', LinkIds, '/link_ids'),
- ('api.links', Links, '/links'),
- ('api.link', Link, '/link/<path:link_uuid>'),
+ ('api.link_ids', LinkIds, '/link_ids'),
+ ('api.links', Links, '/links'),
+ ('api.link', Link, '/link/<path:link_uuid>'),
- ('api.connection_ids', ConnectionIds, '/context/<path:context_uuid>/service/<path:service_uuid>/connection_ids'),
- ('api.connections', Connections, '/context/<path:context_uuid>/service/<path:service_uuid>/connections'),
- ('api.connection', Connection, '/connection/<path:connection_uuid>'),
+ ('api.connection_ids', ConnectionIds, '/context/<path:context_uuid>/service/<path:service_uuid>/connection_ids'),
+ ('api.connections', Connections, '/context/<path:context_uuid>/service/<path:service_uuid>/connections'),
+ ('api.connection', Connection, '/connection/<path:connection_uuid>'),
- ('api.policyrule_ids', PolicyRuleIds, '/policyrule_ids'),
- ('api.policyrules', PolicyRules, '/policyrules'),
- ('api.policyrule', PolicyRule, '/policyrule/<path:policyrule_uuid>'),
+ ('api.policyrule_ids', PolicyRuleIds, '/policyrule_ids'),
+ ('api.policyrules', PolicyRules, '/policyrules'),
+ ('api.policyrule', PolicyRule, '/policyrule/<path:policyrule_uuid>'),
]
def register_tfs_api(rest_server : RestServer):