From 438225f6454e0217629535a81d3bc65b0aea14da Mon Sep 17 00:00:00 2001 From: Martin Skorupski Date: Mon, 30 Sep 2024 13:22:44 +0200 Subject: [PATCH] Integrate an NRCellDU into the topology - adopt on cell level Issue-ID: OAM-418 Change-Id: If026f30b24e6976f76c5c16fd3437ffd21b1d316 Signed-off-by: Martin Skorupski --- .../network_generation/model/python/nr_cell_du.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/code/network-generator/network_generation/model/python/nr_cell_du.py b/code/network-generator/network_generation/model/python/nr_cell_du.py index 1fea1a3..a81bafc 100644 --- a/code/network-generator/network_generation/model/python/nr_cell_du.py +++ b/code/network-generator/network_generation/model/python/nr_cell_du.py @@ -27,9 +27,6 @@ from network_generation.model.python.geo_location import ( IGeoLocation, ) from network_generation.model.python.o_ran_node import IORanNode, ORanNode -from network_generation.model.python.o_ran_termination_point import ( - ORanTerminationPoint, -) from network_generation.model.python.point import Point @@ -57,6 +54,9 @@ default_value: INrCellDu = cast( # Define an abstract O-RAN Node class class NrCellDu(ORanNode): + + _interfaces = ["cell"] + def __init__( self, data: dict[str, Any] = cast(dict[str, Any], default_value), @@ -110,14 +110,6 @@ class NrCellDu(ORanNode): def azimuth(self, value: int) -> None: self._azimuth = value - def termination_points(self) -> list[ORanTerminationPoint]: - result: list[ORanTerminationPoint] = super().termination_points() - result.append(ORanTerminationPoint({ - "name": self.name, - "type": "o-ran-sc-network:cell" - })) - return result - def to_topology_nodes(self) -> list[dict[str, Any]]: # a cell is not a node it is a Termination Point result: list[dict[str, Any]] = [] # super().to_topology_nodes() -- 2.16.6