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=081a73825d3d040cab82af5591a7c4103e077099;hpb=eb61f78711dc62a2c230602ea49f72e9e4a10978;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 081a738..7f1e5c6 100644
--- a/code/network-generator/model/python/o_ran_du.py
+++ b/code/network-generator/model/python/o_ran_du.py
@@ -17,12 +17,10 @@
 """
 A Class representing an O-RAN distributed unit (ORanDu)
 """
-import model.python.hexagon as Hexagon
-from model.python.hexagon import Hex
-from model.python.cube import Cube
-from model.python.o_ran_ru import ORanRu
+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
 
 
@@ -37,37 +35,39 @@ class IORanDu(IORanObject):
 class ORanDu(ORanNode, IORanDu):
     def __init__(self, o_ran_du_data: IORanDu = None, **kwargs):
         super().__init__(o_ran_du_data, **kwargs)
-        self._o_ran_rus: list[ORanRu] = self._calculate_o_ran_rus()
+        self._o_ran_ru_count = (
+            o_ran_du_data["oRanRuCount"] if o_ran_du_data and "oRanRuCount" in o_ran_du_data else 1
+        )
 
-    def _calculate_o_ran_rus(self) -> list[ORanRu]:
-        result: list[ORanRu] = []
-        for index in range(self._o_ran_ru_count):
-            s: str = "00" + str(index)
-            name: str = "-".join(
-                [self.name.replace("DU", "RU"), s[len(s) - 2 : len(s)]]
-            )
-            network_center: dict = self.parent.parent.parent.parent.center
-            newGeo = Hexagon.hex_to_geo_location(
-                self.layout, hex, network_center
-            ).json()
-            result.append(
-                ORanRu(
-                    {
-                        "name": name,
-                        "geoLocation": newGeo,
-                        "position": hex,
-                        "layout": self.layout,
-                        "spiralRadiusProfile": self.spiralRadiusProfile,
-                        "parent": self,
-                    }
-                )
-            )
+    @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
 
-    @property
-    def o_ran_rus(self) -> list[ORanRu]:
-        return self._o_ran_rus
+    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(
+                {
+                    "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
+    
     def toKml(self) -> ET.Element:
         o_ran_du: ET.Element = ET.Element("Folder")
         open: ET.Element = ET.SubElement(o_ran_du, "open")