Skip to content
Snippets Groups Projects
Commit fdd62651 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Service component:

- Renamed service handler e2e_orch to optical_tfs
parent d582c17d
No related branches found
No related tags found
3 merge requests!359Release TeraFlowSDN 5.0,!328Resolve "(CTTC) Update recommendations to use SocketIO on NBI and E2E Orch components",!286Resolve "(CTTC) Implement integration test between E2E-IP-Optical SDN Controllers"
...@@ -26,9 +26,9 @@ from service.service.task_scheduler.TaskExecutor import TaskExecutor ...@@ -26,9 +26,9 @@ from service.service.task_scheduler.TaskExecutor import TaskExecutor
LOGGER = logging.getLogger(__name__) 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 def __init__( # pylint: disable=super-init-not-called
self, service : Service, task_executor : TaskExecutor, **settings self, service : Service, task_executor : TaskExecutor, **settings
) -> None: ) -> None:
...@@ -47,7 +47,7 @@ class E2EOrchestratorServiceHandler(_ServiceHandler): ...@@ -47,7 +47,7 @@ class E2EOrchestratorServiceHandler(_ServiceHandler):
service_uuid = self.__service.service_id.service_uuid.uuid service_uuid = self.__service.service_id.service_uuid.uuid
settings = self.__settings_handler.get('/settings') settings = self.__settings_handler.get('/settings')
json_settings : Dict = {} if settings is None else settings.value json_settings : Dict = {} if settings is None else settings.value
bitrate = json_settings.get('bitrate', 1000) bitrate = json_settings['bitrate']
results = [] results = []
try: try:
...@@ -64,10 +64,10 @@ class E2EOrchestratorServiceHandler(_ServiceHandler): ...@@ -64,10 +64,10 @@ class E2EOrchestratorServiceHandler(_ServiceHandler):
controller = src_controller controller = src_controller
json_config_rule = json_config_rule_set('/services/service[{:s}]'.format(service_uuid), { json_config_rule = json_config_rule_set('/services/service[{:s}]'.format(service_uuid), {
'uuid' : service_uuid, 'uuid' : service_uuid,
'src_node' : src_endpoint_uuid, 'src_node' : src_endpoint_uuid,
'dst_node' : dst_endpoint_uuid, 'dst_node' : dst_endpoint_uuid,
'bitrate' : bitrate 'bitrate' : bitrate
}) })
del controller.device_config.config_rules[:] del controller.device_config.config_rules[:]
controller.device_config.config_rules.append(ConfigRule(**json_config_rule)) controller.device_config.config_rules.append(ConfigRule(**json_config_rule))
...@@ -90,8 +90,8 @@ class E2EOrchestratorServiceHandler(_ServiceHandler): ...@@ -90,8 +90,8 @@ class E2EOrchestratorServiceHandler(_ServiceHandler):
service_uuid = self.__service.service_id.service_uuid.uuid service_uuid = self.__service.service_id.service_uuid.uuid
settings = self.__settings_handler.get('/settings') settings = self.__settings_handler.get('/settings')
json_settings : Dict = {} if settings is None else settings.value json_settings : Dict = {} if settings is None else settings.value
flow_id = json_settings.get('flow_id', 100) flow_id = json_settings['flow_id']
bitrate = json_settings.get('bitrate', 1000) bitrate = json_settings['bitrate']
results = [] results = []
try: try:
...@@ -108,11 +108,11 @@ class E2EOrchestratorServiceHandler(_ServiceHandler): ...@@ -108,11 +108,11 @@ class E2EOrchestratorServiceHandler(_ServiceHandler):
controller = src_controller controller = src_controller
json_config_rule = json_config_rule_set('/services/service[{:s}]'.format(service_uuid), { json_config_rule = json_config_rule_set('/services/service[{:s}]'.format(service_uuid), {
'uuid' : service_uuid, 'uuid' : service_uuid,
'flow_id' : flow_id, 'flow_id' : flow_id,
'src_node' : src_endpoint_uuid, 'src_node' : src_endpoint_uuid,
'dst_node' : dst_endpoint_uuid, 'dst_node' : dst_endpoint_uuid,
'bitrate' : bitrate 'bitrate' : bitrate
}) })
del controller.device_config.config_rules[:] del controller.device_config.config_rules[:]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment