Adapt TransportPCE code to Sulfur

[transportpce.git] / olm / src / test / java / org / opendaylight / transportpce / olm / power / PowerMgmtTest.java

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 c020b545c0af96d07b4dd28f606d7e577e45f34c..81532602f511f1de54b062e048507d4ca89238a2 100644 (file)
--- a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtTest.java
+++ b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtTest.java
@@ -70,7 +70,6 @@ public class PowerMgmtTest extends AbstractTest {
         dataBroker = this.getNewDataBroker();
         this.mountPoint = new MountPointStub(dataBroker);
         this.mountPointService = new MountPointServiceStub(mountPoint);
-        // 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());
@@ -86,7 +85,8 @@ public class PowerMgmtTest extends AbstractTest {
         this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager);
         this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager, this.portMapping,
             this.portMappingVersion22);
-        this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager);
+        this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager, this.portMapping,
+            this.portMappingVersion710);
         this.openRoadmInterfaces = new OpenRoadmInterfacesImpl((this.deviceTransactionManager),
                 this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22,
             this.openRoadmInterfacesImpl710);
@@ -188,6 +188,7 @@ public class PowerMgmtTest extends AbstractTest {
         Assert.assertEquals(true, output);
     }
     /*
+    TODO: see if this test is always relevant
     @Test
     public void testSetPowerPresentNodes31() throws InterruptedException {
         List<NodeId> nodes = TransactionUtils.getNodeIds();
@@ -237,6 +238,7 @@ public class PowerMgmtTest extends AbstractTest {
     }
 
     /*
+    TODO: see if this test is always relevant
     @Test
     public void testSetPowerPresentNodes41() throws InterruptedException {
         List<NodeId> nodes = TransactionUtils.getNodeIds();