X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fgraph%2FPceGraphTest.java;h=cd5abb985deeb07fb594c835599883d088903c49;hb=2a29f9ab006d8806f77b1a1e073b478e5351cc5f;hp=e8fbbc1c1ef74503211bb5c7f7b6c536899174fd;hpb=fe6f2ece0b57217e4ee08f824b52ab7f93747853;p=transportpce.git

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 e8fbbc1c1..cd5abb985 100644
--- 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,11 @@ import java.util.Optional;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.opendaylight.transportpce.common.StringConstants;
+import org.opendaylight.transportpce.common.fixedflex.GridConstant;
+import org.opendaylight.transportpce.common.mapping.PortMapping;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceLink;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceNode;
@@ -21,7 +26,7 @@ import org.opendaylight.transportpce.pce.networkanalyzer.PceOtnNode;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceResult;
 import org.opendaylight.transportpce.pce.utils.NodeUtils;
 import org.opendaylight.transportpce.pce.utils.PceTestData;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev210701.PathComputationRequestInput;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmTpType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat;
@@ -43,9 +48,14 @@ public class PceGraphTest {
     private PceOpticalNode pceOpticalNode = null;
     private PceOpticalNode pceOpticalNode2 = null;
     private Map<NodeId, PceNode> allPceNodes = null;
+    private String deviceNodeId = "device node";
+    private String serviceType = "100GE";
+    @Mock
+    private PortMapping portMapping;
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
         // Build Link
         link = NodeUtils.createRoadmToRoadm("OpenROADM-3-2-DEG1",
                 "OpenROADM-3-1-DEG1",
@@ -55,15 +65,15 @@ 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(deviceNodeId, serviceType, portMapping, node,
+                OpenroadmNodeType.DEGREE, StringConstants.OPENROADM_DEVICE_VERSION_2_2_1,
+                GridConstant.SLOT_WIDTH_50, 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(deviceNodeId, serviceType, portMapping, node2,
+                OpenroadmNodeType.DEGREE, 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");
 
@@ -78,7 +88,7 @@ public class PceGraphTest {
         pceGraph = new PceGraph(pceOpticalNode, pceOpticalNode2, allPceNodes,
                 pceHardConstraints,
                 null, rc,
-                "ODU4");
+                StringConstants.SERVICE_TYPE_ODU4);
     }
 
     @Test
@@ -100,24 +110,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_T);
 
         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);
     }