X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Fpower%2FPowerMgmtPowerMockTest.java;h=637316a9c4d3f59743fae6c8bf1698264a1c0a95;hb=98b07b5da982529cdec2db98f5b96902ed47323b;hp=0a8d34d9911a6da4e46b955c78244df9004244c9;hpb=f49968974e1477d4fd9cfdd87d867c9ad347678e;p=transportpce.git

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 0a8d34d99..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
@@ -8,6 +8,7 @@
 
 package org.opendaylight.transportpce.olm.power;
 
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -102,24 +103,22 @@ 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);
         this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces);
         this.portMapping = Mockito.spy(this.portMapping);
         this.powerMgmt = new PowerMgmtImpl(getDataBroker(), this.openRoadmInterfaces, this.crossConnect,
-                this.deviceTransactionManager);
+                this.deviceTransactionManager, this.portMapping);
     }
 
     @Test
     public void testSetPowerMockingUtil() {
         Mockito.mockStatic(OlmUtils.class);
-        Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
-                .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderDeg()));
+        Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+                .thenReturn(getXpdrNodesFromNodesBuilderDeg());
         ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput2();
         boolean output = this.powerMgmt.setPower(input);
         Assert.assertEquals(false, output);
@@ -130,8 +129,8 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
     public void testSetPowerMockingUtilNetwokType() throws OpenRoadmInterfaceException {
         Mockito.mockStatic(OlmUtils.class);
         Mockito.mockStatic(PowerMgmtVersion121.class);
-        Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
-                .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderNetwork()));
+        Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+                .thenReturn(getXpdrNodesFromNodesBuilderNetwork());
         Map<String, Double> txPowerRangeMap = new HashMap<>();
         Mockito.when(PowerMgmtVersion121.getXponderPowerRange(
                 Mockito.anyString(), Mockito.anyString(), Mockito.anyString(),
@@ -151,8 +150,8 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
     public void testSetPowerMockingUtilNetwokTypeMoreThanOneNode() throws OpenRoadmInterfaceException {
         Mockito.mockStatic(OlmUtils.class);
         Mockito.mockStatic(PowerMgmtVersion121.class);
-        Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
-                .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderNetwork()));
+        Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+                .thenReturn(getXpdrNodesFromNodesBuilderNetwork());
         Map<String, Double> txPowerRangeMap = new HashMap<>();
         Mockito.when(PowerMgmtVersion121
                 .getXponderPowerRange(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(),
@@ -171,8 +170,8 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
     @Test
     public void testSetPowerXpdrNodes() {
         Mockito.mockStatic(OlmUtils.class);
-        Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
-                .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderDeg()));
+        Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+                .thenReturn(getXpdrNodesFromNodesBuilderDeg());
         ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3();
         boolean output = this.powerMgmt.setPower(input);
         Assert.assertEquals(true, output);
@@ -182,8 +181,8 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
     @Test
     public void testSetPowerRdmNodesReturnInterfaceEmpty() throws OpenRoadmInterfaceException {
         Mockito.mockStatic(OlmUtils.class);
-        Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
-                .thenReturn(Optional.of(getRdmNodesFromNodesBuilder()));
+        Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+                .thenReturn(getRdmNodesFromNodesBuilder());
         ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3();
         OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class);
         Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString()))
@@ -196,8 +195,8 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
     @Test
     public void testSetPowerRdmNodesThrowsException() throws OpenRoadmInterfaceException {
         Mockito.mockStatic(OlmUtils.class);
-        Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
-                .thenReturn(Optional.of(getRdmNodesFromNodesBuilder()));
+        Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+                .thenReturn(getRdmNodesFromNodesBuilder());
         ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3();
         OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class);
         Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString()))
@@ -210,8 +209,8 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
     @Test
     public void testSetPowerRdmNodesReturnInterface() throws OpenRoadmInterfaceException {
         Mockito.mockStatic(OlmUtils.class);
-        Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
-                .thenReturn(Optional.of(getRdmNodesFromNodesBuilder()));
+        Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+                .thenReturn(getRdmNodesFromNodesBuilder());
         ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3();
         OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class);
 
@@ -236,7 +235,7 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
             this.openRoadmInterfacesImpl710);
         openRoadmInterfacesSpy = Mockito.spy(openRoadmInterfacesSpy);
         return new PowerMgmtImpl(getDataBroker(), openRoadmInterfacesSpy, crossConnectMock,
-                this.deviceTransactionManager);
+                this.deviceTransactionManager, this.portMapping);
     }
 
     private Nodes getXpdrNodesFromNodesBuilderDeg() {