From fdd6265193bfe360bb46b53442ee4bd1d4ffd388 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 17 Mar 2025 00:09:27 +0000
Subject: [PATCH] Service component:
- Renamed service handler e2e_orch to optical_tfs
---
.../OpticalTfsServiceHandler.py} | 28 +++++++++----------
.../{e2e_orch => optical_tfs}/__init__.py | 0
2 files changed, 14 insertions(+), 14 deletions(-)
rename src/service/service/service_handlers/{e2e_orch/E2EOrchestratorServiceHandler.py => optical_tfs/OpticalTfsServiceHandler.py} (90%)
rename src/service/service/service_handlers/{e2e_orch => optical_tfs}/__init__.py (100%)
diff --git a/src/service/service/service_handlers/e2e_orch/E2EOrchestratorServiceHandler.py b/src/service/service/service_handlers/optical_tfs/OpticalTfsServiceHandler.py
similarity index 90%
rename from src/service/service/service_handlers/e2e_orch/E2EOrchestratorServiceHandler.py
rename to src/service/service/service_handlers/optical_tfs/OpticalTfsServiceHandler.py
index 9512f242c..93dfce19e 100644
--- a/src/service/service/service_handlers/e2e_orch/E2EOrchestratorServiceHandler.py
+++ b/src/service/service/service_handlers/optical_tfs/OpticalTfsServiceHandler.py
@@ -26,9 +26,9 @@ from service.service.task_scheduler.TaskExecutor import TaskExecutor
LOGGER = logging.getLogger(__name__)
-METRICS_POOL = MetricsPool('Service', 'Handler', labels={'handler': 'e2e_orch'})
+METRICS_POOL = MetricsPool('Service', 'Handler', labels={'handler': 'optical_tfs'})
-class E2EOrchestratorServiceHandler(_ServiceHandler):
+class OpticalTfsServiceHandler(_ServiceHandler):
def __init__( # pylint: disable=super-init-not-called
self, service : Service, task_executor : TaskExecutor, **settings
) -> None:
@@ -47,7 +47,7 @@ class E2EOrchestratorServiceHandler(_ServiceHandler):
service_uuid = self.__service.service_id.service_uuid.uuid
settings = self.__settings_handler.get('/settings')
json_settings : Dict = {} if settings is None else settings.value
- bitrate = json_settings.get('bitrate', 1000)
+ bitrate = json_settings['bitrate']
results = []
try:
@@ -64,10 +64,10 @@ class E2EOrchestratorServiceHandler(_ServiceHandler):
controller = src_controller
json_config_rule = json_config_rule_set('/services/service[{:s}]'.format(service_uuid), {
- 'uuid' : service_uuid,
- 'src_node' : src_endpoint_uuid,
- 'dst_node' : dst_endpoint_uuid,
- 'bitrate' : bitrate
+ 'uuid' : service_uuid,
+ 'src_node' : src_endpoint_uuid,
+ 'dst_node' : dst_endpoint_uuid,
+ 'bitrate' : bitrate
})
del controller.device_config.config_rules[:]
controller.device_config.config_rules.append(ConfigRule(**json_config_rule))
@@ -90,8 +90,8 @@ class E2EOrchestratorServiceHandler(_ServiceHandler):
service_uuid = self.__service.service_id.service_uuid.uuid
settings = self.__settings_handler.get('/settings')
json_settings : Dict = {} if settings is None else settings.value
- flow_id = json_settings.get('flow_id', 100)
- bitrate = json_settings.get('bitrate', 1000)
+ flow_id = json_settings['flow_id']
+ bitrate = json_settings['bitrate']
results = []
try:
@@ -108,11 +108,11 @@ class E2EOrchestratorServiceHandler(_ServiceHandler):
controller = src_controller
json_config_rule = json_config_rule_set('/services/service[{:s}]'.format(service_uuid), {
- 'uuid' : service_uuid,
- 'flow_id' : flow_id,
- 'src_node' : src_endpoint_uuid,
- 'dst_node' : dst_endpoint_uuid,
- 'bitrate' : bitrate
+ 'uuid' : service_uuid,
+ 'flow_id' : flow_id,
+ 'src_node' : src_endpoint_uuid,
+ 'dst_node' : dst_endpoint_uuid,
+ 'bitrate' : bitrate
})
del controller.device_config.config_rules[:]
diff --git a/src/service/service/service_handlers/e2e_orch/__init__.py b/src/service/service/service_handlers/optical_tfs/__init__.py
similarity index 100%
rename from src/service/service/service_handlers/e2e_orch/__init__.py
rename to src/service/service/service_handlers/optical_tfs/__init__.py
--
GitLab