From 98b07b5da982529cdec2db98f5b96902ed47323b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 9 Feb 2023 17:59:30 +0100 Subject: [PATCH] Turn PortMappingImpl into a component This is a simple component with three constituents. Split it out of blueprint. Also, remove portMapppingVersionXX parameter from OpenRoadmUnterfacesImplXX and adapt code consequently. Change-Id: I0036d0609276374538a26ec13fa03153446e8644 Signed-off-by: Robert Varga --- .../common/mapping/PortMappingImpl.java | 15 +++++++++- .../OpenRoadmInterfacesImpl221.java | 5 ++-- .../OpenRoadmInterfacesImpl710.java | 5 ++-- .../OSGI-INF/blueprint/common-blueprint.xml | 28 +------------------ .../tpce/module/TransportPCEImpl.java | 4 +-- .../olm/OlmPowerServiceRpcImplTest.java | 6 ++-- .../olm/power/PowerMgmtPowerMockTest.java | 6 ++-- 7 files changed, 25 insertions(+), 44 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java index 85f7280ba..9d15dffac 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java @@ -21,6 +21,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.Network; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.OpenroadmNodeVersion; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; @@ -34,10 +35,13 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.open import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +@Component public class PortMappingImpl implements PortMapping { private static final Logger LOG = LoggerFactory.getLogger(PortMappingImpl.class); @@ -47,6 +51,15 @@ public class PortMappingImpl implements PortMapping { private final PortMappingVersion221 portMappingVersion22; private final PortMappingVersion121 portMappingVersion121; + @Activate + public PortMappingImpl(@Reference DataBroker dataBroker, + @Reference DeviceTransactionManager deviceTransactionManager) { + this(dataBroker, + new PortMappingVersion710(dataBroker, deviceTransactionManager), + new PortMappingVersion221(dataBroker, deviceTransactionManager), + new PortMappingVersion121(dataBroker, deviceTransactionManager)); + } + public PortMappingImpl(DataBroker dataBroker, PortMappingVersion710 portMappingVersion710, PortMappingVersion221 portMappingVersion22, PortMappingVersion121 portMappingVersion121) { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java index c31e82fed..e3a0d83b9 100755 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl221.java @@ -47,11 +47,10 @@ public class OpenRoadmInterfacesImpl221 { private final PortMapping portMapping; private final PortMappingVersion221 portMapping221; - public OpenRoadmInterfacesImpl221(DeviceTransactionManager deviceTransactionManager, - PortMapping portMapping, PortMappingVersion221 portMapping221) { + public OpenRoadmInterfacesImpl221(DeviceTransactionManager deviceTransactionManager, PortMapping portMapping) { this.deviceTransactionManager = deviceTransactionManager; this.portMapping = portMapping; - this.portMapping221 = portMapping221; + this.portMapping221 = portMapping.getPortMappingVersion221(); } public void postInterface(String nodeId, InterfaceBuilder ifBuilder) throws OpenRoadmInterfaceException { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java index 2ae9eec00..7adf3950c 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl710.java @@ -47,11 +47,10 @@ public class OpenRoadmInterfacesImpl710 { private final PortMapping portMapping; private final PortMappingVersion710 portMapping710; - public OpenRoadmInterfacesImpl710(DeviceTransactionManager deviceTransactionManager, - PortMapping portMapping, PortMappingVersion710 portMapping710) { + public OpenRoadmInterfacesImpl710(DeviceTransactionManager deviceTransactionManager, PortMapping portMapping) { this.deviceTransactionManager = deviceTransactionManager; this.portMapping = portMapping; - this.portMapping710 = portMapping710; + this.portMapping710 = portMapping.getPortMappingVersion710(); } public void postInterface(String nodeId, InterfaceBuilder ifBuilder) throws OpenRoadmInterfaceException { diff --git a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml index 5f59db573..b57d2b577 100644 --- a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml +++ b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml @@ -9,9 +9,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + @@ -20,13 +20,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - @@ -37,30 +35,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java index a888672b2..0505c1269 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java @@ -354,9 +354,9 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121( deviceTransactionManager); OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221( - deviceTransactionManager, portMapping, portMapping.getPortMappingVersion221()); + deviceTransactionManager, portMapping); OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710( - deviceTransactionManager, portMapping, portMapping.getPortMappingVersion710()); + deviceTransactionManager, portMapping); return new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils, openRoadmInterfacesImpl121, openRoadmInterfacesImpl221, openRoadmInterfacesImpl710); } diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java index dd277af62..5277ac687 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java @@ -121,10 +121,8 @@ public class OlmPowerServiceRpcImplTest extends AbstractTest { this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, this.portMappingVersion22, this.portMappingVersion121); this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); - this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager, this.portMapping, - this.portMappingVersion22); - this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager, this.portMapping, - this.portMappingVersion710); + this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager, this.portMapping); + this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager, this.portMapping); this.openRoadmInterfaces = new OpenRoadmInterfacesImpl((this.deviceTransactionManager), this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22, this.openRoadmInterfacesImpl710); diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java index 36c8d097f..637316a9c 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java @@ -103,10 +103,8 @@ public class PowerMgmtPowerMockTest extends AbstractTest { this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, this.portMappingVersion22, this.portMappingVersion121); this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); - this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager, this.portMapping, - this.portMappingVersion22); - this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager, this.portMapping, - this.portMappingVersion710); + this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager, this.portMapping); + this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager, this.portMapping); this.openRoadmInterfaces = new OpenRoadmInterfacesImpl((this.deviceTransactionManager), this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22, this.openRoadmInterfacesImpl710); -- 2.36.6