From dbccdc11db04e6ed50d9ca25c79e54a31c2c91c6 Mon Sep 17 00:00:00 2001 From: Martin Skorupski Date: Sat, 28 Sep 2024 14:42:31 +0200 Subject: [PATCH] Topo: Add supported-tps to logical TPs - remove termination point specifics Issue-ID: OAM-417 Change-Id: I808984227ca30d1b8a5528a5817f0ac8f50a44c1 Signed-off-by: Martin Skorupski --- .../network_generation/model/python/o_ran_smo.py | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/code/network-generator/network_generation/model/python/o_ran_smo.py b/code/network-generator/network_generation/model/python/o_ran_smo.py index 4fd1cd2..d774d46 100644 --- a/code/network-generator/network_generation/model/python/o_ran_smo.py +++ b/code/network-generator/network_generation/model/python/o_ran_smo.py @@ -30,9 +30,6 @@ from network_generation.model.python.o_ran_node import ( ORanNode, default_value, ) -from network_generation.model.python.o_ran_termination_point import ( - ORanTerminationPoint, -) from network_generation.model.python.tower import Tower # Define the "IORanSmo" interface @@ -44,6 +41,7 @@ class ORanSmo(ORanNode): """ Class representing an O-RAN Service Management and Operation object. """ + _interfaces = ["a1", "o1", "o2"] def __init__( self, @@ -112,24 +110,6 @@ class ORanSmo(ORanNode): result.append(tower) return result - # @property - def termination_points(self) -> list[ORanTerminationPoint]: - result: list[ORanTerminationPoint] = super().termination_points() - phy_tp: str = "-".join([self.name, "phy".upper()]) - result.append(ORanTerminationPoint({ - "name": phy_tp, - "type": "o-ran-sc-network:phy" - })) - for interface in ["a1", "o1", "o2"]: - id: str = "-".join([self.name, interface.upper()]) - result.append(ORanTerminationPoint({ - "name": id, - "type": ":".join(["o-ran-sc-network", interface]), - "supporter": phy_tp, - "parent": self - })) - return result - def toKml(self) -> ET.Element: smo: ET.Element = ET.Element("Folder") open: ET.Element = ET.SubElement(smo, "open") -- 2.16.6