Code Review
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Prepare project for python template
[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
42ff19b
..
6339335
100644
(file)
--- a/
code/network-generator/model/python/o_ran_network.py
+++ b/
code/network-generator/model/python/o_ran_network.py
@@
-38,7
+38,7
@@
class ORanNetwork(ORanObject):
self.__configuration = configuration
self.name = configuration["name"]
self.center = configuration["center"]
self.__configuration = configuration
self.name = configuration["name"]
self.center = configuration["center"]
- size = configuration["pattern"]["
o-ran-r
u"]["max-reach"]
+ 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,7
+60,7
@@
class ORanNetwork(ORanObject):
)
self._o_ran_smo = ORanSmo(
{
)
self._o_ran_smo = ORanSmo(
{
- "name": "SMO",
+ "name": "
O-RAN-
SMO",
"geoLocation": self.center,
"layout": layout,
"spiralRadiusProfile": spiral_radius_profile,
"geoLocation": self.center,
"layout": layout,
"spiralRadiusProfile": spiral_radius_profile,
@@
-98,17
+98,12
@@
class ORanNetwork(ORanObject):
def toKml(self) -> ET.Element:
root: ET.Element = ET.Element("kml", xmlns="http://www.opengis.net/kml/2.2")
document = ET.SubElement(root, "Document")
def toKml(self) -> ET.Element:
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