X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Fservice%2FOlmPowerServiceImplTest.java;h=3f3f99c31ecc6f9ece356345db8db82c5797e224;hb=c725528fb8a0b09ce24adac744c888a10cf90f72;hp=c446799265086f3e5c58dddb1af79a6958c38cb0;hpb=d9624b396409e7d18f0d9e4abfcd419cd55ac535;p=transportpce.git 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 c44679926..3f3f99c31 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 @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.olm.service; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mockito; @@ -25,6 +24,7 @@ import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl; import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl121; import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl221; +import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl710; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl; import org.opendaylight.transportpce.common.mapping.MappingUtils; @@ -33,10 +33,12 @@ import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.mapping.PortMappingImpl; import org.opendaylight.transportpce.common.mapping.PortMappingVersion121; import org.opendaylight.transportpce.common.mapping.PortMappingVersion221; +import org.opendaylight.transportpce.common.mapping.PortMappingVersion710; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl221; +import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl710; import org.opendaylight.transportpce.olm.power.PowerMgmt; import org.opendaylight.transportpce.olm.power.PowerMgmtImpl; import org.opendaylight.transportpce.olm.stub.MountPointServiceStub; @@ -45,22 +47,22 @@ import org.opendaylight.transportpce.olm.util.OlmPowerServiceRpcImplUtil; import org.opendaylight.transportpce.olm.util.OtsPmHolder; import org.opendaylight.transportpce.olm.util.TransactionUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossBaseInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossBaseOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossBaseOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossCurrentInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossCurrentOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerResetInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerResetOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerTurndownOutputBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network; @@ -71,7 +73,6 @@ import org.powermock.api.mockito.PowerMockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Ignore public class OlmPowerServiceImplTest extends AbstractTest { private static final Logger LOG = LoggerFactory.getLogger(OlmPowerServiceImplTest.class); @@ -84,9 +85,12 @@ public class OlmPowerServiceImplTest extends AbstractTest { private PowerMgmt powerMgmt; private CrossConnectImpl121 crossConnectImpl121; private CrossConnectImpl221 crossConnectImpl22; + private CrossConnectImpl710 crossConnectImpl710; private MappingUtils mappingUtils; private OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121; private OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl22; + private OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710; + private PortMappingVersion710 portMappingVersion710; private PortMappingVersion221 portMappingVersion22; private PortMappingVersion121 portMappingVersion121; private OlmPowerService olmPowerService; @@ -99,34 +103,39 @@ public class OlmPowerServiceImplTest extends AbstractTest { @Before public void setUp() { - this.mountPoint = new MountPointStub(this.getDataBroker()); + this.dataBroker = getNewDataBroker(); + this.mountPoint = new MountPointStub(this.dataBroker); this.mountPointService = new MountPointServiceStub(mountPoint); this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000); - this.mappingUtils = Mockito.spy(new MappingUtilsImpl(getDataBroker())); + this.mappingUtils = Mockito.spy(new MappingUtilsImpl(dataBroker)); Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1).when(mappingUtils) .getOpenRoadmVersion(Mockito.anyString()); this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000); this.crossConnectImpl121 = new CrossConnectImpl121(deviceTransactionManager); this.crossConnectImpl22 = new CrossConnectImpl221(deviceTransactionManager); this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121, - this.crossConnectImpl22); + this.crossConnectImpl22, this.crossConnectImpl710); 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.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22, + this.openRoadmInterfacesImpl710); this.portMappingVersion22 = - new PortMappingVersion221(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); + new PortMappingVersion221(dataBroker, deviceTransactionManager, this.openRoadmInterfaces); this.portMappingVersion121 = - new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces); - this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion22, 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.getDataBroker(), this.openRoadmInterfaces, this.crossConnect, + this.powerMgmt = new PowerMgmtImpl(this.dataBroker, this.openRoadmInterfaces, this.crossConnect, this.deviceTransactionManager); - this.olmPowerService = new OlmPowerServiceImpl(this.getDataBroker(), this.powerMgmt, + this.olmPowerService = new OlmPowerServiceImpl(this.dataBroker, this.powerMgmt, this.deviceTransactionManager, this.portMapping, this.mappingUtils, this.openRoadmInterfaces); - this.dataBroker = PowerMockito.spy(getDataBroker()); this.powerMgmtMock = PowerMockito.mock(PowerMgmtImpl.class); - this.olmPowerServiceMock = new OlmPowerServiceImpl(this.getDataBroker(), this.powerMgmtMock, + this.olmPowerServiceMock = new OlmPowerServiceImpl(this.dataBroker, this.powerMgmtMock, this.deviceTransactionManager, this.portMapping, this.mappingUtils, this.openRoadmInterfaces); this.olmPowerServiceMock = Mockito.mock(OlmPowerServiceImpl.class); MockitoAnnotations.initMocks(this); @@ -195,58 +204,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { Assert.assertEquals("Failed", output.getResult()); } - /* - @Test - public void testCalculateSpanlossBase() { - CalculateSpanlossBaseInput input = OlmPowerServiceRpcImplUtil.getCalculateSpanlossBaseInput(); - //TODO - Mockito.when(this.olmPowerServiceMock.calculateSpanlossBase(Mockito.any())) - .thenReturn(new CalculateSpanlossBaseOutputBuilder().setResult("Failed").build()); - CalculateSpanlossBaseOutput output = this.olmPowerServiceMock.calculateSpanlossBase(input); - Assert.assertEquals("Failed", output.getResult()); - - } - */ - - /* - @Test - public void testCalculateSpanlossBase2() { - NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); -<<<<<<< HEAD - InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) - .child(Network.class, overlayTopologyKey) -======= - InstanceIdentifier networkTopoIID = InstanceIdentifier.builder(Networks.class) - .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.network.rev180226.networks.Network.class, - overlayTopologyKey) ->>>>>>> 87d8bf0... Retrieve OLM modifs from change 80051 - .augmentation(Network1.class) - .build(); - InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) - .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang - .ietf.network.rev180226.networks.Network.class, - overlayTopologyKey) - .build(); - Network1 network = TransactionUtils.getNetwork(); - Network ietfNetwork = TransactionUtils.getOverLayNetwork(); - TransactionUtils.writeTransaction(this.getDataBroker(), networkIID, ietfNetwork); - TransactionUtils.writeTransaction(this.getDataBroker(), networkTopoIID, network); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - LOG.error("Write transaction failed !",e); - } - CalculateSpanlossBaseInput input = OlmPowerServiceRpcImplUtil.getCalculateSpanlossBaseInput(); - //TODO - Mockito.when(this.olmPowerServiceMock.calculateSpanlossBase(Mockito.any())) - .thenReturn(new CalculateSpanlossBaseOutputBuilder().setResult("Failed").build()); - CalculateSpanlossBaseOutput output = this.olmPowerServiceMock.calculateSpanlossBase(input); - Assert.assertEquals("Failed", output.getResult()); - - } - */ - @Ignore @Test public void testCalculateSpanlossBase3() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); @@ -255,7 +212,7 @@ public class OlmPowerServiceImplTest extends AbstractTest { .augmentation(Network1.class) .build(); Network1 network = TransactionUtils.getNetwork(); - TransactionUtils.writeTransaction(this.getDataBroker(), networkIID, network); + TransactionUtils.writeTransaction(this.dataBroker, networkIID, network); try { Thread.sleep(1000); } catch (InterruptedException e) { @@ -271,7 +228,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { } - @Ignore @Test public void testCalculateSpanlossBase4() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); @@ -280,7 +236,7 @@ public class OlmPowerServiceImplTest extends AbstractTest { .augmentation(Network1.class) .build(); Network1 network = TransactionUtils.getEmptyNetwork(); - TransactionUtils.writeTransaction(this.getDataBroker(), networkIID, network); + TransactionUtils.writeTransaction(this.dataBroker, networkIID, network); try { Thread.sleep(1000); } catch (InterruptedException e) { @@ -292,7 +248,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { } - @Ignore @Test public void testCalculateSpanlossBase5() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); @@ -301,7 +256,7 @@ public class OlmPowerServiceImplTest extends AbstractTest { .augmentation(Network1.class) .build(); Network1 network = TransactionUtils.getNullNetwork(); - TransactionUtils.writeTransaction(this.getDataBroker(), networkIID, network); + TransactionUtils.writeTransaction(this.dataBroker, networkIID, network); try { Thread.sleep(1000); } catch (InterruptedException e) { @@ -313,60 +268,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { } -// @Test -// public void testCalculateSpanlossBase4() throws InterruptedException { -// NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); -// InstanceIdentifier networkIID = InstanceIdentifier.builder(Network.class, overlayTopologyKey) -// .augmentation(Network1.class) -// .build(); -// Network1 network = TransactionUtils.getNetwork2(); -// TransactionUtils.writeTransaction(this.getDataBroker(), networkIID, network); -// -// Thread.sleep(500); -// -// List nodes = TransactionUtils.getNodes(); -// Node n; -// SupportingNode sn; -// -// List snl; -// NodeId n5 = new NodeId("node 5"); -// KeyedInstanceIdentifier mappedNodeII2 = -// InstanceIdentifiers.UNDERLAY_NETWORK_II.child(Node.class, new NodeKey(n5)); -// -// sn = new SupportingNodeBuilder().setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) -// .setNodeRef(n5).build(); -// snl = new ArrayList<>(); -// snl.add(sn); -// n = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608 -// .network.NodeBuilder().setNodeId(n5).build(); -// TransactionUtils.writeTransaction(this.getDataBroker(), mappedNodeII2, n); -// Thread.sleep(500); -// -// for(int i=0; i < nodes.size(); i++) { -// KeyedInstanceIdentifier mappedNodeII = -// InstanceIdentifiers.OVERLAY_NETWORK_II.child(Node.class, new NodeKey(nodes.get(i))); -// if (i != 0){ -// sn = new SupportingNodeBuilder().setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) -// .setNodeRef(nodes.get(i-1)).build(); -// }else { -// sn = new SupportingNodeBuilder().setNodeRef(n5).build(); -// } -// snl = new ArrayList<>(); -// snl.add(sn); -// n = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608 -// .network.NodeBuilder().setNodeId(nodes.get(i)).setSupportingNode(snl).build(); -// TransactionUtils.writeTransaction(this.getDataBroker(), mappedNodeII, n); -// Thread.sleep(500); -// } -// -// Thread.sleep(1000); -// -// CalculateSpanlossBaseInput input = OlmPowerServiceRpcImplUtil.getCalculateSpanlossBaseInput2(); -// CalculateSpanlossBaseOutput output = this.olmPowerService.calculateSpanlossBase(input); -// Assert.assertEquals("Failed", output.getResult()); -// -// } - @Test public void testCalculateSpanlossCurrent1() { CalculateSpanlossCurrentInput input = OlmPowerServiceRpcImplUtil.getCalculateSpanlossCurrentInput(); @@ -382,7 +283,7 @@ public class OlmPowerServiceImplTest extends AbstractTest { .augmentation(Network1.class) .build(); Network1 network = TransactionUtils.getNetwork(); - TransactionUtils.writeTransaction(this.getDataBroker(), networkIID, network); + TransactionUtils.writeTransaction(this.dataBroker, networkIID, network); try { Thread.sleep(1000); } catch (InterruptedException e) { @@ -393,7 +294,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { Assert.assertEquals(null, output); } - @Ignore @Test public void testServicePowerReset() { ServicePowerResetInput input = OlmPowerServiceRpcImplUtil.getServicePowerResetInput(); @@ -401,7 +301,6 @@ public class OlmPowerServiceImplTest extends AbstractTest { Assert.assertEquals(null, output); } - @Ignore @Test public void testServicePowerTurndownSuccessResult() { ServicePowerTurndownInput servicePowerTurndownInput = OlmPowerServiceRpcImplUtil.getServicePowerTurndownInput();