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=19eb3d02087f05922a232bf33295706b54bd1b95;hb=3461ac19f233f610594196267199266dedcf57db;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..19eb3d0 100644
--- a/code/network-generator/model/python/o_ran_du.py
+++ b/code/network-generator/model/python/o_ran_du.py
@@ -17,11 +17,15 @@
 """
 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.tower import Tower
 from model.python.o_ran_object import IORanObject
 from model.python.o_ran_node import ORanNode
 import xml.etree.ElementTree as ET
 
+
 # Define the "IORanDu" interface
 class IORanDu(IORanObject):
     def __init__(self, **kwargs):
@@ -32,34 +36,48 @@ 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._towers: list(ORanDu) = self._calculate_towers()
+        self._towers: list[Tower] = self._calculate_towers()
 
-    def _calculate_towers(self):
+    def _calculate_towers(self) -> list[Tower]:
         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(
-                {
-                    "name": name,
-                    "geoLocation": self.geoLocation,
-                    "position": self.position,
-                    "layout": self.layout,
-                    "spiralRadiusProfile": self.spiralRadiusProfile,
-                    "parent": self
-                }
+        hex_list: list[Hex] = Cube.spiral(self.position, hex_ring_radius)
+        result: list[Tower] = []
+        for index, hex in enumerate(hex_list):
+            s: str = "00" + str(index)
+            name: str = "-".join(
+                [self.name.replace("DU", "Tower"), 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(
+                Tower(
+                    {
+                        "name": name,
+                        "geoLocation": newGeo,
+                        "position": hex,
+                        "layout": self.layout,
+                        "spiralRadiusProfile": self.spiralRadiusProfile,
+                        "parent": self,
+                    }
+                )
             )
-        )
         return result
 
     @property
-    def towers(self):
+    def towers(self) -> list[Tower]:
         return self._towers
-    
-    def toKml(self):
-        return None
 
-    def toSvg(self):
+    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) -> None:
         return None