X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2FPcePathDescriptionTests.java;h=52a56a8335c474e06c349160a93384d492d2470c;hb=da37d3bba2a7aeafc56c2ccd0e2b3610ecea82ef;hp=b58b676d45494a2893436d000efe2fb7b027ef77;hpb=a5f7278347a0e089111233bb81926746ad9f1936;p=transportpce.git 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 b58b676d4..52a56a833 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java @@ -24,20 +24,17 @@ 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.rev181130.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.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; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link; - public class PcePathDescriptionTests extends AbstractTest { private PcePathDescription pcePathDescription; private PceResult pceResult; - private static final Long WAVE_LENGTH = 20L; private PceLink pceLink = null; private Link link = null; private Node node = null; @@ -52,14 +49,11 @@ public class PcePathDescriptionTests extends AbstractTest { // Link link=genereateLinkBuilder(); NodeBuilder node1Builder = NodeUtils.getNodeBuilder(NodeUtils.geSupportingNodes()); - node = node1Builder.build(); - + node = node1Builder.setNodeId(new NodeId("test")).build(); PceOpticalNode pceOpticalNode = new PceOpticalNode(node, - OpenroadmNodeType.SRG, new NodeId("OpenROADM-3-2-DEG1"), ServiceFormat.Ethernet, - "DEGREE"); + OpenroadmNodeType.SRG); PceOpticalNode pceOpticalNode2 = new PceOpticalNode(node, - OpenroadmNodeType.SRG, new NodeId("OpenROADM-3-1-DEG1"), ServiceFormat.Ethernet, - "DEGREE"); + OpenroadmNodeType.SRG); pceLink = new PceLink(link, pceOpticalNode, pceOpticalNode2); pceLink.setClient("XPONDER-CLIENT"); @@ -67,6 +61,7 @@ public class PcePathDescriptionTests extends AbstractTest { pceResult = new PceResult(); pceResult.setRC("200"); pceResult.setRate(Long.valueOf(1)); + pceResult.setServiceType("100GE"); Map map = Map.of(new LinkId("OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1"), pceLink); pcePathDescription = new PcePathDescription(List.of(pceLink), map, pceResult); @@ -92,4 +87,4 @@ public class PcePathDescriptionTests extends AbstractTest { MapUtils.getSRLGfromLink(link); } -} \ No newline at end of file +}