From: Martin Skorupski Date: Mon, 30 Sep 2024 11:19:36 +0000 (+0200) Subject: Integrate an NRCellDU into the topology X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=27a17fd87e755289aedf5cbec51191666db78991;p=oam.git Integrate an NRCellDU into the topology - adopt on TP level Issue-ID: OAM-418 Change-Id: If001001f66b4413ffd39f9d6d1feb042919c9817 Signed-off-by: Martin Skorupski --- 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 04c0771..ae0265f 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 @@ -28,6 +28,7 @@ from network_generation.model.python.o_ran_object import ( # Define the "IORanObject" interface class IORanTerminationPoint(IORanObject): supporter: dict[str, str] + network: Any default_value: IORanTerminationPoint = cast( @@ -35,7 +36,8 @@ default_value: IORanTerminationPoint = cast( { **ORanObject.default(), **{ - "supporter": {} + "supporter": {}, + "network": None, }, }, ) @@ -54,6 +56,7 @@ class ORanTerminationPoint(ORanObject): itp: IORanTerminationPoint = self._to_itp_data(data) super().__init__(cast(dict[str, Any], itp), **kwargs) self._supporter = cast(dict[str, str], itp["supporter"]) + self._network: Any = itp["network"] def _to_itp_data(self, data: dict[str, Any]) -> IORanTerminationPoint: result: IORanTerminationPoint = default_value @@ -70,6 +73,16 @@ class ORanTerminationPoint(ORanObject): def supporter(self, value: dict[str, str]) -> None: self._supporter = value + @property + def network( + self, + ) -> Any: # expected is ORanNetwork + return self._network + + @network.setter + def network(self, value: Any) -> None: + self._network = value + def to_topology(self) -> dict[str, Any]: result: dict[str, Any] = { "tp-id": self.name,