X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=code%2Fnetwork-generator%2Fmodel%2Fpython%2Fo_ran_near_rt_ric.py;h=f533328edf032bb275c9b06ce487588cd275f84c;hb=c8e3bd35883f540afe023fd077ad64cde327e18a;hp=1f4979cc10670caefcf4521ecc17309505ff3e91;hpb=1aba139d06eb93db29f2775887549cbcec800e7b;p=oam.git

diff --git a/code/network-generator/model/python/o_ran_near_rt_ric.py b/code/network-generator/model/python/o_ran_near_rt_ric.py
index 1f4979c..f533328 100644
--- a/code/network-generator/model/python/o_ran_near_rt_ric.py
+++ b/code/network-generator/model/python/o_ran_near_rt_ric.py
@@ -17,10 +17,14 @@
 """
 A Class representing an O-RAN Near real-time intelligent controller (ORanNearRtRic)
 """
+from typing import overload
 from model.python.tower import Tower
 from model.python.o_ran_cu import ORanCu
 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
+from model.python.hexagon import Hex
+import model.python.hexagon as Hexagon
 import xml.etree.ElementTree as ET
 
 
@@ -34,42 +38,80 @@ class IORanNearRtRic(IORanObject):
 class ORanNearRtRic(ORanNode, IORanNearRtRic):
     def __init__(self, o_ran_near_rt_ric_data: IORanNearRtRic = None, **kwargs):
         super().__init__(o_ran_near_rt_ric_data, **kwargs)
-        self._o_ran_cus: list(ORanCu) = self._calculate_o_ran_cus()
+        self._o_ran_cus: list[ORanCu] = self._calculate_o_ran_cus()
 
-    def _calculate_o_ran_cus(self):
+    def _calculate_o_ran_cus(self) -> list[ORanCu]:
         hex_ring_radius: int = self.spiralRadiusProfile.oRanNearRtRicSpiralRadiusOfOCus
-        index: int = 0
-        s: str = "00" + str(index)
-        name: str = "O-RAN-CU-" + s[len(s) - 2 : len(s)]
-        result: list(ORanCu) = []
-        result.append(
-            ORanCu(
-                {
-                    "name": name,
-                    "geoLocation": self.geoLocation,
-                    "position": self.position,
-                    "layout": self.layout,
-                    "spiralRadiusProfile": self.spiralRadiusProfile,
-                    "parent": self,
-                }
-            )
+        hex_list: list[Hex] = self.spiralRadiusProfile.oRanCuSpiral(
+            self.position, hex_ring_radius
         )
+        result: list[ORanCu] = []
+        for index, hex in enumerate(hex_list):
+            s: str = "00" + str(index)
+            name: str = "-".join(
+                [self.name.replace("NearRtRic", "CU"), s[len(s) - 2 : len(s)]]
+            )
+            network_center: dict = self.parent.parent.center
+            newGeo = Hexagon.hex_to_geo_location(
+                self.layout, hex, network_center
+            ).json()
+            result.append(
+                ORanCu(
+                    {
+                        "name": name,
+                        "geoLocation": newGeo,
+                        "position": hex,
+                        "layout": self.layout,
+                        "spiralRadiusProfile": self.spiralRadiusProfile,
+                        "parent": self
+                    }
+                )
+            )
         return result
 
     @property
-    def o_ran_cus(self):
+    def o_ran_cus(self) -> list[ORanCu]:
         return self._o_ran_cus
 
     @property
-    def towers(self):
-        result: list(Tower) = []
+    def towers(self) -> list[Tower]:
+        result: list[Tower] = []
         for cu in self.o_ran_cus:
             for tower in cu.towers:
                 result.append(tower)
         return result
 
-    def toKml(self):
-        return None
+    @property
+    def termination_points(self) -> list[ORanTerminationPoint]:
+        result: list[ORanTerminationPoint] = super().termination_points
+        phy_tp: str = "-".join([self.name, "phy".upper()])
+        result.append({"tp-id": phy_tp, "name": phy_tp})
+        for interface in ["a1", "o1", "o2", "e2"]:
+            id:str = "-".join([self.name, interface.upper()])
+            result.append(ORanTerminationPoint({"id": id, "name":id, "supporter": phy_tp, "parent":self}))
+        return result
+
+    def to_topology_nodes(self) -> list[dict[str, dict]]:
+        result: list[dict[str, dict]] = super().to_topology_nodes()
+        for o_ran_cu in self.o_ran_cus:
+            result.extend(o_ran_cu.to_topology_nodes())
+        return result
+
+    def to_topology_links(self) -> list[dict[str, dict]]:
+        result: list[dict[str, dict]] = super().to_topology_links()
+        for o_ran_cu in self.o_ran_cus:
+            result.extend(o_ran_cu.to_topology_links())
+        return result
+    
+    def toKml(self) -> ET.Element:
+        ric: ET.Element = ET.Element("Folder")
+        open: ET.Element = ET.SubElement(ric, "open")
+        open.text = "1"
+        name: ET.Element = ET.SubElement(ric, "name")
+        name.text = self.name
+        for o_ran_cu in self.o_ran_cus:
+            ric.append(o_ran_cu.toKml())
+        return ric
 
-    def toSvg(self):
+    def toSvg(self) -> None:
         return None