From 2c4b3f4236ce28c0322e5d4401ee520dc1145d1a Mon Sep 17 00:00:00 2001 From: gifrerenom Date: Wed, 27 Sep 2023 11:04:27 +0000 Subject: [PATCH] Interdomain component: - Added ToDo for Topology Abstractor - Minor cosmetic changes - Minor comment corrections --- .../topology_abstractor/AbstractDevice.py | 2 +- .../service/topology_abstractor/ToDo.txt | 22 +++++++++++++++++++ .../topology_abstractor/TopologyAbstractor.py | 4 ++-- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/interdomain/service/topology_abstractor/ToDo.txt diff --git a/src/interdomain/service/topology_abstractor/AbstractDevice.py b/src/interdomain/service/topology_abstractor/AbstractDevice.py index 3341dec32..c3b1b89ee 100644 --- a/src/interdomain/service/topology_abstractor/AbstractDevice.py +++ b/src/interdomain/service/topology_abstractor/AbstractDevice.py @@ -44,7 +44,7 @@ class AbstractDevice: self.__device_type : DeviceTypeEnum = device_type self.__device : Optional[Device] = None - # Dict[device_uuid, Dict[endpoint_name, abstract EndPoint]] + # Dict[device_name, Dict[endpoint_name, abstract EndPoint]] self.__device_endpoint_to_abstract : Dict[str, Dict[str, EndPoint]] = dict() # Dict[endpoint_name, device_name] diff --git a/src/interdomain/service/topology_abstractor/ToDo.txt b/src/interdomain/service/topology_abstractor/ToDo.txt new file mode 100644 index 000000000..203a38a9d --- /dev/null +++ b/src/interdomain/service/topology_abstractor/ToDo.txt @@ -0,0 +1,22 @@ +for some reason, context(inter):topology(admin) is being created + - applies when topology abstractor is activated + - seems it is not due to interdomain, but DLT + - check if DLT is creating context(inter) and rest of weird entities + - given now IDC works with names, might happen that + - DLT is not recognizing local events + - IDC is sending to DLT wrong records + - revalidate all logs + +- re-validate nfv-sdn'22 demo + +- in domain 1, context(admin)/topo(admin) abstracted domain is shown +- in domain 1, context(admin)/topo(inter) not rendered properly +- in domain 1 there is a wrongly formatted link: +UUID Name Endpoints +2a955dca-7282-51b6-bf02-46be28ad4b0e DC1/D1==R1@D1/DC1 D1 / Device: DC1 + DC1 / Device: R1@D1 +2adc48f1-fbea-5a3d-a7e1-3a28a1351ffa 37b8964d-dac2-5a2b-8bae-35d3154fbf20/DC1==cda90d2f-e7b0-5837-8f2e-2fb29dd9b367/86fce79b-e474-54d7-8a6f-5b2c10cad6c2 + DC1 / Device: D1 + D1 / Device: DC1 + +- in domain 2 it is shown an error in webui while accessing context(d1)/topo(admin) diff --git a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py index ba8792095..357b300a7 100644 --- a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py +++ b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py @@ -266,8 +266,8 @@ class TopologyAbstractor(threading.Thread): abstract_link_name = AbstractLink.compose_name(device_name, endpoint_name, endpoint_name, device_name) LOGGER.info('[_infer_abstract_links] abstract_link_name={:s}'.format(str(abstract_link_name))) LOGGER.info('[_infer_abstract_links] abstract_links={:s}'.format(str({ - abstract_link_name:abstract_link_obj.to_json() - for abstract_link_name,abstract_link_obj in self.abstract_links.items() + abstract_link_name : abstract_link_obj.to_json() + for abstract_link_name, abstract_link_obj in self.abstract_links.items() }))) if abstract_link_name in self.abstract_links: continue -- GitLab