diff --git a/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/ClientNamespace.py b/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/ClientNamespace.py index 168a136de75d542a8b9741b7401b0c65d225d4aa..b20b5a5f00c5813966fbc813bfd5514fdd00ad8f 100644 --- a/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/ClientNamespace.py +++ b/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/ClientNamespace.py @@ -54,7 +54,7 @@ class ClientNamespace(socketio.ClientNamespace): reply['_request_key'] = request_key try: reply['result'] = result.result() - event = reply['result']['event'] + event = reply['result'].pop('event') except Exception as e: reply['error'] = str(e) #reply['stacktrace'] = str(e) @@ -87,7 +87,7 @@ class ClientNamespace(socketio.ClientNamespace): reply['_request_key'] = request_key try: reply['result'] = result.result() - event = reply['result']['event'] + event = reply['result'].pop('event') except Exception as e: reply['error'] = str(e) #reply['stacktrace'] = str(e) diff --git a/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/Dispatcher.py b/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/Dispatcher.py index 4fd45285707eec0357bf7805137a6b1179731d71..6913014ad1ae6cef9a954eb27f2e2323c50c8aca 100644 --- a/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/Dispatcher.py +++ b/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/Dispatcher.py @@ -43,12 +43,13 @@ class RecommendationDispatcher(_Dispatcher): service_client = ServiceClient() service_id = service_client.CreateService(Service(**vlink_optical_service_add)) - vlink_optical_service['service_id']['service_uuid']['uuid'] = service_id.service_uuid.uuid + service_uuid = service_id.service_uuid.uuid + vlink_optical_service['service_id']['service_uuid']['uuid'] = service_uuid service_id = service_client.UpdateService(Service(**vlink_optical_service)) - result = {'event': 'vlink_created'} + result = {'event': 'vlink_created', 'vlink_uuid': service_uuid} elif request.action == RecommendationAction.VLINK_REMOVE: - vlink_service_uuid = request.data['link_id']['link_uuid']['uuid'] + vlink_service_uuid = request.data['link_uuid']['uuid'] context_id = json_context_id(DEFAULT_CONTEXT_NAME) vlink_optical_service_id = json_service_id(vlink_service_uuid, context_id=context_id)