Use slot width granularity in PCE

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

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java
index e8fbbc1c1ef74503211bb5c7f7b6c536899174fd..cedf39046d1780fe1b35cf08f2fe962c04acbe6a 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java
@@ -13,6 +13,8 @@ import java.util.Optional;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opendaylight.transportpce.common.StringConstants;
+import org.opendaylight.transportpce.common.fixedflex.GridConstant;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceLink;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceNode;
@@ -55,15 +57,13 @@ public class PceGraphTest {
         node = NodeUtils.getNodeBuilder(NodeUtils.geSupportingNodes())
                 .setNodeId(nodeId).withKey(new NodeKey(nodeId))
                 .build();
-        pceOpticalNode = new PceOpticalNode(node, OpenroadmNodeType.DEGREE);
-        pceOpticalNode.checkWL(1);
-        pceOpticalNode.checkWL(2);
+        pceOpticalNode = new PceOpticalNode(node,
+                OpenroadmNodeType.DEGREE, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50);
         NodeId nodeId2 = new NodeId("OpenROADM-3-1-DEG1");
         Node node2 = NodeUtils.getNodeBuilder(NodeUtils.geSupportingNodes())
                 .setNodeId(nodeId2).withKey(new NodeKey(nodeId2)).build();
-        pceOpticalNode2 = new PceOpticalNode(node2, OpenroadmNodeType.DEGREE);
-        pceOpticalNode2.checkWL(1);
-        pceOpticalNode2.checkWL(2);
+        pceOpticalNode2 = new PceOpticalNode(node2,
+                OpenroadmNodeType.DEGREE, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1, GridConstant.SLOT_WIDTH_50);
         pceLink = new PceLink(link, pceOpticalNode, pceOpticalNode2);
         pceLink.setClient("XPONDER-CLIENT");
 
@@ -78,7 +78,7 @@ public class PceGraphTest {
         pceGraph = new PceGraph(pceOpticalNode, pceOpticalNode2, allPceNodes,
                 pceHardConstraints,
                 null, rc,
-                "ODU4");
+                StringConstants.SERVICE_TYPE_ODU4);
     }
 
     @Test
@@ -100,24 +100,23 @@ public class PceGraphTest {
 
     @Test
     public void clacPath100GE() {
-        pceOpticalNode.checkWL(1);
         pceGraph = new PceGraph(pceOpticalNode, pceOpticalNode2, allPceNodes,
                 pceHardConstraints,
                 null, rc,
-                "100GE");
+                StringConstants.SERVICE_TYPE_100GE);
 
         Assert.assertEquals(pceGraph.calcPath(), false);
     }
 
     @Test(expected = Exception.class)
     public void clacPath10GE2() {
-        pceGraph = getOtnPceGraph("10GE");
+        pceGraph = getOtnPceGraph(StringConstants.SERVICE_TYPE_10GE);
         Assert.assertEquals(pceGraph.calcPath(), false);
     }
 
     @Test(expected = Exception.class)
     public void clacPath1GE() {
-        pceGraph = getOtnPceGraph("1GE");
+        pceGraph = getOtnPceGraph(StringConstants.SERVICE_TYPE_1GE);
         Assert.assertEquals(pceGraph.calcPath(), false);
     }