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;fp=code%2Fnetwork-generator%2Fmodel%2Fpython%2Fo_ran_near_rt_ric.py;h=f533328edf032bb275c9b06ce487588cd275f84c;hb=718e37645399f0d1be0c563c070b310d1ac66304;hp=a375e685513f5748e4ae5ed5febea1f03d10170e;hpb=cbdb3c52ee47d804b4202c77082109ef3c561594;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 a375e68..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,12 @@
 """
 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
@@ -36,7 +38,7 @@ 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) -> list[ORanCu]:
         hex_ring_radius: int = self.spiralRadiusProfile.oRanNearRtRicSpiralRadiusOfOCus
@@ -79,6 +81,28 @@ class ORanNearRtRic(ORanNode, IORanNearRtRic):
                 result.append(tower)
         return result
 
+    @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")