From 7f1e6dd1d0aee98bb35a67f445370e466bfd7304 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 18 Mar 2025 13:57:06 +0000
Subject: [PATCH] E2E Orchestrator component:
- Corrected vnt recommendations message formatting
---
.../dispatchers/recommendation/ClientNamespace.py | 4 ++--
.../subscriptions/dispatchers/recommendation/Dispatcher.py | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/ClientNamespace.py b/src/e2e_orchestrator/service/subscriptions/dispatchers/recommendation/ClientNamespace.py
index 168a136de..b20b5a5f0 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 4fd452857..6913014ad 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)
--
GitLab