From faa647536105ce9988e54d31843190894f1f593e Mon Sep 17 00:00:00 2001 From: gifrerenom <lluis.gifre@cttc.es> Date: Thu, 22 Dec 2022 15:36:35 +0000 Subject: [PATCH] Service component - MicroWave service handler - corrected service resource keys - corrected endpoint count in set/delete endpoint methods --- .../service_handlers/microwave/MicrowaveServiceHandler.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/service/service/service_handlers/microwave/MicrowaveServiceHandler.py b/src/service/service/service_handlers/microwave/MicrowaveServiceHandler.py index 5b05160de..fb54a1bc1 100644 --- a/src/service/service/service_handlers/microwave/MicrowaveServiceHandler.py +++ b/src/service/service/service_handlers/microwave/MicrowaveServiceHandler.py @@ -81,7 +81,7 @@ class MicrowaveServiceHandler(_ServiceHandler): device_uuid = endpoints[0][0] device = self.__task_executor.get_device(DeviceId(**json_device_id(device_uuid))) - json_config_rule = json_config_rule_set('/service[{:s}]'.format(service_uuid), { + json_config_rule = json_config_rule_set('/services/service[{:s}]'.format(service_uuid), { 'uuid' : service_uuid, 'node_id_src': node_id_src, 'tp_id_src' : tp_id_src, @@ -111,11 +111,13 @@ class MicrowaveServiceHandler(_ServiceHandler): results = [] try: chk_type('endpoints', endpoints, list) - if len(endpoints) != 2: raise Exception('len(endpoints) != 2') + if len(endpoints) < 1: raise Exception('len(endpoints) < 1') device_uuid = endpoints[0][0] device = self.__task_executor.get_device(DeviceId(**json_device_id(device_uuid))) - json_config_rule = json_config_rule_delete('/service[{:s}]'.format(service_uuid), {'uuid': service_uuid}) + json_config_rule = json_config_rule_delete('/services/service[{:s}]'.format(service_uuid), { + 'uuid': service_uuid + }) del device.device_config.config_rules[:] device.device_config.config_rules.append(ConfigRule(**json_config_rule)) self.__task_executor.configure_device(device) -- GitLab