Adapt TransportPCE code to Sulfur

[transportpce.git] / pce / src / test / java / org / opendaylight / transportpce / pce / PcePathDescriptionTests.java

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
index 6ea97283817cbb25c3d1b97977c8e8d174bb75c5..95a2d0d262f303c6f3cd34a5c7b47fa9e5de247b 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
@@ -29,7 +29,7 @@ import org.opendaylight.transportpce.pce.networkanalyzer.PceResult;
 import org.opendaylight.transportpce.pce.utils.NodeUtils;
 import org.opendaylight.transportpce.pce.utils.PceTestData;
 import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmNodeType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.NodeBuilder;
@@ -50,7 +50,7 @@ public class PcePathDescriptionTests extends AbstractTest {
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         // Build Link
         link = NodeUtils.createRoadmToRoadm("OpenROADM-3-2-DEG1",
                 "OpenROADM-3-1-DEG1",
@@ -61,9 +61,13 @@ public class PcePathDescriptionTests extends AbstractTest {
         NodeBuilder node1Builder = NodeUtils.getNodeBuilder(NodeUtils.geSupportingNodes());
         node = node1Builder.setNodeId(new NodeId("test")).build();
         PceOpticalNode pceOpticalNode = new PceOpticalNode(deviceNodeId, serviceType, portMapping, node,
-                OpenroadmNodeType.SRG, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50);
+                OpenroadmNodeType.SRG, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1,
+                GridConstant.SLOT_WIDTH_50,
+                GridConstant.SLOT_WIDTH_50);
         PceOpticalNode pceOpticalNode2 = new PceOpticalNode(deviceNodeId, serviceType, portMapping, node,
-                OpenroadmNodeType.SRG, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50);
+                OpenroadmNodeType.SRG, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1,
+                GridConstant.SLOT_WIDTH_50,
+                GridConstant.SLOT_WIDTH_50);
 
         pceLink = new PceLink(link, pceOpticalNode, pceOpticalNode2);
         pceLink.setClient("XPONDER-CLIENT");
@@ -71,7 +75,7 @@ public class PcePathDescriptionTests extends AbstractTest {
         pceResult = new PceResult();
         pceResult.setRC("200");
         pceResult.setRate(Long.valueOf(1));
-        pceResult.setServiceType(StringConstants.SERVICE_TYPE_100GE);
+        pceResult.setServiceType(StringConstants.SERVICE_TYPE_100GE_T);
         Map<LinkId, PceLink> map = Map.of(new LinkId("OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1"), pceLink);
         pcePathDescription = new PcePathDescription(List.of(pceLink),
                 map, pceResult);
@@ -87,8 +91,9 @@ public class PcePathDescriptionTests extends AbstractTest {
 
     @Test
     public void mapUtil() {
-        PceConstraints pceConstraintsCalc = new PceConstraintsCalc(PceTestData
-                .getPCERequest(), new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())))
+        PceConstraints pceConstraintsCalc = new PceConstraintsCalc(
+                    PceTestData.getPCERequest(),
+                    new NetworkTransactionImpl(new RequestProcessor(getDataBroker())))
                 .getPceHardConstraints();
         MapUtils.mapDiversityConstraints(List.of(node), List.of(link), pceConstraintsCalc);
         MapUtils.getSupLink(link);