Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Migrate OLM module to Aluminium
[transportpce.git] / olm / src / test / java / org / opendaylight / transportpce / olm / power / PowerMgmtPowerMockTest.java
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 345fcb6305aa51cd46919bf31bd32fcc6ed6baa6..ab71b96261a28d20163a9ce9287ba5d4d18cc863 100644 (file)
--- a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java
+++ b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java
@@ -9,7 +9,6 @@
 package org.opendaylight.transportpce.olm.power;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -46,20 +45,19 @@ import org.opendaylight.transportpce.olm.util.OlmPowerServiceRpcImplUtil;
 import org.opendaylight.transportpce.olm.util.OlmUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.NodeInfoBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.Ots;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.OtsBuilder;
@@ -69,6 +67,7 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+@Ignore
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({OlmUtils.class,PowerMgmtVersion121.class})
 @PowerMockIgnore("org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.*")
@@ -117,7 +116,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
                 this.deviceTransactionManager);
     }
 
-    @Ignore
     @Test
     public void testSetPowerMockingUtil() {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -129,7 +127,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
 
     }
 
-    @Ignore
     @Test
     public void testSetPowerMockingUtilNetwokType() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -151,7 +148,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
 
     }
 
-    @Ignore
     @Test
     public void testSetPowerMockingUtilNetwokTypeMoreThanOneNode() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -173,7 +169,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
 
     }
 
-    @Ignore
     @Test
     public void testSetPowerXpdrNodes() {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -185,7 +180,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
 
     }
 
-    @Ignore
     @Test
     public void testSetPowerRdmNodesReturnInterfaceEmpty() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -200,7 +194,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
         Assert.assertEquals(false, output);
     }
 
-    @Ignore
     @Test
     public void testSetPowerRdmNodesThrowsException() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -215,7 +208,6 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
         Assert.assertEquals(false, output);
     }
 
-    @Ignore
     @Test
     public void testSetPowerRdmNodesReturnInterface() throws OpenRoadmInterfaceException {
         PowerMockito.mockStatic(OlmUtils.class);
@@ -227,11 +219,11 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
         Ots ots = new OtsBuilder().setSpanLossTransmit(new RatioDB(new BigDecimal(23))).build();
         Interface1Builder intf1Builder = new Interface1Builder();
         Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString())).thenReturn(
-                Optional.of(new InterfaceBuilder().addAugmentation(Interface1.class, intf1Builder.setOts(ots).build())
+                Optional.of(new InterfaceBuilder().addAugmentation(intf1Builder.setOts(ots).build())
                         .build()));
         CrossConnect crossConnectMock = Mockito.mock(CrossConnectImpl.class);
         Mockito.when(crossConnectMock
-                .setPowerLevel(Mockito.anyString(), ArgumentMatchers.eq(OpticalControlMode.Power), Mockito.any(),
+                .setPowerLevel(Mockito.anyString(), OpticalControlMode.Power.getName(), Mockito.any(),
                         Mockito.anyString())).thenReturn(true);
         PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,crossConnectMock);
         boolean output = powerMgmtImpl.setPower(input);
@@ -249,30 +241,32 @@ public class PowerMgmtPowerMockTest extends AbstractTest {
 
     private Nodes getXpdrNodesFromNodesBuilderDeg() {
         MappingBuilder mappingBuilder = getMappingBuilderDeg();
+        Mapping mapping = mappingBuilder.build();
         return new NodesBuilder().setNodeId("node 1")
                 .setNodeInfo(new NodeInfoBuilder().setNodeType(NodeTypes.Xpdr).build())
-                .setMapping(Arrays.asList(mappingBuilder.build()))
+                .setMapping(Map.of(mapping.key(),mapping))
                 .build();
     }
 
     private Nodes getXpdrNodesFromNodesBuilderNetwork() {
         MappingBuilder mappingBuilder = getMappingBuilderNetWork();
+        Mapping mapping = mappingBuilder.build();
         return new NodesBuilder().setNodeId("node 1")
                 .setNodeInfo(new NodeInfoBuilder().setNodeType(NodeTypes.Xpdr)
                         .setOpenroadmVersion(NodeInfo.OpenroadmVersion._121)
                         .build())
-                .setMapping(Arrays.asList(mappingBuilder.build()))
+                .setMapping(Map.of(mapping.key(),mapping))
                 .build();
     }
 
     private Nodes getRdmNodesFromNodesBuilder() {
         MappingBuilder mappingBuilder = getMappingBuilderDeg();
-
+        Mapping mapping = mappingBuilder.build();
         return new NodesBuilder().setNodeId("node 1").setNodeInfo(
                 new NodeInfoBuilder().setNodeType(NodeTypes.Rdm)
                         .setOpenroadmVersion(NodeInfo.OpenroadmVersion._121)
                         .build())
-                .setMapping(Arrays.asList(mappingBuilder.build()))
+                .setMapping(Map.of(mapping.key(),mapping))
                 .build();
     }
 
Repository for Transport PCE project.