Skip to content
Snippets Groups Projects
Commit d5a472db authored by Shayan Hajipour's avatar Shayan Hajipour
Browse files

Merge branch 'feat/241-cttc-l3nm-nce-service-handler-is-required' into camara-demo-integration

parents c0c928c0 eefc016a
No related branches found
No related tags found
3 merge requests!346Draft: support for restconf protocol,!345Draft: support ipinfusion devices via netconf,!321Resolve: "(CTTC) CAMARA Demo Integration tests"
...@@ -171,7 +171,6 @@ class L3NMNCEServiceHandler(_ServiceHandler): ...@@ -171,7 +171,6 @@ class L3NMNCEServiceHandler(_ServiceHandler):
endpoints: List[Tuple[str, str, Optional[str]]], endpoints: List[Tuple[str, str, Optional[str]]],
connection_uuid: Optional[str] = None, connection_uuid: Optional[str] = None,
) -> List[Union[bool, Exception]]: ) -> List[Union[bool, Exception]]:
LOGGER.debug(f"P3: {len(endpoints)} {endpoints}")
chk_type("endpoints", endpoints, list) chk_type("endpoints", endpoints, list)
if len(endpoints) == 0: if len(endpoints) == 0:
return [] return []
...@@ -207,7 +206,6 @@ class L3NMNCEServiceHandler(_ServiceHandler): ...@@ -207,7 +206,6 @@ class L3NMNCEServiceHandler(_ServiceHandler):
service_name = running_resource_value_dict["network-slice-services"][ service_name = running_resource_value_dict["network-slice-services"][
"slice-service" "slice-service"
][0]["id"] ][0]["id"]
LOGGER.debug(f"P1: {service_name}")
if not running_candidate_diff: # Slice Creation if not running_candidate_diff: # Slice Creation
operation_type = "create" operation_type = "create"
slice_services = candidate_resource_value_dict[ slice_services = candidate_resource_value_dict[
...@@ -328,7 +326,9 @@ class L3NMNCEServiceHandler(_ServiceHandler): ...@@ -328,7 +326,9 @@ class L3NMNCEServiceHandler(_ServiceHandler):
raise Exception( raise Exception(
"connection group missmatch in destination sdp and added connection group" "connection group missmatch in destination sdp and added connection group"
) )
match_criteria = removed_sdp["service-match-criteria"]["match-criterion"] match_criteria = removed_sdp["service-match-criteria"][
"match-criterion"
]
match_criterion = match_criteria[0] match_criterion = match_criteria[0]
for type_value in match_criterion["match-type"]: for type_value in match_criterion["match-type"]:
if type_value["type"] == "ietf-network-slice-service:source-ip-prefix": if type_value["type"] == "ietf-network-slice-service:source-ip-prefix":
...@@ -414,7 +414,7 @@ class L3NMNCEServiceHandler(_ServiceHandler): ...@@ -414,7 +414,7 @@ class L3NMNCEServiceHandler(_ServiceHandler):
self.__task_executor.configure_device(controller) self.__task_executor.configure_device(controller)
LOGGER.debug('Configured device "{:s}"'.format(controller.name)) LOGGER.debug('Configured device "{:s}"'.format(controller.name))
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
LOGGER.exception(f'P4: {e}') LOGGER.exception(f"P4: {e}")
raise e raise e
results.append(e) results.append(e)
return results return results
......
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