Topo: Add supported-tps to logical TPs

- remove termination point specifics

Issue-ID: OAM-417
Change-Id: I4a240266f97d1e051931c8b8365a22d2ed66aa7f
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/code/network-generator/network_generation/model/python/o_ran_near_rt_ric.py b/code/network-generator/network_generation/model/python/o_ran_near_rt_ric.py
index 47579b7..69ac6ae 100644 (file)
--- a/code/network-generator/network_generation/model/python/o_ran_near_rt_ric.py
+++ b/code/network-generator/network_generation/model/python/o_ran_near_rt_ric.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 "IORanNearRtRic" interface
@@ -41,6 +38,9 @@ IORanNearRtRic = IORanNode
 
 # Define an abstract O-RAN Node class
 class ORanNearRtRic(ORanNode):
+
+    _interfaces = ["e2", "o1", "ofhm", "ofhc", "ofhu", "ofhs"]
+
     def __init__(
         self,
         data: dict[str, Any] = cast(dict[str, Any], default_value),
@@ -110,23 +110,6 @@ class ORanNearRtRic(ORanNode):
                 result.append(tower)
         return result
 
-    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", "e2"]:
-            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:
         ric: ET.Element = ET.Element("Folder")
         open: ET.Element = ET.SubElement(ric, "open")