Code Review
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move cell configurations to cell level
[oam.git]
/
code
/
network-generator
/
model
/
python
/
o_ran_network.py
diff --git
a/code/network-generator/model/python/o_ran_network.py
b/code/network-generator/model/python/o_ran_network.py
index
55d3a38
..
6339335
100644
(file)
--- a/
code/network-generator/model/python/o_ran_network.py
+++ b/
code/network-generator/model/python/o_ran_network.py
@@
-16,14
+16,14
@@
"""
Module for a class representing a O-RAN Network
"""
"""
Module for a class representing a O-RAN Network
"""
-from typing import Any
, Dict, List
+from typing import Any
from model.python.o_ran_smo import ORanSmo
from model.python.o_ran_spiral_radius_profile import SpiralRadiusProfile
from model.python.o_ran_smo import ORanSmo
from model.python.o_ran_spiral_radius_profile import SpiralRadiusProfile
-from model.python.tower import Tower
from model.python.o_ran_object import IORanObject, ORanObject
import model.python.hexagon as Hexagon
from model.python.o_ran_object import IORanObject, ORanObject
import model.python.hexagon as Hexagon
-from model.python.hexagon import Hex, Layout, Point
+from model.python.hexagon import Layout
+from model.python.point import Point
import xml.etree.ElementTree as ET
import xml.etree.ElementTree as ET
@@
-33,12
+33,12
@@
class ORanNetwork(ORanObject):
"""
# constructor
"""
# constructor
- def __init__(self, configuration:
D
ict[str, Any], of: IORanObject = None, **kwargs):
+ def __init__(self, configuration:
d
ict[str, Any], of: IORanObject = None, **kwargs):
super().__init__(of, **kwargs)
self.__configuration = configuration
self.name = configuration["name"]
super().__init__(of, **kwargs)
self.__configuration = configuration
self.name = configuration["name"]
- center = configuration["center"]
- size = configuration["pattern"]["
o-ran-r
u"]["max-reach"]
+
self.
center = configuration["center"]
+ size = configuration["pattern"]["
nr-cell-d
u"]["max-reach"]
layout = Layout(
Hexagon.layout_flat, Point(size, size), Point(0, 0)
) # 1 pixel = 1 meter
layout = Layout(
Hexagon.layout_flat, Point(size, size), Point(0, 0)
) # 1 pixel = 1 meter
@@
-60,8
+60,8
@@
class ORanNetwork(ORanObject):
)
self._o_ran_smo = ORanSmo(
{
)
self._o_ran_smo = ORanSmo(
{
- "name": "SMO",
- "geoLocation": center,
+ "name": "
O-RAN-
SMO",
+ "geoLocation":
self.
center,
"layout": layout,
"spiralRadiusProfile": spiral_radius_profile,
"parent": self,
"layout": layout,
"spiralRadiusProfile": spiral_radius_profile,
"parent": self,
@@
-69,20
+69,20
@@
class ORanNetwork(ORanObject):
)
# getter
)
# getter
- def configuration(self) ->
Dict[str, D
ict]:
+ def configuration(self) ->
dict[str, d
ict]:
"""
Getter for a json object representing the O-RAN Network.
:return O-RAN Network as json object.
"""
return self.__configuration
"""
Getter for a json object representing the O-RAN Network.
:return O-RAN Network as json object.
"""
return self.__configuration
- def __appendNodes(self):
- result:
List[D
ict[str, Any]] = []
+ def __appendNodes(self)
-> list[dict[str, Any]]
:
+ result:
list[d
ict[str, Any]] = []
for tower in self._o_ran_smo.towers:
result.append(tower.toTopology())
return result
for tower in self._o_ran_smo.towers:
result.append(tower.toTopology())
return result
- def toTopology(self):
+ def toTopology(self)
-> dict[str, Any]
:
return {
"ietf-network:networks": {
"network": [
return {
"ietf-network:networks": {
"network": [
@@
-95,29
+95,24
@@
class ORanNetwork(ORanObject):
}
}
}
}
- def toKml(self):
+ def toKml(self)
-> ET.Element
:
root: ET.Element = ET.Element("kml", xmlns="http://www.opengis.net/kml/2.2")
document = ET.SubElement(root, "Document")
root: ET.Element = ET.Element("kml", xmlns="http://www.opengis.net/kml/2.2")
document = ET.SubElement(root, "Document")
- open = ET.SubElement(document, "open")
+ open
: ET.Element
= ET.SubElement(document, "open")
open.text = "1"
open.text = "1"
- name = ET.SubElement(document, "name")
+ name
: ET.Element
= ET.SubElement(document, "name")
name.text = self.name
name.text = self.name
- folder = ET.SubElement(document, "Folder")
- open = ET.SubElement(folder, "open")
- open.text = "1"
- name = ET.SubElement(folder, "name")
- name.text = "Towers"
- for tower in self._o_ran_smo.towers:
- folder.append(tower.toKml())
+
+ document.append(self._o_ran_smo.toKml())
return root
return root
- def toSvg(self):
+ def toSvg(self)
-> ET.Element
:
"""
Getter for a xml/svg Element object representing the Network.
:return Network as SVG object.
"""
"""
Getter for a xml/svg Element object representing the Network.
:return Network as SVG object.
"""
- root: Element = ET.Element(
+ root: E
T.E
lement = ET.Element(
"svg",
# width=str(self.__svg_width()),
# height=str(self.__svg_height()),
"svg",
# width=str(self.__svg_width()),
# height=str(self.__svg_height()),