X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=olm%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Fpower%2FPowerMgmtTest.java;h=21ffdcfba91b97e690e1147946591b92e60a1fe3;hb=48bc79b22b6350e16e6919172a8bce3b6881bc47;hp=d2f2c039ae36ff741535b539a21fad6b1f801739;hpb=3c0bb0501a44b03b2c30ba841fa66b8b0500f49e;p=transportpce.git 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 d2f2c039a..21ffdcfba 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 @@ -13,8 +13,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.opendaylight.controller.md.sal.binding.api.MountPoint; -import org.opendaylight.controller.md.sal.binding.api.MountPointService; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.MountPoint; +import org.opendaylight.mdsal.binding.api.MountPointService; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl; @@ -42,7 +43,6 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev17 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; public class PowerMgmtTest extends AbstractTest { - private MountPoint mountPoint; private MountPointService mountPointService; private DeviceTransactionManager deviceTransactionManager; @@ -57,13 +57,15 @@ public class PowerMgmtTest extends AbstractTest { private OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl22; private PortMappingVersion221 portMappingVersion22; private PortMappingVersion121 portMappingVersion121; + private DataBroker dataBroker; @Before public void setUp() { - this.mountPoint = new MountPointStub(this.getDataBroker()); + dataBroker = this.getNewDataBroker(); + this.mountPoint = new MountPointStub(dataBroker); this.mountPointService = new MountPointServiceStub(mountPoint); - this.mappingUtils = new MappingUtilsImpl(getDataBroker()); - this.mappingUtils = Mockito.spy(MappingUtils.class); + // this.mappingUtils = 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); @@ -77,49 +79,42 @@ public class PowerMgmtTest extends AbstractTest { this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22); this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces); 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.portMapping = new PortMappingImpl(dataBroker, + this.portMappingVersion22, this.portMappingVersion121); this.portMapping = Mockito.spy(this.portMapping); - this.powerMgmt = new PowerMgmtImpl(this.getDataBroker(), this.openRoadmInterfaces, this.crossConnect, - this.deviceTransactionManager); + this.powerMgmt = new PowerMgmtImpl(this.dataBroker, this.openRoadmInterfaces, this.crossConnect, + this.deviceTransactionManager); } @Test public void testSetPower() { - ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput(); boolean output = this.powerMgmt.setPower(input); Assert.assertEquals(true, output); - } @Test public void testSetPower2() { - ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput2(); boolean output = this.powerMgmt.setPower(input); Assert.assertEquals(true, output); - } @Test public void testSetPower3() { - ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3(); boolean output = this.powerMgmt.setPower(input); Assert.assertEquals(true, output); - } @Test public void testSetPower4() { - ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput4(); boolean output = this.powerMgmt.setPower(input); Assert.assertEquals(true, output); - } @Test @@ -154,8 +149,8 @@ public class PowerMgmtTest extends AbstractTest { public void testSetPowerPresentNodes() throws InterruptedException { List nodes = TransactionUtils.getNodeIds(); for (NodeId nodeId : nodes) { - TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.getDataBroker(), null); - Thread.sleep(500); + TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.dataBroker, null); + Thread.sleep(1000); } ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput(); boolean output = this.powerMgmt.setPower(input); @@ -166,7 +161,7 @@ public class PowerMgmtTest extends AbstractTest { public void testSetPowerPresentNodes2() throws InterruptedException { List nodes = TransactionUtils.getNodeIds(); for (NodeId nodeId : nodes) { - TransactionUtils.writeNodeTransaction2(nodeId.getValue(), this.getDataBroker(), null); + TransactionUtils.writeNodeTransaction2(nodeId.getValue(), this.dataBroker, null); Thread.sleep(500); } ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput(); @@ -178,7 +173,7 @@ public class PowerMgmtTest extends AbstractTest { public void testSetPowerPresentNodes3() throws InterruptedException { List nodes = TransactionUtils.getNodeIds(); for (NodeId nodeId : nodes) { - TransactionUtils.writeNodeTransaction3(nodeId.getValue(), this.getDataBroker(), null); + TransactionUtils.writeNodeTransaction3(nodeId.getValue(), this.dataBroker, null); Thread.sleep(500); } ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput(); @@ -202,7 +197,7 @@ public class PowerMgmtTest extends AbstractTest { public void testSetPowerPresentNodes312() throws InterruptedException { List nodes = TransactionUtils.getNodeIds(); for (NodeId nodeId : nodes) { - TransactionUtils.writeNodeTransaction3(nodeId.getValue(), this.getDataBroker(), "deg"); + TransactionUtils.writeNodeTransaction3(nodeId.getValue(), this.dataBroker, "deg"); Thread.sleep(500); } ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput4(); @@ -214,7 +209,7 @@ public class PowerMgmtTest extends AbstractTest { public void testSetPowerPresentNodes32() throws InterruptedException { List nodes = TransactionUtils.getNodeIds(); for (NodeId nodeId : nodes) { - TransactionUtils.writeNodeTransaction3(nodeId.getValue(), this.getDataBroker(), null); + TransactionUtils.writeNodeTransaction3(nodeId.getValue(), this.dataBroker, null); Thread.sleep(500); } ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3(); @@ -226,7 +221,7 @@ public class PowerMgmtTest extends AbstractTest { public void testSetPowerPresentNodes4() throws InterruptedException { List nodes = TransactionUtils.getNodeIds(); for (NodeId nodeId : nodes) { - TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.getDataBroker(), "network"); + TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.dataBroker, "network"); Thread.sleep(500); } ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput2(); @@ -251,7 +246,7 @@ public class PowerMgmtTest extends AbstractTest { public void testSetPowerPresentNodes42() throws InterruptedException { List nodes = TransactionUtils.getNodeIds(); for (NodeId nodeId : nodes) { - TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.getDataBroker(), "deg"); + TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.dataBroker, "deg"); Thread.sleep(500); } ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3(); @@ -263,7 +258,7 @@ public class PowerMgmtTest extends AbstractTest { public void testSetPowerPresentNodes422() throws InterruptedException { List nodes = TransactionUtils.getNodeIds(); for (NodeId nodeId : nodes) { - TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.getDataBroker(), "deg"); + TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.dataBroker, "deg"); Thread.sleep(500); } ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput4(); @@ -275,7 +270,7 @@ public class PowerMgmtTest extends AbstractTest { public void testSetPowerPresentNodes43() throws InterruptedException { List nodes = TransactionUtils.getNodeIds(); for (NodeId nodeId : nodes) { - TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.getDataBroker(), null); + TransactionUtils.writeNodeTransaction(nodeId.getValue(), this.dataBroker, null); Thread.sleep(500); } ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3();