Topo: Add supported-tps to logical TPs
- remove termination point specifics
Issue-ID: OAM-417
Change-Id: I2bb5ab6f3a902a1743ec688cf3b74f351e1e9a2d
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>
diff --git a/code/network-generator/network_generation/model/python/o_ran_cu.py b/code/network-generator/network_generation/model/python/o_ran_cu.py
index 1098d10..a8156ab 100644
--- a/code/network-generator/network_generation/model/python/o_ran_cu.py
+++ b/code/network-generator/network_generation/model/python/o_ran_cu.py
@@ -30,9 +30,6 @@
ORanNode,
default_value,
)
-from network_generation.model.python.o_ran_termination_point import (
- ORanTerminationPoint,
-)
from network_generation.model.python.tower import Tower
# Define the "IORanCu" interface
@@ -41,6 +38,9 @@
# Define an abstract O-RAN Node class
class ORanCu(ORanNode):
+
+ _interfaces = ["e2", "o1"]
+
def __init__(
self,
data: dict[str, Any] = cast(dict[str, Any], default_value),
@@ -104,22 +104,6 @@
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 ["e2", "o1"]:
- id: str = "-".join([self.name, interface.upper()])
- result.append(ORanTerminationPoint({
- "name": id,
- "supporter": phy_tp,
- "parent": self
- }))
- return result
-
def toKml(self) -> ET.Element:
o_ran_cu: ET.Element = ET.Element("Folder")
open: ET.Element = ET.SubElement(o_ran_cu, "open")