From 5d23ec7d90dbeb3dfbf24616d29d9ef2b1ae7c41 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Fri, 1 Oct 2021 14:17:35 +0200 Subject: [PATCH] Change PortMapping implementations Generalizing the update of mapping during openroadm-interface creation/ deletion imposes to remove OpenRoadmInterfaces injections from PortMapping implementations. Getting interfaces from device may be directly managed from the portmapping implementation. JIRA: TRNSPRTPCE-538 Signed-off-by: Gilles Thouenon Change-Id: Icc6c560790f030f8ef034b0ed3123145aeaf0c9b --- .../common/mapping/PortMappingVersion121.java | 50 ++++++------- .../common/mapping/PortMappingVersion221.java | 65 +++++++++-------- .../common/mapping/PortMappingVersion710.java | 73 +++++++++---------- .../OSGI-INF/blueprint/common-blueprint.xml | 3 - .../mapping/PortMappingVersion121Test.java | 23 +----- .../olm/OlmPowerServiceRpcImplTest.java | 13 ++-- .../olm/power/PowerMgmtPowerMockTest.java | 13 ++-- .../transportpce/olm/power/PowerMgmtTest.java | 10 +-- .../olm/service/OlmPowerServiceImplTest.java | 13 ++-- ...ceRendererServiceImplCreateOtsOmsTest.java | 15 ++-- ...ndererServiceOperationsImplDeleteTest.java | 15 ++-- .../RendererServiceOperationsImplTest.java | 9 +-- .../2.2.1/test07_otn_renderer.py | 1 + 13 files changed, 128 insertions(+), 175 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java index c9d507c59..cb7c73fd8 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java @@ -29,8 +29,6 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.Network; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.NetworkBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.OpenroadmNodeVersion; @@ -90,7 +88,6 @@ public class PortMappingVersion121 { private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; - private final OpenRoadmInterfaces openRoadmInterfaces; static { SUFFIX = Map.of( @@ -99,11 +96,9 @@ public class PortMappingVersion121 { Direction.Bidirectional, "TXRX"); } - public PortMappingVersion121(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, - OpenRoadmInterfaces openRoadmInterfaces) { + public PortMappingVersion121(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; - this.openRoadmInterfaces = openRoadmInterfaces; } public boolean createMappingData(String nodeId) { @@ -592,27 +587,22 @@ public class PortMappingVersion121 { private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) { for (Interfaces interfaces : port.getInterfaces()) { - try { - Optional openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId, - interfaces.getInterfaceName()); - if (openRoadmInterface.isEmpty()) { - LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, - nodeId, interfaces.getInterfaceName() + "- empty interface"); - continue; - } - LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, - nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType()); - Class interfaceType - = (Class) openRoadmInterface.get().getType(); - // Check if interface type is OMS or OTS - if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) { - mpBldr.setSupportingOms(interfaces.getInterfaceName()); - } - if (interfaceType.equals(OpticalTransport.class)) { - mpBldr.setSupportingOts(interfaces.getInterfaceName()); - } - } catch (OpenRoadmInterfaceException ex) { - LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, nodeId, interfaces.getInterfaceName(), ex); + Optional openRoadmInterface = getInterfaceFromDevice(nodeId, interfaces.getInterfaceName()); + if (openRoadmInterface.isEmpty()) { + LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, + nodeId, interfaces.getInterfaceName() + "- empty interface"); + continue; + } + LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, + nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType()); + Class interfaceType + = (Class) openRoadmInterface.get().getType(); + // Check if interface type is OMS or OTS + if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) { + mpBldr.setSupportingOms(interfaces.getInterfaceName()); + } + if (interfaceType.equals(OpticalTransport.class)) { + mpBldr.setSupportingOts(interfaces.getInterfaceName()); } } return mpBldr; @@ -950,4 +940,10 @@ public class PortMappingVersion121 { return nodeInfoBldr.build(); } + private Optional getInterfaceFromDevice(String nodeId, String interfaceName) { + InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(interfaceName)); + return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, + interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + } } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java index 57cc2b18d..f162f1a7e 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java @@ -29,8 +29,6 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.Network; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.NetworkBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.OpenroadmNodeVersion; @@ -81,10 +79,12 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.port.Interfaces; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.xponder.XpdrPort; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.EthernetCsmacd; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.InterfaceType; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OpenROADMOpticalMultiplex; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OpticalTransport; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OtnOdu; +import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OtnOtu; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.Protocols1; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.Lldp; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.lldp.PortConfig; @@ -106,7 +106,6 @@ public class PortMappingVersion221 { private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; - private final OpenRoadmInterfaces openRoadmInterfaces; static { SUFFIX = Map.of( @@ -115,11 +114,9 @@ public class PortMappingVersion221 { Direction.Bidirectional, "TXRX"); } - public PortMappingVersion221(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, - OpenRoadmInterfaces openRoadmInterfaces) { + public PortMappingVersion221(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; - this.openRoadmInterfaces = openRoadmInterfaces; } public boolean createMappingData(String nodeId) { @@ -807,30 +804,32 @@ public class PortMappingVersion221 { private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) { for (Interfaces interfaces : port.getInterfaces()) { - try { - Optional openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId, - interfaces.getInterfaceName()); - if (openRoadmInterface.isEmpty()) { - LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, - nodeId, interfaces.getInterfaceName() + "- empty interface"); - continue; - } - LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, - nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType()); - Class interfaceType - = (Class) openRoadmInterface.get().getType(); - // Check if interface type is OMS or OTS - if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) { - mpBldr.setSupportingOms(interfaces.getInterfaceName()); - } - if (interfaceType.equals(OpticalTransport.class)) { - mpBldr.setSupportingOts(interfaces.getInterfaceName()); - } - if (interfaceType.equals(OtnOdu.class)) { - mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); - } - } catch (OpenRoadmInterfaceException ex) { - LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, nodeId, interfaces.getInterfaceName(), ex); + Optional openRoadmInterface = getInterfaceFromDevice(nodeId, + interfaces.getInterfaceName()); + if (openRoadmInterface.isEmpty()) { + LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, + nodeId, interfaces.getInterfaceName() + "- empty interface"); + continue; + } + LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, + nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType()); + Class interfaceType + = (Class) openRoadmInterface.get().getType(); + // Check if interface type is OMS or OTS + if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) { + mpBldr.setSupportingOms(interfaces.getInterfaceName()); + } + if (interfaceType.equals(OpticalTransport.class)) { + mpBldr.setSupportingOts(interfaces.getInterfaceName()); + } + if (interfaceType.equals(OtnOtu.class)) { + mpBldr.setSupportingOtu4(interfaces.getInterfaceName()); + } + if (interfaceType.equals(OtnOdu.class)) { + mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); + } + if (interfaceType.equals(EthernetCsmacd.class)) { + mpBldr.setSupportingEthernet(interfaces.getInterfaceName()); } } return mpBldr; @@ -1180,4 +1179,10 @@ public class PortMappingVersion221 { return nodeInfoBldr.build(); } + private Optional getInterfaceFromDevice(String nodeId, String interfaceName) { + InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(interfaceName)); + return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, + interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + } } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java index 2901ceb20..e1d9b6d0c 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java @@ -31,8 +31,6 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.Network; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.NetworkBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.OpenroadmNodeVersion; @@ -117,7 +115,6 @@ public class PortMappingVersion710 { private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; - private final OpenRoadmInterfaces openRoadmInterfaces; static { SUFFIX = Map.of( @@ -126,11 +123,9 @@ public class PortMappingVersion710 { Direction.Bidirectional, "TXRX"); } - public PortMappingVersion710(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, - OpenRoadmInterfaces openRoadmInterfaces) { + public PortMappingVersion710(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; - this.openRoadmInterfaces = openRoadmInterfaces; } public boolean createMappingData(String nodeId) { @@ -948,40 +943,34 @@ public class PortMappingVersion710 { private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) { for (Interfaces interfaces : port.getInterfaces()) { - try { - Optional openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId, - interfaces.getInterfaceName()); - if (openRoadmInterface.isEmpty()) { - LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, - nodeId, interfaces.getInterfaceName() + "- empty interface"); - continue; - } - LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, - nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType()); - Class interfaceType - = (Class) openRoadmInterface.get().getType(); - // Check if interface type is OMS or OTS - if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) { - mpBldr.setSupportingOms(interfaces.getInterfaceName()); - } - if (interfaceType.equals(OpticalTransport.class)) { - mpBldr.setSupportingOts(interfaces.getInterfaceName()); - } - String interfaceName = interfaces.getInterfaceName(); - if (interfaceType.equals(OtnOdu.class) - && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) - .equals("ODU"))) { - mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); - } - if ((interfaceType.equals(OtnOdu.class)) - && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) - .equals("ODUC4"))) { - mpBldr.setSupportingOduc4(interfaces.getInterfaceName()); - } - - } catch (OpenRoadmInterfaceException ex) { + Optional openRoadmInterface = getInterfaceFromDevice(nodeId, + interfaces.getInterfaceName()); + if (openRoadmInterface.isEmpty()) { LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, - nodeId, interfaces.getInterfaceName(), ex); + nodeId, interfaces.getInterfaceName() + "- empty interface"); + continue; + } + LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, + nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType()); + Class interfaceType + = (Class) openRoadmInterface.get().getType(); + // Check if interface type is OMS or OTS + if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) { + mpBldr.setSupportingOms(interfaces.getInterfaceName()); + } + if (interfaceType.equals(OpticalTransport.class)) { + mpBldr.setSupportingOts(interfaces.getInterfaceName()); + } + String interfaceName = interfaces.getInterfaceName(); + if (interfaceType.equals(OtnOdu.class) + && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) + .equals("ODU"))) { + mpBldr.setSupportingOdu4(interfaces.getInterfaceName()); + } + if ((interfaceType.equals(OtnOdu.class)) + && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1) + .equals("ODUC4"))) { + mpBldr.setSupportingOduc4(interfaces.getInterfaceName()); } } return mpBldr; @@ -1416,4 +1405,10 @@ public class PortMappingVersion710 { return null; } + private Optional getInterfaceFromDevice(String nodeId, String interfaceName) { + InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(interfaceName)); + return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION, + interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + } } 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 e3a05ade0..0539214af 100644 --- a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml +++ b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml @@ -47,19 +47,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - - diff --git a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java index 892e2b54a..54b7905e9 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.ArrayList; @@ -33,8 +32,6 @@ import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; -import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.transportpce.test.DataStoreContext; import org.opendaylight.transportpce.test.DataStoreContextImpl; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.Network; @@ -101,7 +98,6 @@ public class PortMappingVersion121Test { private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion121Test.class); private static DataBroker dataBroker; private static DeviceTransactionManager deviceTransactionManager; - private static OpenRoadmInterfaces openRoadmInterfaces; private static PortMappingVersion121 portMappingVersion121; private Random ran = new Random(); @@ -111,8 +107,7 @@ public class PortMappingVersion121Test { DataStoreContext dataStoreContext = new DataStoreContextImpl(); dataBroker = dataStoreContext.getDataBroker(); deviceTransactionManager = mock(DeviceTransactionManager.class); - openRoadmInterfaces = mock(OpenRoadmInterfaces.class); - portMappingVersion121 = new PortMappingVersion121(dataBroker, deviceTransactionManager, openRoadmInterfaces); + portMappingVersion121 = new PortMappingVersion121(dataBroker, deviceTransactionManager); } @Test @@ -442,27 +437,11 @@ public class PortMappingVersion121Test { .setType(OpticalTransport.class).build(); Interface ifc2 = new InterfaceBuilder().withKey(new InterfaceKey("ifc2")) .setType(OpenROADMOpticalMultiplex.class).build(); - try { - when(openRoadmInterfaces.getInterface("node", "i1")).thenReturn(Optional.of(ifc1)); - when(openRoadmInterfaces.getInterface("node", "i2")).thenReturn(Optional.of(ifc2)); - } catch (OpenRoadmInterfaceException e) { - LOG.error("Failed to mock interafce.", e); - fail(); - } // test createMappingData with a node with 3 dgree + 3 srg + bidirectional & unidirectional ports assertTrue("creating mappingdata for existed node returns true", portMappingVersion121.createMappingData("node")); - // verify 2 interfaces were processed - try { - verify(openRoadmInterfaces).getInterface("node", "i1"); - verify(openRoadmInterfaces).getInterface("node", "i2"); - } catch (OpenRoadmInterfaceException e) { - LOG.error("Failed to read interface", e); - fail(); - } - // assert all portmappings have been created for the roadm node ReadTransaction rr = dataBroker.newReadOnlyTransaction(); InstanceIdentifier mappingIID = InstanceIdentifier.create(Network.class); 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 03fe640ea..c2c2fba8a 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java @@ -115,20 +115,17 @@ public class OlmPowerServiceRpcImplTest extends AbstractTest { this.crossConnectImpl710 = new CrossConnectImpl710(deviceTransactionManager); this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121, this.crossConnectImpl22, this.crossConnectImpl710); + this.portMappingVersion710 = new PortMappingVersion710(getDataBroker(), deviceTransactionManager); + this.portMappingVersion22 = new PortMappingVersion221(getDataBroker(), deviceTransactionManager); + this.portMappingVersion121 = new PortMappingVersion121(getDataBroker(), deviceTransactionManager); + this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, + this.portMappingVersion22, this.portMappingVersion121); this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager); this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager); this.openRoadmInterfaces = new OpenRoadmInterfacesImpl((this.deviceTransactionManager), this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22, this.openRoadmInterfacesImpl710); - this.portMappingVersion710 = - new PortMappingVersion710(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion22 = - new PortMappingVersion221(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion121 = - new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, - this.portMappingVersion22, this.portMappingVersion121); this.portMapping = Mockito.spy(this.portMapping); this.powerMgmt = new PowerMgmtImpl(getDataBroker(), this.openRoadmInterfaces, this.crossConnect, this.deviceTransactionManager); 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 5dda26fb0..232c04c00 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 @@ -107,6 +107,11 @@ public class PowerMgmtPowerMockTest extends AbstractTest { this.crossConnectImpl22 = new CrossConnectImpl221(deviceTransactionManager); this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121, this.crossConnectImpl22, this.crossConnectImpl710); + this.portMappingVersion22 = new PortMappingVersion221(getDataBroker(), deviceTransactionManager); + this.portMappingVersion121 = new PortMappingVersion121(getDataBroker(), deviceTransactionManager); + this.portMappingVersion710 = new PortMappingVersion710(getDataBroker(), deviceTransactionManager); + this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, + this.portMappingVersion22, this.portMappingVersion121); this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager); this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager); @@ -114,14 +119,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest { this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22, this.openRoadmInterfacesImpl710); this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces); - this.portMappingVersion22 = - new PortMappingVersion221(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion121 = - new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion710 = - new PortMappingVersion710(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, - this.portMappingVersion22, this.portMappingVersion121); this.portMapping = Mockito.spy(this.portMapping); this.powerMgmt = new PowerMgmtImpl(getDataBroker(), this.openRoadmInterfaces, this.crossConnect, this.deviceTransactionManager); diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtTest.java index c7e8d1b29..0bb439bcb 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtTest.java @@ -79,6 +79,10 @@ public class PowerMgmtTest extends AbstractTest { this.crossConnectImpl22 = new CrossConnectImpl221(deviceTransactionManager); this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121, this.crossConnectImpl22, this.crossConnectImpl710); + this.portMappingVersion22 = new PortMappingVersion221(dataBroker, deviceTransactionManager); + this.portMappingVersion121 = new PortMappingVersion121(dataBroker, deviceTransactionManager); + this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, + this.portMappingVersion22, this.portMappingVersion121); this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager); this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager); @@ -86,12 +90,6 @@ public class PowerMgmtTest extends AbstractTest { this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22, this.openRoadmInterfacesImpl710); this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces); - this.portMappingVersion22 = - new PortMappingVersion221(dataBroker, deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion121 = - new PortMappingVersion121(dataBroker, deviceTransactionManager, this.openRoadmInterfaces); - this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, - this.portMappingVersion22, this.portMappingVersion121); this.portMapping = Mockito.spy(this.portMapping); this.powerMgmt = new PowerMgmtImpl(this.dataBroker, this.openRoadmInterfaces, this.crossConnect, this.deviceTransactionManager); diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java index 3f3f99c31..18623d4ca 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java @@ -115,20 +115,17 @@ public class OlmPowerServiceImplTest extends AbstractTest { this.crossConnectImpl22 = new CrossConnectImpl221(deviceTransactionManager); this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121, this.crossConnectImpl22, this.crossConnectImpl710); + this.portMappingVersion22 = new PortMappingVersion221(dataBroker, deviceTransactionManager); + this.portMappingVersion121 = new PortMappingVersion121(dataBroker, deviceTransactionManager); + this.portMappingVersion710 = new PortMappingVersion710(dataBroker, deviceTransactionManager); + this.portMapping = new PortMappingImpl(dataBroker, this.portMappingVersion710, + this.portMappingVersion22, this.portMappingVersion121); this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager); this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager); this.openRoadmInterfaces = new OpenRoadmInterfacesImpl((this.deviceTransactionManager), this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22, this.openRoadmInterfacesImpl710); - this.portMappingVersion22 = - new PortMappingVersion221(dataBroker, deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion121 = - new PortMappingVersion121(dataBroker, deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion710 = - new PortMappingVersion710(dataBroker, deviceTransactionManager, this.openRoadmInterfaces); - this.portMapping = new PortMappingImpl(dataBroker, this.portMappingVersion710, - this.portMappingVersion22, this.portMappingVersion121); this.portMapping = Mockito.spy(this.portMapping); this.powerMgmt = new PowerMgmtImpl(this.dataBroker, this.openRoadmInterfaces, this.crossConnect, this.deviceTransactionManager); diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java index ac98c8e7c..aed6a4986 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java @@ -82,9 +82,6 @@ public class DeviceRendererServiceImplCreateOtsOmsTest extends AbstractTest { private void setMountPoint(MountPoint mountPoint) { MountPointService mountPointService = new MountPointServiceStub(mountPoint); this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000); - this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(this.deviceTransactionManager); - this.openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(this.deviceTransactionManager); - this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(this.deviceTransactionManager); this.mappingUtils = new MappingUtilsImpl(getDataBroker()); this.mappingUtils = Mockito.spy(MappingUtils.class); @@ -93,12 +90,12 @@ public class DeviceRendererServiceImplCreateOtsOmsTest extends AbstractTest { this.openRoadmInterfaces = new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils, openRoadmInterfacesImpl121, openRoadmInterfacesImpl221, openRoadmInterfacesImpl710); this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces); - this.portMappingVersion22 = new PortMappingVersion221(getDataBroker(), this.deviceTransactionManager, - this.openRoadmInterfaces); - this.portMappingVersion121 = new PortMappingVersion121(getDataBroker(), this.deviceTransactionManager, - this.openRoadmInterfaces); - this.portMappingVersion710 = - new PortMappingVersion710(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); + this.portMappingVersion22 = new PortMappingVersion221(getDataBroker(), this.deviceTransactionManager); + this.portMappingVersion121 = new PortMappingVersion121(getDataBroker(), this.deviceTransactionManager); + this.portMappingVersion710 = new PortMappingVersion710(getDataBroker(), deviceTransactionManager); + this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(this.deviceTransactionManager); + this.openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(this.deviceTransactionManager); + this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(this.deviceTransactionManager); PortMapping portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, this.portMappingVersion22, this.portMappingVersion121); diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java index b181e3b45..951edabc1 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java @@ -102,21 +102,18 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest { private void setMountPoint(MountPoint mountPoint) { MountPointService mountPointService = new MountPointServiceStub(mountPoint); this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000); - this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); - this.openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(deviceTransactionManager); - this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager); this.mappingUtils = new MappingUtilsImpl(getDataBroker()); this.openRoadmInterfaces = new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils, openRoadmInterfacesImpl121, openRoadmInterfacesImpl221, openRoadmInterfacesImpl710); this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces); - this.portMappingVersion710 = - new PortMappingVersion710(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion22 = - new PortMappingVersion221(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMappingVersion121 = - new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); + this.portMappingVersion710 = new PortMappingVersion710(getDataBroker(), deviceTransactionManager); + this.portMappingVersion22 = new PortMappingVersion221(getDataBroker(), deviceTransactionManager); + this.portMappingVersion121 = new PortMappingVersion121(getDataBroker(), deviceTransactionManager); this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, this.portMappingVersion22, this.portMappingVersion121); + this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); + this.openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(deviceTransactionManager); + this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager); this.crossConnectImpl121 = new CrossConnectImpl121(deviceTransactionManager); this.crossConnectImpl221 = new CrossConnectImpl221(deviceTransactionManager); this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121, diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java index 592f98944..7944ff872 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java @@ -95,19 +95,16 @@ public class RendererServiceOperationsImplTest extends AbstractTest { private void setMountPoint(MountPoint mountPoint) { this.mountPointService = new MountPointServiceStub(mountPoint); this.deviceTransactionManager = new DeviceTransactionManagerImpl(this.mountPointService, 3000); - this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager); - this.openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(deviceTransactionManager); - this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager); this.mappingUtils = new MappingUtilsImpl(getDataBroker()); this.openRoadmInterfaces = new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils, openRoadmInterfacesImpl121, openRoadmInterfacesImpl221, openRoadmInterfacesImpl710); this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces); this.portMappingVersion22 = - new PortMappingVersion221(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); + new PortMappingVersion221(getDataBroker(), deviceTransactionManager); this.portMappingVersion121 = - new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); + new PortMappingVersion121(getDataBroker(), deviceTransactionManager); this.portMappingVersion710 = - new PortMappingVersion710(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); + new PortMappingVersion710(getDataBroker(), deviceTransactionManager); this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, this.portMappingVersion22, this.portMappingVersion121); OpenRoadmInterface121 openRoadmInterface121 = new OpenRoadmInterface121(portMapping,openRoadmInterfaces); diff --git a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py index 3089c7fc6..5bb9200ee 100644 --- a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py @@ -175,6 +175,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.NETWORK1_CHECK_DICT["supporting-odu4"] = "XPDR1-NETWORK1-ODU4" + self.NETWORK1_CHECK_DICT["supporting-otu4"] = "XPDR1-NETWORK1-OTU" self.assertIn( self.NETWORK1_CHECK_DICT, res['mapping']) -- 2.36.6