Create Resource pool for O-DUs

 - new class for resource pools created
 - instanciated by O-RAN CU

Issue-ID: OAM-376
Change-Id: I012e3d0e4771dab62f6234c8dd424ce44396316d
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/code/network-generator/model/python/o_ran_cloud_du.py b/code/network-generator/model/python/o_ran_cloud_du.py
new file mode 100644 (file)
index 0000000..953fca6
--- /dev/null
+++ b/code/network-generator/model/python/o_ran_cloud_du.py
@@ -0,0 +1,86 @@
+# Copyright 2023 highstreet technologies GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/usr/bin/python
+
+"""
+A Class representing an O-RAN O-Cloud resource pool for O-RAN distributed units (ORanDu)
+By default all O-RAN-DUs associated with the towers around  are deployed here.
+Maybe dedicated hardware is required to host O-DUs, but it is expected 
+that the O-Cloud mechanism and concepts can be applied here.
+"""
+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 IORanCloudDu(IORanObject):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+
+# Implements a concrete O-RAN Node class
+class ORanCloudDu(ORanNode, IORanCloudDu):
+    def __init__(self, o_ran_du_data: IORanCloudDu = None, **kwargs):
+        super().__init__(o_ran_du_data, **kwargs)
+        self._towers: list[Tower] = self._calculate_towers()
+
+    def _calculate_towers(self) -> list[Tower]:
+        hex_ring_radius: int = self.spiralRadiusProfile.oRanDuSpiralRadiusOfTowers
+        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("O-Cloud-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) -> list[Tower]:
+        return self._towers
+
+    def toKml(self) -> ET.Element:
+        o_ran__cloud_du: ET.Element = ET.Element("Folder")
+        open: ET.Element = ET.SubElement(o_ran__cloud_du, "open")
+        open.text = "1"
+        name: ET.Element = ET.SubElement(o_ran__cloud_du, "name")
+        name.text = self.name
+        for tower in self.towers:
+            o_ran__cloud_du.append(tower.toKml())
+        return o_ran__cloud_du
+
+    def toSvg(self) -> None:
+        return None

diff --git a/code/network-generator/model/python/o_ran_cu.py b/code/network-generator/model/python/o_ran_cu.py
index 70e1e44..9069f36 100644 (file)
--- a/code/network-generator/model/python/o_ran_cu.py
+++ b/code/network-generator/model/python/o_ran_cu.py
@@ -16,11 +16,12 @@
 
 """
 A Class representing an O-RAN centralized unit (ORanCu)
+and at the same time a location for an O-Cloud resource pool
 """
 from model.python.cube import Cube
 from model.python.hexagon import Hex
 import model.python.hexagon as Hexagon
-from model.python.o_ran_du import ORanDu
+from model.python.o_ran_cloud_du import ORanCloudDu
 from model.python.tower import Tower
 from model.python.o_ran_object import IORanObject
 from model.python.o_ran_node import ORanNode
@@ -37,23 +38,23 @@ class IORanCu(IORanObject):
 class ORanCu(ORanNode, IORanCu):
     def __init__(self, o_ran_cu_data: IORanCu = None, **kwargs):
         super().__init__(o_ran_cu_data, **kwargs)
-        self._o_ran_dus: list[ORanCu] = self._calculate_o_ran_dus()
+        self._o_ran_cloud_dus: list[ORanCu] = self._calculate_o_ran_dus()
 
-    def _calculate_o_ran_dus(self) -> list[ORanDu]:
+    def _calculate_o_ran_dus(self) -> list[ORanCloudDu]:
         hex_ring_radius: int = self.spiralRadiusProfile.oRanCuSpiralRadiusOfODus
         hex_list: list[Hex] = self.spiralRadiusProfile.oRanDuSpiral(self.position, hex_ring_radius)
-        result: list[ORanDu] = []
+        result: list[ORanCloudDu] = []
         for index, hex in enumerate(hex_list):
             s: str = "00" + str(index)
             name: str = "-".join(
-                [self.name.replace("CU", "DU"), s[len(s) - 2 : len(s)]]
+                [self.name.replace("CU", "O-Cloud-DU"), s[len(s) - 2 : len(s)]]
             )
             network_center: dict = self.parent.parent.parent.center
             newGeo = Hexagon.hex_to_geo_location(
                 self.layout, hex, network_center
             ).json()
             result.append(
-                ORanDu(
+                ORanCloudDu(
                     {
                         "name": name,
                         "geoLocation": newGeo,
@@ -68,13 +69,13 @@ class ORanCu(ORanNode, IORanCu):
 
 
     @property
-    def o_ran_dus(self) -> list[ORanDu]:
-        return self._o_ran_dus
+    def o_ran_cloud_dus(self) -> list[ORanCloudDu]:
+        return self._o_ran_cloud_dus
 
     @property
     def towers(self) -> list[Tower]:
         result: list[Tower] = []
-        for du in self.o_ran_dus:
+        for du in self.o_ran_cloud_dus:
             for tower in du.towers:
                 result.append(tower)
         return result
@@ -85,7 +86,7 @@ class ORanCu(ORanNode, IORanCu):
         open.text = "1"
         name: ET.Element = ET.SubElement(o_ran_cu, "name")
         name.text = self.name
-        for o_ran_du in self.o_ran_dus:
+        for o_ran_du in self.o_ran_cloud_dus:
             o_ran_cu.append(o_ran_du.toKml())
         return o_ran_cu