Topo: Add supported-tps to logical TPs
- parent is not specific anymore
- add support of type dict
Issue-ID: OAM-417
Change-Id: I668fe36092419d211c040ce7bfa9b4b114d87e70
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>
diff --git a/code/network-generator/network_generation/model/python/o_ran_termination_point.py b/code/network-generator/network_generation/model/python/o_ran_termination_point.py
index 8b8d76b..3dd4d84 100644
--- a/code/network-generator/network_generation/model/python/o_ran_termination_point.py
+++ b/code/network-generator/network_generation/model/python/o_ran_termination_point.py
@@ -21,14 +21,13 @@
from network_generation.model.python.o_ran_object import (
IORanObject,
- ORanObject,
+ ORanObject
)
# Define the "IORanObject" interface
class IORanTerminationPoint(IORanObject):
- supporter: str
- parent: Any
+ supporter: dict[str, str]
default_value: IORanTerminationPoint = cast(
@@ -36,8 +35,7 @@
{
**ORanObject.default(),
**{
- "supporter": "TerminationPointLayer",
- "parent": None,
+ "supporter": {}
},
},
)
@@ -55,8 +53,7 @@
) -> None:
itp: IORanTerminationPoint = self._to_itp_data(data)
super().__init__(cast(dict[str, Any], itp), **kwargs)
- self._supporter: str = str(itp["supporter"])
- self._parent: Any = itp["parent"]
+ self._supporter = cast(dict[str, str], itp["supporter"])
def _to_itp_data(self, data: dict[str, Any]) -> IORanTerminationPoint:
result: IORanTerminationPoint = default_value
@@ -66,33 +63,19 @@
return result
@property
- def supporter(self) -> str:
+ def supporter(self) -> dict[str, str]:
return self._supporter
@supporter.setter
- def supporter(self, value: str) -> None:
+ def supporter(self, value: dict[str, str]) -> None:
self._supporter = value
- @property
- def parent(self) -> Any:
- return self._utilization
-
- @parent.setter
- def parent(self, value: Any) -> None:
- self._parent = value
-
def to_topology(self) -> dict[str, Any]:
result: dict[str, Any] = {
"tp-id": self.name,
"o-ran-sc-network:uuid": self.id,
"o-ran-sc-network:type": self.type,
}
- if self.supporter and type(self.parent) is not int:
- result["supporting-termination-point"] = [
- {
- "network-ref": self.parent.network.id,
- "node-ref": self.parent.name,
- "tp-ref": self.supporter,
- }
- ]
+ if self.supporter:
+ result["supporting-termination-point"] = [self.supporter]
return result