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=7bf9fae798bf3f3b1e7199f624d79bd625a4ce7f;hb=c6b93e8d8dd5a5597ca891140212229d99431614;hp=ea8cb4a4ff3a22056868ab1069f7d91f6f8d6db5;hpb=2ddff782c0d3b191b8722499de68999de7c8dbc6;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 ea8cb4a4f..7bf9fae79 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 @@ -12,8 +12,12 @@ import java.util.Map; import java.util.Optional; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; 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,50 +25,52 @@ import org.opendaylight.transportpce.pce.networkanalyzer.PceOpticalNode; 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.openroadm.network.types.rev181130.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.RoutingConstraintsSp; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129.ServiceFormat; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.PceMetric; 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.NodeKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link; -@Ignore public class PceGraphTest { private Link link = null; private Node node = null; private PceLink pceLink = null; private PceGraph pceGraph = null; - private PathComputationRequestInput requestInput = PceTestData.getPCE_test2_request_54(); private PceConstraints pceHardConstraints = null; private PceResult rc = null; private PceOpticalNode pceOpticalNode = null; private PceOpticalNode pceOpticalNode2 = null; private Map allPceNodes = null; + private String deviceNodeId = "device node"; + private String serviceType = "100GE"; + @Mock + private PortMapping portMapping; @Before public void setUp() { + MockitoAnnotations.openMocks(this); // Build Link link = NodeUtils.createRoadmToRoadm("OpenROADM-3-2-DEG1", "OpenROADM-3-1-DEG1", "DEG1-TTP-TX", "DEG1-TTP-RX").build(); - node = NodeUtils.getNodeBuilder(NodeUtils.geSupportingNodes()).build(); - - pceOpticalNode = new PceOpticalNode(node, - OpenroadmNodeType.SRG, new NodeId("OpenROADM-3-2-DEG1"), ServiceFormat.Ethernet, - "DEGREE"); - pceOpticalNode.checkWL(1); - pceOpticalNode.checkWL(2); - - pceOpticalNode2 = new PceOpticalNode(node, - OpenroadmNodeType.SRG, new NodeId("OpenROADM-3-1-DEG1"), ServiceFormat.Ethernet, - "DEGREE"); - pceOpticalNode2.checkWL(1); - pceOpticalNode2.checkWL(2); + NodeId nodeId = new NodeId("OpenROADM-3-2-DEG1"); + node = NodeUtils.getNodeBuilder(NodeUtils.geSupportingNodes()) + .setNodeId(nodeId).withKey(new NodeKey(nodeId)) + .build(); + 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(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"); @@ -74,13 +80,12 @@ public class PceGraphTest { // init PceHardContraints pceHardConstraints = new PceConstraints(); // pceHardConstraints.setp - allPceNodes = Map.of(new NodeId("OpenROADM-3-2-DEG1"), pceOpticalNode, - new NodeId("OpenROADM-3-1-DEG1"), pceOpticalNode2); + allPceNodes = Map.of(nodeId, pceOpticalNode, nodeId2, pceOpticalNode2); rc = new PceResult(); pceGraph = new PceGraph(pceOpticalNode, pceOpticalNode2, allPceNodes, pceHardConstraints, null, rc, - "ODU4"); + StringConstants.SERVICE_TYPE_ODU4); } @Test @@ -91,7 +96,7 @@ public class PceGraphTest { @Test public void clacPathPropagationDelay() { - pceHardConstraints.setPceMetrics(RoutingConstraintsSp.PceMetric.PropagationDelay); + pceHardConstraints.setPceMetrics(PceMetric.PropagationDelay); pceGraph.setConstrains(pceHardConstraints, null); Assert.assertEquals(pceGraph.calcPath(), true); @@ -102,24 +107,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); } @@ -133,7 +137,7 @@ public class PceGraphTest { node = NodeUtils.getOTNNodeBuilder(NodeUtils.geSupportingNodes(), OpenroadmTpType.XPONDERNETWORK).build(); PceOtnNode pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR, - new NodeId("optical"), ServiceFormat.OTU.getName(), "DEGREE"); + new NodeId("optical"), ServiceFormat.OTU.getName(), "serviceType", null); pceOtnNode.validateXponder("optical", "sl"); pceOtnNode.validateXponder("not optical", "sl"); pceOtnNode.initXndrTps("AZ"); @@ -142,7 +146,7 @@ public class PceGraphTest { PceOtnNode pceOtnNode2 = new PceOtnNode(node, OpenroadmNodeType.MUXPDR, - new NodeId("optical2"), ServiceFormat.OTU.getName(), "DEGREE"); + new NodeId("optical2"), ServiceFormat.OTU.getName(), "serviceType", null); pceOtnNode2.validateXponder("optical", "sl"); pceOtnNode2.validateXponder("not optical", "sl"); pceOtnNode2.initXndrTps("AZ");