X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=pce%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fgraph%2FPceGraphTest.java;h=d85efa20c81a25fc668a1960331c71a0b90382f7;hb=HEAD;hp=8398e2782617dc4661b9f0e0850a1c658007e09d;hpb=5528970e6cb5c6d049e4412059f6c4996edaa2e7;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 8398e2782..d85efa20c 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 @@ -56,24 +56,25 @@ import org.opendaylight.transportpce.test.converter.DataObjectConverter; import org.opendaylight.transportpce.test.converter.JSONDataObjectConverter; import org.opendaylight.transportpce.test.stub.MountPointServiceStub; import org.opendaylight.transportpce.test.stub.MountPointStub; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.PathComputationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.PathComputationRequestInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.path.computation.request.input.ServiceAEndBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.path.computation.request.input.ServiceZEndBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.service.port.PortBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequestInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequestInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PceConstraintMode; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.path.computation.request.input.ServiceAEndBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.path.computation.request.input.ServiceZEndBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.service.port.PortBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev211210.OpenroadmVersionType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.rev211210.Node1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.networks.network.node.termination.point.XpdrNetworkAttributesBuilder; -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.routing.constraints.rev211210.constraints.CoRoutingBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co.routing.ServiceIdentifierListBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.HardConstraintsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.routing.constraints.SoftConstraintsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev230526.OpenroadmVersionType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.rev230526.Node1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.TerminationPoint1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.networks.network.node.termination.point.XpdrNetworkAttributesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev230526.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.constraints.CoRoutingBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.constraints.co.routing.ServiceIdentifierListBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.routing.constraints.HardConstraintsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209.routing.constraints.SoftConstraintsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129.ServiceFormat; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OperationalModeCatalog; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.OperationalModeCatalog; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.PceMetric; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.RxDirectionBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.endpoint.sp.TxDirectionBuilder; @@ -96,7 +97,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -113,11 +113,11 @@ public class PceGraphTest extends AbstractTest { private PceResult rc = null; private Map allPceNodes = null; private Map allPceLinks = null; - private static final String CATALOG_FILE = "src/test/resources/apidocCatalog10_1OptSpecV5_1.json"; + private static final String CATALOG_FILE = "src/test/resources/apidocCatalog12_0-OptSpecV5_1.json"; private static final String MAPPING_FILE = "src/test/resources/topologyData/portMapping2.json"; private static OperationalModeCatalog omCatalog; private static org.opendaylight.yang.gen.v1.http.org.opendaylight - .transportpce.portmapping.rev220316.Network networkNode; + .transportpce.portmapping.rev231221.Network networkNode; private DataBroker dataBroker; private MountPoint mountPoint; private MountPointService mountPointService; @@ -149,7 +149,7 @@ public class PceGraphTest extends AbstractTest { try (Reader reader = new FileReader(CATALOG_FILE, StandardCharsets.UTF_8)) { NormalizedNode normalizedNode = dataObjectConverter .transformIntoNormalizedNode(reader) - .get(); + .orElseThrow(); omCatalog = (OperationalModeCatalog) getDataStoreContextUtil() .getBindingDOMCodecServices() .fromNormalizedNode( @@ -168,20 +168,20 @@ public class PceGraphTest extends AbstractTest { } // The mapping corresponding to the topology is directly populated from a file in the Dta Store try (Reader reader = new FileReader(MAPPING_FILE, StandardCharsets.UTF_8)) { - NormalizedNode normalizedNode = dataObjectConverter.transformIntoNormalizedNode(reader).get(); + NormalizedNode normalizedNode = dataObjectConverter.transformIntoNormalizedNode(reader).orElseThrow(); networkNode = (org.opendaylight.yang.gen.v1.http.org.opendaylight - .transportpce.portmapping.rev220316.Network) getDataStoreContextUtil() + .transportpce.portmapping.rev231221.Network) getDataStoreContextUtil() .getBindingDOMCodecServices() .fromNormalizedNode( YangInstanceIdentifier.of(org.opendaylight.yang.gen.v1.http.org.opendaylight - .transportpce.portmapping.rev220316.Network.QNAME), normalizedNode) + .transportpce.portmapping.rev231221.Network.QNAME), normalizedNode) .getValue(); @NonNull WriteTransaction newWriteOnlyTransaction = dataBroker.newWriteOnlyTransaction(); newWriteOnlyTransaction .put(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(org.opendaylight.yang.gen.v1.http.org.opendaylight - .transportpce.portmapping.rev220316.Network.class), + .transportpce.portmapping.rev231221.Network.class), networkNode); newWriteOnlyTransaction.commit().get(); } catch (IOException e) { @@ -197,18 +197,13 @@ public class PceGraphTest extends AbstractTest { // load openroadm-network Reader gnpyNetwork = new FileReader("src/test/resources/gnpy/gnpy_network.json", StandardCharsets.UTF_8); networkReader = new JsonReader(gnpyNetwork); - Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader, - QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); + Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader, Networks.QNAME); saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.UNDERLAY_NETWORK_ID); // load openroadm-topology - Reader gnpyTopo = - new FileReader("src/test/resources/topologyData/or-base-topology.json", StandardCharsets.UTF_8); + Reader gnpyTopo = new FileReader("src/test/resources/topologyData/or-base-topology.json", + StandardCharsets.UTF_8); topoReader = new JsonReader(gnpyTopo); - networks = (Networks) JsonUtil - .getInstance() - .getDataObjectFromJson( - topoReader, - QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); + networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader, Networks.QNAME); saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.OVERLAY_NETWORK_ID); } catch (IOException | InterruptedException | ExecutionException e) { LOG.error("Cannot init test ", e); @@ -254,7 +249,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ); + rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ, PceConstraintMode.Loose, null); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(3.0919881995992924)); } @@ -267,7 +262,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_OTUC2, netTransServ); + rc, StringConstants.SERVICE_TYPE_OTUC2, netTransServ, PceConstraintMode.Loose, null); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(1.1559963686478447)); } @@ -280,7 +275,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_OTUC3, netTransServ); + rc, StringConstants.SERVICE_TYPE_OTUC3, netTransServ, PceConstraintMode.Loose, null); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(0.3351048800367167)); } @@ -293,7 +288,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_400GE, netTransServ); + rc, StringConstants.SERVICE_TYPE_400GE, netTransServ, PceConstraintMode.Loose, null); assertEquals(pceGraph.calcPath(), false); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(0.0)); } @@ -306,7 +301,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_400GE, netTransServ); + rc, StringConstants.SERVICE_TYPE_400GE, netTransServ, PceConstraintMode.Loose, null); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(1.4432381874659086)); } @@ -319,7 +314,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_OTUC4, netTransServ); + rc, StringConstants.SERVICE_TYPE_OTUC4, netTransServ, PceConstraintMode.Loose, null); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(1.4432381874659086)); } @@ -332,7 +327,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_OTUC4, netTransServ); + rc, StringConstants.SERVICE_TYPE_OTUC4, netTransServ, PceConstraintMode.Loose, null); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(0.0)); } @@ -345,7 +340,7 @@ public class PceGraphTest extends AbstractTest { pceCalc.retrievePceNetwork(); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ); + rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ, PceConstraintMode.Loose, null); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getmargin()), Optional.ofNullable(3.0919881995992924)); } @@ -359,8 +354,8 @@ public class PceGraphTest extends AbstractTest { pceHardConstraints.setPceMetrics(PceMetric.PropagationDelay); pceGraph = new PceGraph(pceCalc.getaendPceNode(), pceCalc.getzendPceNode(), pceCalc.getAllPceNodes(), pceCalc.getAllPceLinks(), pceHardConstraints, - null, rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ); - pceGraph.setConstrains(pceHardConstraints, null); + rc, StringConstants.SERVICE_TYPE_100GE_T, netTransServ, PceConstraintMode.Loose, null); + pceGraph.setConstrains(pceHardConstraints); assertEquals(pceGraph.calcPath(), true); assertEquals(Optional.ofNullable(pceGraph.getPathAtoZ().get(2).getLatency()), @@ -410,7 +405,7 @@ public class PceGraphTest extends AbstractTest { pceOtnNode2.checkAvailableTribSlot(); pceLink1 = new PceLink(link1, pceOtnNode, pceOtnNode2); - pceLink1.setClient("XPONDER-CLIENT"); + pceLink1.setClientA("XPONDER-CLIENT"); pceLink1.getDestId(); pceOtnNode.addOutgoingLink(pceLink1); @@ -421,8 +416,8 @@ public class PceGraphTest extends AbstractTest { allPceNodes = Map.of( new NodeId("optical"), pceOtnNode, new NodeId("optical2"), pceOtnNode2); - return new PceGraph(pceOtnNode, pceOtnNode2, allPceNodes, allPceLinks, pceHardConstraints, null, - new PceResult(), type, null); + return new PceGraph(pceOtnNode, pceOtnNode2, allPceNodes, allPceLinks, pceHardConstraints, + new PceResult(), type, null, PceConstraintMode.Loose, null); } private void saveOpenRoadmNetwork(Network network, String networkId) @@ -448,7 +443,7 @@ public class PceGraphTest extends AbstractTest { .addAugmentation( new Node1Builder().setOpenroadmVersion(OpenroadmVersionType._221).build()) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1Builder() + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Node1Builder() .setNodeType(nodeType).build()) .build(); } @@ -476,10 +471,10 @@ public class PceGraphTest extends AbstractTest { .withKey(new NodeKey(new NodeId(nodeId))) .setSupportingNode(ImmutableMap.of(supportingNode.key(), supportingNode)) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.Node1Builder() + new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev230526.Node1Builder() .setXpdrAttributes(null).build()) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1Builder() + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev230526.Node1Builder() .setNodeType(nodeType).build()) .build(); } @@ -553,8 +548,8 @@ public class PceGraphTest extends AbstractTest { .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( - new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co - .routing.ServiceIdentifierListKey("Some existing-service"), + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209 + .constraints.co.routing.ServiceIdentifierListKey("Some existing-service"), new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service").build())) .build()) .build()) @@ -562,8 +557,8 @@ public class PceGraphTest extends AbstractTest { .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( - new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co - .routing.ServiceIdentifierListKey("Some existing-service"), + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209 + .constraints.co.routing.ServiceIdentifierListKey("Some existing-service"), new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service").build())) .build()) .build()) @@ -603,8 +598,8 @@ public class PceGraphTest extends AbstractTest { .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( - new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co - .routing.ServiceIdentifierListKey("Some existing-service"), + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209 + .constraints.co.routing.ServiceIdentifierListKey("Some existing-service"), new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service").build())) .build()) .build()) @@ -612,8 +607,8 @@ public class PceGraphTest extends AbstractTest { .setCustomerCode(Set.of("Some customer-code")) .setCoRouting(new CoRoutingBuilder() .setServiceIdentifierList(Map.of( - new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev211210.constraints.co - .routing.ServiceIdentifierListKey("Some existing-service"), + new org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constraints.rev221209 + .constraints.co.routing.ServiceIdentifierListKey("Some existing-service"), new ServiceIdentifierListBuilder().setServiceIdentifier("Some existing-service").build())) .build()) .build())