X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=code%2Fnetwork-topology-instance-generator%2Fmodel%2Fpython%2Ftapi_common_context.py;h=75381a80fc98d6619b78724de9973e8e226a1b76;hb=9a0d7d6f6b9bb268514d0c0e75c071fd297a425a;hp=03d779b0951b98d7286388b0910ec50a0734bdd0;hpb=f1c3447904c59b75833a9bc0e3365117a7d9f2c6;p=oam.git diff --git a/code/network-topology-instance-generator/model/python/tapi_common_context.py b/code/network-topology-instance-generator/model/python/tapi_common_context.py index 03d779b..75381a8 100644 --- a/code/network-topology-instance-generator/model/python/tapi_common_context.py +++ b/code/network-topology-instance-generator/model/python/tapi_common_context.py @@ -60,14 +60,18 @@ class TapiCommonContext(Top): """ return self.__data - def json(self) -> Dict: + def json(self, running: bool) -> Dict: """ Getter for a json object representing the TAPI Topology Context. :return TAPI Common Context as json object. """ result = self.data().copy() - if self.__context is not None: + if self.__context is not None and running is False: result["tapi-common:context"].update(self.__context.json()) + + if running is True and "tapi-topology:topology-context" in result["tapi-common:context"]: + result["tapi-common:context"].pop("tapi-topology:topology-context") + return result def identifier(self) -> str: @@ -113,7 +117,10 @@ class TapiCommonContext(Top): root.append(desc) title=etree.Element("title") - title.text=self.configuration()["network"]["name"] + if "name" in self.configuration()["network"]: + title.text=self.configuration()["network"]["name"] + else: + title.text="o-ran-sc-topology-view" root.append(title) root.append(self.__context.svg(x, y))