X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=code%2Fnetwork-generator%2Fmodel%2Fpython%2Fo_ran_du.py;h=7f1e5c62ee2d0417c2fac4b41cbf5f15b2a91e0d;hb=718e37645399f0d1be0c563c070b310d1ac66304;hp=eb2e74b0e1974029120efab6f32a9c73bad36303;hpb=eb3041f7efafc406c0c5eb114b40d86b028422fa;p=oam.git

diff --git a/code/network-generator/model/python/o_ran_du.py b/code/network-generator/model/python/o_ran_du.py
index eb2e74b..7f1e5c6 100644
--- a/code/network-generator/model/python/o_ran_du.py
+++ b/code/network-generator/model/python/o_ran_du.py
@@ -17,49 +17,66 @@
 """
 A Class representing an O-RAN distributed unit (ORanDu)
 """
-from model.python.tower import Tower
+from typing import overload
 from model.python.o_ran_object import IORanObject
 from model.python.o_ran_node import ORanNode
+from model.python.o_ran_termination_point import ORanTerminationPoint
 import xml.etree.ElementTree as ET
 
+
 # Define the "IORanDu" interface
 class IORanDu(IORanObject):
-    def __init__(self, **kwargs):
+    def __init__(self, o_ran_ru_count: int, **kwargs):
         super().__init__(**kwargs)
+        self._o_ran_ru_count = o_ran_ru_count
 
 
 # Define an abstract O-RAN Node class
 class ORanDu(ORanNode, IORanDu):
     def __init__(self, o_ran_du_data: IORanDu = None, **kwargs):
         super().__init__(o_ran_du_data, **kwargs)
-        self._towers: list(ORanDu) = self._calculate_towers()
+        self._o_ran_ru_count = (
+            o_ran_du_data["oRanRuCount"] if o_ran_du_data and "oRanRuCount" in o_ran_du_data else 1
+        )
+
+    @property
+    def termination_points(self) -> list[ORanTerminationPoint]:
+        result: list[ORanTerminationPoint] = super().termination_points
+        phy_tp: str = "-".join([self.name, "phy".upper()])
+        result.append(ORanTerminationPoint({"id": phy_tp, "name": phy_tp}))
+        for interface in ["e2", "o1", "ofhm", "ofhc", "ofhu","ofhs"]:
+            id:str = "-".join([self.name, interface.upper()])
+            result.append(ORanTerminationPoint({"id": id, "name":id, "supporter": phy_tp, "parent":self}))
+        return result
 
-    def _calculate_towers(self):
-        hex_ring_radius: int = self.spiralRadiusProfile.oRanDuSpiralRadiusOfTowers
-        index: int = 0
-        s: str = "00" + str(index)
-        name: str = "Tower-" + s[len(s) - 2 : len(s)]
-        result : list(Tower) = []
-        result.append(
-            Tower(
+    def to_topology_nodes(self) -> list[dict[str, dict]]:
+        result: list[dict[str, dict]] = super().to_topology_nodes()
+        return result
+
+    def to_topology_links(self) -> list[dict[str, dict]]:
+        result: list[dict[str, dict]] = super().to_topology_links()
+        for interface in ["e2", "o1"]:
+            link_id: str = "".join([interface, ":", self.name, "<->", self.parent.name])
+            source_tp: str = "-".join([self.name, interface.upper()])
+            dest_tp: str = "-".join([self.parent.name, interface.upper()])
+            result.append(
                 {
-                    "name": name,
-                    "geoLocation": self.geoLocation,
-                    "position": self.position,
-                    "layout": self.layout,
-                    "spiralRadiusProfile": self.spiralRadiusProfile,
-                    "parent": self
+                    "link-id": link_id,
+                    "source": {"source-node": self.name, "source-tp": source_tp},
+                    "destination": {"dest-node": self.parent.name, "dest-tp": dest_tp},
                 }
             )
-        )
         return result
-
-    @property
-    def towers(self):
-        return self._towers
     
-    def toKml(self):
-        return None
+    def toKml(self) -> ET.Element:
+        o_ran_du: ET.Element = ET.Element("Folder")
+        open: ET.Element = ET.SubElement(o_ran_du, "open")
+        open.text = "1"
+        name: ET.Element = ET.SubElement(o_ran_du, "name")
+        name.text = self.name
+        for tower in self.towers:
+            o_ran_du.append(tower.toKml())
+        return o_ran_du
 
-    def toSvg(self):
+    def toSvg(self) -> None:
         return None