From 56d1795b647693ec1d620d6aca2c4003e3b302ca Mon Sep 17 00:00:00 2001 From: Thierry Jiao Date: Thu, 30 Jun 2022 11:08:50 +0200 Subject: [PATCH] Replace tpce-topology yang by existing ordmodels - Replace all use of transportpce-topology elements with identical ones present in OpenROADM models - If there is no replica of an element in OpenROADM models, displace the element to 'api/src/main/yang/transportpce-networkutils.yang' - Delete the 'transportpce-topology' yang file JIRA: TRNSPRTPCE-679 Signed-off-by: Thierry Jiao Change-Id: I74da30412e2d9bcfedbddef5af0055bdd742446f --- api/pom.xml | 5 + ...transportpce-networkutils@2022-06-30.yang} | 71 +++- .../tpce/module/TransportPCEImpl.java | 2 +- .../controllers/tpce/utils/TPCEUtils.java | 3 +- .../networkmodel/NetworkModelProvider.java | 2 +- .../networkmodel/NetworkUtilsImpl.java | 26 +- .../transportpce/networkmodel/OrdLink.java | 2 +- .../networkmodel/R2RLinkDiscovery.java | 2 +- .../networkmodel/Rdm2XpdrLink.java | 2 +- .../service/NetworkModelService.java | 2 +- .../service/NetworkModelServiceImpl.java | 2 +- .../networkmodel/util/LinkIdUtil.java | 2 +- .../util/OpenRoadmOtnTopology.java | 42 ++- .../networkmodel/util/OpenRoadmTopology.java | 24 +- .../NetworkModelProviderTest.java | 2 +- .../util/OpenRoadmOtnTopologyTest.java | 56 ++- .../util/OpenRoadmTopologyTest.java | 15 +- .../util/test/NetworkmodelTestUtil.java | 8 +- .../src/test/resources/openroadm-topology.xml | 24 +- .../transportpce-topology@2022-01-23.yang | 105 ------ .../pce/networkanalyzer/PceLink.java | 5 +- .../pce/networkanalyzer/PceOpticalNode.java | 7 +- .../test/resources/gnpy/gnpy_topology.json | 200 ++++++++--- .../RendererServiceOperationsImpl.java | 2 +- .../listeners/RendererListenerImpl.java | 2 +- .../topology/ConvertORTopoToTapiFullTopo.java | 6 +- .../topology/ConvertORTopoToTapiTopo.java | 6 +- .../tapi/topology/TapiTopologyImpl.java | 4 +- .../tapi/topology/TopologyUtils.java | 4 +- .../src/test/resources/openroadm-topology.xml | 16 +- tapi/src/test/resources/otn-topology.xml | 24 +- tests/sample_configs/NW-for-test-5-4.xml | 320 +++++++++--------- tests/sample_configs/NW-simple-topology.xml | 270 +++++++-------- .../gnpy/openroadmTopology.json | 200 ++++++++--- .../sample_configs/honeynode-otntopo400G.json | 16 +- .../honeynode-otntopo400GwithODUC4.json | 24 +- .../honeynode-otntopo400GwithOTUC4.json | 20 +- tests/sample_configs/honeynode-topo.xml | 16 +- tests/sample_configs/honeynode-topo400G.json | 16 +- .../1.2.1/test03_topology.py | 6 +- .../2.2.1/test03_topology.py | 6 +- .../2.2.1/test11_otn_end2end.py | 4 +- .../2.2.1/test14_otn_switch_end2end.py | 4 +- ...15_otn_end2end_with_intermediate_switch.py | 6 +- .../hybrid/test02_B100G_end2end.py | 4 +- 45 files changed, 885 insertions(+), 700 deletions(-) rename api/src/main/yang/{transportpce-networkutils@2017-08-18.yang => transportpce-networkutils@2022-06-30.yang} (57%) delete mode 100644 ordmodels/network/src/main/yang/transportpce-topology@2022-01-23.yang diff --git a/api/pom.xml b/api/pom.xml index cc6de817c..ff32883bc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -37,6 +37,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html transportpce-ordmodels-service ${project.version} + + ${project.groupId}.ordmodels + transportpce-ordmodels-network + ${project.version} + ${project.groupId} transportpce-tapimodels diff --git a/api/src/main/yang/transportpce-networkutils@2017-08-18.yang b/api/src/main/yang/transportpce-networkutils@2022-06-30.yang similarity index 57% rename from api/src/main/yang/transportpce-networkutils@2017-08-18.yang rename to api/src/main/yang/transportpce-networkutils@2022-06-30.yang index 8426fa31b..1e58eef1d 100644 --- a/api/src/main/yang/transportpce-networkutils@2017-08-18.yang +++ b/api/src/main/yang/transportpce-networkutils@2022-06-30.yang @@ -1,13 +1,69 @@ module transportpce-networkutils { - yang-version 1; + yang-version 1.1; namespace "http://org/opendaylight/transportpce/networkutils"; prefix org-opendaylight-transportpce-networkutils; + import ietf-network { + prefix nd; + revision-date 2018-02-26; + } + import ietf-network-topology { + prefix nwt; + revision-date 2018-02-26; + } + import org-openroadm-common-network { + prefix cnet; + revision-date 2021-12-10; + } + + revision 2022-06-30 { + description + "Add transportpce augmentation to manage otn-link-type in otn-topology"; + } + revision 2017-08-18 { description "Initial revision of networkutils model"; } + typedef otn-link-type { + type enumeration { + enum "OTU4" { + value 0; + } + enum "ODU4" { + value 1; + } + enum "ODTU4" { + value 2; + } + enum "ODU2e" { + value 3; + } + enum "ODU0" { + value 4; + } + enum "OTUC4" { + value 5; + } + enum "ODUC4" { + value 6; + } + enum "OTUC3" { + value 7; + } + enum "ODUC3" { + value 8; + } + enum "OTUC2" { + value 9; + } + enum "ODUC2" { + value 10; + } + } + } + grouping links-input-grouping { container links-input { description @@ -103,4 +159,17 @@ module transportpce-networkutils { } } } + + augment "/nd:networks/nd:network/nwt:link" { + when "../nd:network-types/cnet:openroadm-common-network/otn-topology"; + description + "Defines more accurate otn link types to differentiate otn links in otn-topology"; + leaf otn-link-type { + when + "../cnet:link-type = 'OTN-LINK'"; + type otn-link-type; + description + "type of otn link, to help link management inside transportpce"; + } + } } diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java index b85554ee2..a10b7f04b 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java @@ -92,7 +92,7 @@ import org.opendaylight.transportpce.tapi.topology.TapiOrLinkListener; import org.opendaylight.transportpce.tapi.topology.TapiPortMappingListener; import org.opendaylight.transportpce.tapi.utils.TapiLink; import org.opendaylight.transportpce.tapi.utils.TapiListener; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.TransportpceNetworkutilsService; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.TransportpceOlmService; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.OrgOpenroadmServiceService; diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java index f8cc33196..18d5b5e73 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java @@ -310,7 +310,7 @@ public final class TPCEUtils { // API models / opendaylight org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102 .$YangModuleInfoImpl.getInstance(), - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.$YangModuleInfoImpl + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.$YangModuleInfoImpl .getInstance(), org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.$YangModuleInfoImpl .getInstance(), @@ -341,7 +341,6 @@ public final class TPCEUtils { .$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.$YangModuleInfoImpl .getInstance(), - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.$YangModuleInfoImpl .getInstance(), diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java index f1c56764f..0abee0753 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java @@ -19,7 +19,7 @@ import org.opendaylight.transportpce.networkmodel.listeners.PortMappingListener; import org.opendaylight.transportpce.networkmodel.listeners.ServiceHandlerListener; import org.opendaylight.transportpce.networkmodel.service.FrequenciesService; import org.opendaylight.transportpce.networkmodel.util.TpceNetwork; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.TransportpceNetworkutilsService; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.Network; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.TransportpceServicehandlerListener; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java index 1d799ada4..b954aa37e 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java @@ -15,19 +15,19 @@ import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.DeleteLinkInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.DeleteLinkOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.DeleteLinkOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRdmXpdrLinksInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRdmXpdrLinksOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRdmXpdrLinksOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitXpdrRdmLinksInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitXpdrRdmLinksOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitXpdrRdmLinksOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.DeleteLinkInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.DeleteLinkOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.DeleteLinkOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRdmXpdrLinksInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRdmXpdrLinksOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRdmXpdrLinksOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitXpdrRdmLinksInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitXpdrRdmLinksOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitXpdrRdmLinksOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.TransportpceNetworkutilsService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java index ba108903f..26c8f4b6d 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java @@ -19,7 +19,7 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.networkmodel.util.LinkIdUtil; import org.opendaylight.transportpce.networkmodel.util.TopologyUtils; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesInput; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java index 6c05f8a66..a40e55bbd 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java @@ -25,7 +25,7 @@ import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.networkmodel.util.TopologyUtils; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesInputBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.Network; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.cp.to.degree.CpToDegree; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java index 8f1268838..1a518514c 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java @@ -21,7 +21,7 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.networkmodel.util.LinkIdUtil; import org.opendaylight.transportpce.networkmodel.util.TopologyUtils; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.links.input.grouping.LinksInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.links.input.grouping.LinksInput; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java index a0f506ae6..dbbf0aaaf 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java @@ -8,9 +8,9 @@ package org.opendaylight.transportpce.networkmodel.service; import java.util.List; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.renderer.rpc.result.sp.Link; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java index c9ddfe112..e71c5dc52 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java @@ -38,6 +38,7 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmo import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.topology.update.result.TopologyChanges; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.topology.update.result.TopologyChangesBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.topology.update.result.TopologyChangesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.OpenroadmNodeVersion; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfo; @@ -46,7 +47,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev2 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev211210.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.link.tp.LinkTp; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.link.tp.LinkTpBuilder; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java index 22742cfe4..5e8bf12ec 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java @@ -8,7 +8,7 @@ package org.opendaylight.transportpce.networkmodel.util; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.InitRoadmNodesInput; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java index 58824cc50..9843bd987 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java @@ -20,6 +20,7 @@ import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.networkmodel.dto.OtnTopoNode; import org.opendaylight.transportpce.networkmodel.dto.TopologyShard; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.Nodes; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; @@ -59,7 +60,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.Supp import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev191129.SwitchingPoolTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev211210.xpdr.otn.tp.attributes.OdtuTpnPool; import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev211210.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; 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; @@ -298,12 +298,14 @@ public final class OpenRoadmOtnTopology { for (Link link : suppOtuLinks) { if (link.augmentation(Link1.class) == null || link.augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class) == null) { + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630 + .Link1.class) == null) { LOG.error(OTN_PARAMS_ERROR, link.getLinkId().getValue()); return new TopologyShard(null, null, null); } OtnLinkType otnLinkType = link.augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class).getOtnLinkType(); + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.Link1.class) + .getOtnLinkType(); if (!OTNLINKTYPE_OTU_BW_MAP.containsKey(otnLinkType)) { //TODO shouldn't other link type listed in OTNLINKTYPE_BW_MAP be handled too ? LOG.warn("Unexpected otn-link-type {} for link {}", otnLinkType, link.getLinkId()); @@ -327,8 +329,8 @@ public final class OpenRoadmOtnTopology { List links = new ArrayList<>(); String nodeATopo = formatNodeName(nodeA, tpA); String nodeZTopo = formatNodeName(nodeZ, tpZ); - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1 tpceLink1 - = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1Builder() + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.Link1 tpceLink1 + = new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.Link1Builder() .setOtnLinkType(linkType).build(); Link1Builder otnLink1Bldr = new Link1Builder() .setUsedBandwidth(Uint32.valueOf(0)); @@ -737,20 +739,20 @@ public final class OpenRoadmOtnTopology { new TpId(mapping.getLogicalConnectionPoint()), tpType, otnTp1Bldr.build(), - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1Builder(), mapping); } } private static void setclientNwTpAttr(Map tpMap, OtnTopoNode node, TpId tpId, - OpenroadmTpType tpType, TerminationPoint1 otnTp1, - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1Builder tpceTp1Bldr, - Mapping mapping) { - + OpenroadmTpType tpType, TerminationPoint1 otnTp1, Mapping mapping) { + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1Builder cnTP1BLdr + = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 + .TerminationPoint1Builder(); switch (tpType) { case XPONDERNETWORK: if (node.getXpdrNetConnectionMap().get(tpId.getValue()) != null) { - tpceTp1Bldr.setAssociatedConnectionMapPort(node.getXpdrNetConnectionMap().get(tpId.getValue())); + cnTP1BLdr.setAssociatedConnectionMapTp(Set.of( + new TpId(node.getXpdrNetConnectionMap().get(tpId.getValue())))); } SupportingTerminationPoint stp = new SupportingTerminationPointBuilder() .setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)) @@ -758,14 +760,15 @@ public final class OpenRoadmOtnTopology { .setTpRef(tpId) .build(); TerminationPoint ietfTpNw = - buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, Map.of(stp.key(), stp), mapping); + buildIetfTp(cnTP1BLdr, otnTp1, tpType, tpId, Map.of(stp.key(), stp), mapping); tpMap.put(ietfTpNw.key(),ietfTpNw); break; case XPONDERCLIENT: if (node.getXpdrCliConnectionMap().get(tpId.getValue()) != null) { - tpceTp1Bldr.setAssociatedConnectionMapPort(node.getXpdrCliConnectionMap().get(tpId.getValue())); + cnTP1BLdr.setAssociatedConnectionMapTp(Set.of( + new TpId(node.getXpdrCliConnectionMap().get(tpId.getValue())))); } - TerminationPoint ietfTpCl = buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, null, mapping); + TerminationPoint ietfTpCl = buildIetfTp(cnTP1BLdr, otnTp1, tpType, tpId, null, mapping); tpMap.put(ietfTpCl.key(),ietfTpCl); break; default: @@ -818,14 +821,11 @@ public final class OpenRoadmOtnTopology { } private static TerminationPoint buildIetfTp( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1Builder tpceTp1Bldr, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1Builder cnTP1BLdr, TerminationPoint1 otnTp1, OpenroadmTpType tpType, TpId tpId, Map supportTpMap, Mapping mapping) { TerminationPointBuilder ietfTpBldr = new TerminationPointBuilder(); - if (tpceTp1Bldr.getAssociatedConnectionMapPort() != null) { - ietfTpBldr.addAugmentation(tpceTp1Bldr.build()); - } if (supportTpMap != null) { ietfTpBldr.setSupportingTerminationPoint(supportTpMap); } @@ -833,13 +833,11 @@ public final class OpenRoadmOtnTopology { .setTpId(tpId) .withKey(new TerminationPointKey(tpId)) .addAugmentation(otnTp1) - .addAugmentation( - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1Builder() - .setTpType(tpType) + .addAugmentation(cnTP1BLdr.setTpType(tpType) .setAdministrativeState(TopologyUtils.setNetworkAdminState(mapping.getPortAdminState())) .setOperationalState(TopologyUtils.setNetworkOperState(mapping.getPortOperState())) .build()) - .build(); + .build(); } private static String formatNodeName(String nodeName, String tpName) { diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java index 5384547bd..d53b05567 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java @@ -15,6 +15,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -224,22 +225,19 @@ public final class OpenRoadmTopology { if (isOtn && m.getPortQual().equals("xpdr-client")) { continue; } + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1Builder + ocnTp1Bldr = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 + .TerminationPoint1Builder() + .setTpType(PORTQUAL_ORD_TYPE_MAP.get(m.getPortQual())) + .setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState())) + .setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState())); + if (!isOtn && m.getConnectionMapLcp() != null) { + ocnTp1Bldr.setAssociatedConnectionMapTp(Set.of(new TpId(m.getConnectionMapLcp()))); + } TerminationPointBuilder ietfTpBldr = createTpBldr(m.getLogicalConnectionPoint()) .addAugmentation( // Add openroadm-network-topology tp augmentations - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 - .TerminationPoint1Builder() - .setTpType(PORTQUAL_ORD_TYPE_MAP.get(m.getPortQual())) - .setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState())) - .setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState())) - .build()); - if (!isOtn) { - ietfTpBldr.addAugmentation( - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123 - .TerminationPoint1Builder() - .setAssociatedConnectionMapPort(m.getConnectionMapLcp()) - .build()); - } + ocnTp1Bldr.build()); TerminationPoint ietfTp = ietfTpBldr.build(); tpMap.put(ietfTp.key(),ietfTp); } diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java index 2db827b4c..04dec312d 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java @@ -26,7 +26,7 @@ import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.networkmodel.listeners.PortMappingListener; import org.opendaylight.transportpce.networkmodel.service.FrequenciesService; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.TransportpceNetworkutilsService; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class NetworkModelProviderTest extends AbstractTest { diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java index bccb0ff2a..5c5f959df 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java @@ -35,6 +35,7 @@ import org.junit.Test; import org.opendaylight.transportpce.networkmodel.dto.TopologyShard; import org.opendaylight.transportpce.networkmodel.util.test.JsonUtil; import org.opendaylight.transportpce.networkmodel.util.test.NetworkmodelTestUtil; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.Network; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingBuilder; @@ -43,6 +44,7 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmappi import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.NodesBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.nodes.NodeInfoBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.OduSwitchingPools; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; @@ -62,8 +64,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10 import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GEODU2e; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCH; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCHOTU4ODU4; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1; 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.node.SupportingNode; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; @@ -149,7 +149,12 @@ public class OpenRoadmOtnTopologyTest { assertEquals("XPDR1-CLIENT1", tps.get(0).getTpId().getValue()); assertEquals( "XPDR1-NETWORK1", - tps.get(0).augmentation(TerminationPoint1.class).getAssociatedConnectionMapPort()); + tps.get(0) + .augmentation(TerminationPoint1.class) + .getAssociatedConnectionMapTp() + .iterator() + .next() + .getValue()); assertEquals( "only If100GE interface capabitily expected", 1, @@ -170,15 +175,16 @@ public class OpenRoadmOtnTopologyTest { assertEquals( "first TP must be of type client", OpenroadmTpType.XPONDERCLIENT, - tps.get(0).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 - .TerminationPoint1.class) - .getTpType()); + tps.get(0).augmentation(TerminationPoint1.class).getTpType()); //tests network tp assertEquals("XPDR1-NETWORK1", tps.get(2).getTpId().getValue()); assertEquals( "XPDR1-CLIENT1", - tps.get(2).augmentation(TerminationPoint1.class).getAssociatedConnectionMapPort()); + tps.get(2).augmentation(TerminationPoint1.class) + .getAssociatedConnectionMapTp() + .iterator() + .next() + .getValue()); assertEquals( "only IfOCH interface capabitily expected", 1, @@ -209,9 +215,7 @@ public class OpenRoadmOtnTopologyTest { assertEquals( "third TP must be of type network", OpenroadmTpType.XPONDERNETWORK, - tps.get(2).augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1.class) - .getTpType()); + tps.get(2).augmentation(TerminationPoint1.class).getTpType()); } @Test @@ -275,7 +279,7 @@ public class OpenRoadmOtnTopologyTest { "otn link type should be OTU4", OtnLinkType.OTU4, sortedLinks.get(0).augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class) + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.Link1.class) .getOtnLinkType()); } @@ -349,8 +353,8 @@ public class OpenRoadmOtnTopologyTest { "otn link type should be ODTU4", OtnLinkType.ODTU4, sortedLinks.get(0) - .augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class) + .augmentation(org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630 + .Link1.class) .getOtnLinkType()); assertEquals("list of TPs should contain 2 updated TPs", 2, topoShard.getTps().size()); @@ -977,19 +981,11 @@ public class OpenRoadmOtnTopologyTest { assertEquals( "TP should be of type client", OpenroadmTpType.XPONDERCLIENT, - tpList.get(2) - .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 - .TerminationPoint1.class) - .getTpType()); + tpList.get(2).augmentation(TerminationPoint1.class).getTpType()); assertEquals( "TP should be of type network", OpenroadmTpType.XPONDERNETWORK, - tpList.get(4) - .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 - .TerminationPoint1.class) - .getTpType()); + tpList.get(4).augmentation(TerminationPoint1.class).getTpType()); } else if (xpdrNb.equals(Uint16.valueOf(2))) { assertEquals("should contain 8 TPs", 8, tpList.size()); assertEquals("XPDR2-CLIENT1", tpList.get(0).getTpId().getValue()); @@ -1030,18 +1026,10 @@ public class OpenRoadmOtnTopologyTest { } assertEquals( "TP should be of type client", OpenroadmTpType.XPONDERCLIENT, - tpList.get(2) - .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 - .TerminationPoint1.class) - .getTpType()); + tpList.get(2).augmentation(TerminationPoint1.class).getTpType()); assertEquals( "TP should be of type network", OpenroadmTpType.XPONDERNETWORK, - tpList.get(6) - .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 - .TerminationPoint1.class) - .getTpType()); + tpList.get(6).augmentation(TerminationPoint1.class).getTpType()); } } } diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java index b8c3c62e1..4acee5cbd 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java @@ -363,14 +363,19 @@ public class OpenRoadmTopologyTest { assertEquals(4, tps.size()); assertEquals("XPDR1-CLIENT1", tps.get(0).getTpId().getValue()); assertEquals(OpenroadmTpType.XPONDERCLIENT, tps.get(0).augmentation(TerminationPoint1.class).getTpType()); - assertEquals("XPDR1-NETWORK1", tps.get(0).augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1.class) - .getAssociatedConnectionMapPort()); + assertEquals("XPDR1-NETWORK1", tps.get(0).augmentation(TerminationPoint1.class) + .getAssociatedConnectionMapTp() + .iterator() + .next() + .getValue()); assertEquals("XPDR1-NETWORK1", tps.get(2).getTpId().getValue()); assertEquals(OpenroadmTpType.XPONDERNETWORK, tps.get(2).augmentation(TerminationPoint1.class).getTpType()); assertEquals("XPDR1-CLIENT1", tps.get(2).augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1.class) - .getAssociatedConnectionMapPort()); + TerminationPoint1.class) + .getAssociatedConnectionMapTp() + .iterator() + .next() + .getValue()); } private void checkOtnXpdrNode(Node node) { diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java index 897c1ca76..bfc6f672f 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java @@ -15,6 +15,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.opendaylight.transportpce.common.NetworkUtils; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.MappingKey; @@ -43,7 +44,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOC import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.SupportedIfCapability; import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev211210.xpdr.otn.tp.attributes.OdtuTpnPool; import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev211210.xpdr.otn.tp.attributes.OdtuTpnPoolBuilder; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; 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.topology.rev180226.LinkId; @@ -113,7 +113,8 @@ public final class NetworkmodelTestUtil { .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue())) .build()) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1Builder() + new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630 + .Link1Builder() .setOtnLinkType(type) .build()) .build(); @@ -137,7 +138,8 @@ public final class NetworkmodelTestUtil { .setUsedBandwidth(Uint32.valueOf(100000 - availBW.intValue())) .build()) .addAugmentation( - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1Builder() + new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630 + .Link1Builder() .setOtnLinkType(type) .build()) .build(); diff --git a/networkmodel/src/test/resources/openroadm-topology.xml b/networkmodel/src/test/resources/openroadm-topology.xml index d8d90aa8d..28f50657b 100644 --- a/networkmodel/src/test/resources/openroadm-topology.xml +++ b/networkmodel/src/test/resources/openroadm-topology.xml @@ -59,29 +59,25 @@ XPDR1-CLIENT1 - XPDR1-NETWORK1 + XPDR1-NETWORK1 XPONDER-CLIENT XPDR1-CLIENT2 - XPDR1-NETWORK2 + XPDR1-NETWORK2 XPONDER-CLIENT XPDR1-NETWORK2 - XPDR1-CLIENT2 + XPDR1-CLIENT2 XPONDER-NETWORK XPDR1-NETWORK1 - XPDR1-CLIENT1 + XPDR1-CLIENT1 ROADM-C1-SRG1--SRG1-PP1-TXRX @@ -185,29 +181,25 @@ XPDR1-CLIENT1 - XPDR1-NETWORK1 + XPDR1-NETWORK1 XPONDER-CLIENT XPDR1-CLIENT2 - XPDR1-NETWORK2 + XPDR1-NETWORK2 XPONDER-CLIENT XPDR1-NETWORK2 - XPDR1-CLIENT2 + XPDR1-CLIENT2 XPONDER-NETWORK XPDR1-NETWORK1 - XPDR1-CLIENT1 + XPDR1-CLIENT1 ROADM-A1-SRG1--SRG1-PP1-TXRX diff --git a/ordmodels/network/src/main/yang/transportpce-topology@2022-01-23.yang b/ordmodels/network/src/main/yang/transportpce-topology@2022-01-23.yang deleted file mode 100644 index 39c7399c0..000000000 --- a/ordmodels/network/src/main/yang/transportpce-topology@2022-01-23.yang +++ /dev/null @@ -1,105 +0,0 @@ -module transportpce-topology { - yang-version 1.1; - namespace "http://transportpce/topology"; - prefix "transportpce-topology"; - - import ietf-network { - prefix nd; - revision-date 2018-02-26; - } - import ietf-network-topology { - prefix nwt; - revision-date 2018-02-26; - } - import org-openroadm-common-network { - prefix cnet; - } - - organization - "TransportPCE team"; - contact - "TransportPCE team"; - - revision 2022-01-23 { - description "Update otn-link-type enum for intermediate rates (B100G)"; - } - revision 2021-05-11 { - description "Update otn-link-type enum for higher rates"; - } - revision 2020-10-19 { - description "Update to 7.1.0 Openroadm network and common models"; - } - revision 2020-01-29 { - description "Add transportpce augmentation to manage otn-link-type in otn-topology"; - } - revision 2020-01-23 { - description "Add transportpce augmentation for otn-topology"; - } - revision 2019-06-25 { - description "Initial revision"; - } - - typedef otn-link-type { - type enumeration { - enum "OTU4" { - value 0; - } - enum "ODU4" { - value 1; - } - enum "ODTU4" { - value 2; - } - enum "ODU2e" { - value 3; - } - enum "ODU0" { - value 4; - } - enum "OTUC4" { - value 5; - } - enum "ODUC4" { - value 6; - } - enum "OTUC3" { - value 7; - } - enum "ODUC3" { - value 8; - } - enum "OTUC2" { - value 9; - } - enum "ODUC2" { - value 10; - } - } - } - - augment "/nd:networks/nd:network/nd:node/nwt:termination-point" { - when "../../nd:network-types/cnet:openroadm-common-network/openroadm-topology or ../../nd:network-types/cnet:openroadm-common-network/otn-topology"; - description - "Defines associated logical-connection-point for XPDR port."; - leaf associated-connection-map-port { - when - "../cnet:tp-type = 'XPONDER-CLIENT' or ../cnet:tp-type = 'XPONDER-NETWORK'"; - type string; - description - "The xpdr port connectable regarding the device connection-map"; - } - } - - augment "/nd:networks/nd:network/nwt:link" { - when "../nd:network-types/cnet:openroadm-common-network/otn-topology"; - description - "Defines more accurate otn link types to differentiate otn links in otn-topology"; - leaf otn-link-type { - when - "../cnet:link-type = 'OTN-LINK'"; - type otn-link-type; - description - "type of otn link, to help link management inside transportpce"; - } - } -} diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java index 7eb06d8cb..9e28aa9bd 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java @@ -13,6 +13,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; @@ -22,7 +23,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev21121 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmLinkType; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.link.concatenation.LinkConcatenation; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.link.concatenation.LinkConcatenationKey; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType; 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.topology.rev180226.LinkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; @@ -319,7 +319,8 @@ public class PceLink implements Serializable { } OtnLinkType otnLinkType = link - .augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class) + .augmentation(org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils + .rev220630.Link1.class) .getOtnLinkType(); if (this.availableBandwidth == 0L) { LOG.error("PceLink: No bandwidth available for OTN Link, link {} is ignored ", linkId); diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java index 7e96ea398..01bf4d34c 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java @@ -285,11 +285,8 @@ public class PceOpticalNode implements PceNode { continue; } // find Client of this network TP - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1 tpceTp1 = - tp.augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123 - .TerminationPoint1.class); - if (tpceTp1 != null) { - String client = tpceTp1.getAssociatedConnectionMapPort(); + if (cntp1.getAssociatedConnectionMapTp() != null) { + String client = cntp1.getAssociatedConnectionMapTp().iterator().next().getValue(); if (client != null) { this.clientPerNwTp.put(tp.getTpId().getValue(), client); this.valid = true; diff --git a/pce/src/test/resources/gnpy/gnpy_topology.json b/pce/src/test/resources/gnpy/gnpy_topology.json index 9f902b809..da07adf49 100644 --- a/pce/src/test/resources/gnpy/gnpy_topology.json +++ b/pce/src/test/resources/gnpy/gnpy_topology.json @@ -2292,52 +2292,72 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { @@ -2378,52 +2398,72 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { @@ -2464,52 +2504,72 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { @@ -2550,52 +2610,72 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { @@ -2636,52 +2716,72 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" }, { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java index 4add60c57..f8e22e28b 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java @@ -41,6 +41,7 @@ import org.opendaylight.transportpce.renderer.provisiondevice.tasks.OtnDeviceRen import org.opendaylight.transportpce.renderer.provisiondevice.tasks.RollbackProcessor; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.Action; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.OtnServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmInputBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInput; @@ -72,7 +73,6 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.link.tp.LinkTp; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.olm.get.pm.input.ResourceIdentifierBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.optical.renderer.nodes.Nodes; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java index 9eb124cad..f983d3774 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java @@ -19,6 +19,7 @@ import org.opendaylight.transportpce.pce.service.PathComputationService; import org.opendaylight.transportpce.servicehandler.ServiceInput; import org.opendaylight.transportpce.servicehandler.service.PCEServiceWrapper; import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.RendererRpcResultSp; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.TransportpceRendererListener; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.renderer.rpc.result.sp.Link; @@ -28,7 +29,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev2 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.list.Services; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType; import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.PublishNotificationProcessService; import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.PublishNotificationProcessServiceBuilder; import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.notification.process.service.ServiceAEndBuilder; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java index 03a39fac6..d7c5c21f5 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java @@ -365,9 +365,9 @@ public class ConvertORTopoToTapiFullTopo { int count = 1; for (TerminationPoint tp : this.oorNetworkPortList) { TpId tpid1 = tp.getTpId(); - TpId tpid2 = new TpId(tp.augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1.class) - .getAssociatedConnectionMapPort()); + TpId tpid2 = tp.augmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1.class) + .getAssociatedConnectionMapTp().iterator().next(); Set tpList = new HashSet<>(); tpList.add(tpid1); tpList.add(tpid2); diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java index 7abf12f25..aab9df4b0 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java @@ -293,9 +293,9 @@ public class ConvertORTopoToTapiTopo { int count = 1; for (TerminationPoint tp : this.oorNetworkPortList) { TpId tpid1 = tp.getTpId(); - TpId tpid2 = new TpId(tp.augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1.class) - .getAssociatedConnectionMapPort()); + TpId tpid2 = tp.augmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1.class) + .getAssociatedConnectionMapTp().iterator().next(); Set tpList = new HashSet<>(); tpList.add(tpid1); tpList.add(tpid2); diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java index edfa562c0..579901651 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java @@ -409,8 +409,8 @@ public class TapiTopologyImpl implements TapiTopologyService, TapiCommonService String networkLcp; if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERCLIENT)) { networkLcp = tp.augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1.class) - .getAssociatedConnectionMapPort(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1.class) + .getAssociatedConnectionMapTp().iterator().next().getValue(); } else { networkLcp = tp.getTpId().getValue(); } diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java index af77db43a..02cba20e2 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java @@ -222,8 +222,8 @@ public final class TopologyUtils { String networkLcp; if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERCLIENT)) { networkLcp = tp.augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1.class) - .getAssociatedConnectionMapPort(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1.class) + .getAssociatedConnectionMapTp().iterator().next().getValue(); } else { networkLcp = tp.getTpId().getValue(); } diff --git a/tapi/src/test/resources/openroadm-topology.xml b/tapi/src/test/resources/openroadm-topology.xml index 54068af22..f0da0c7fb 100644 --- a/tapi/src/test/resources/openroadm-topology.xml +++ b/tapi/src/test/resources/openroadm-topology.xml @@ -65,28 +65,28 @@ inService XPDR1-CLIENT1 - XPDR1-NETWORK1 + XPDR1-NETWORK1 inService inService XPONDER-CLIENT XPDR1-CLIENT2 - XPDR1-NETWORK2 + XPDR1-NETWORK2 inService inService XPONDER-CLIENT XPDR1-NETWORK2 - XPDR1-CLIENT2 + XPDR1-CLIENT2 inService inService XPONDER-NETWORK XPDR1-NETWORK1 - XPDR1-CLIENT1 + XPDR1-CLIENT1 ROADM-C1-SRG1--SRG1-PP1-TXRX @@ -235,28 +235,28 @@ inService XPDR1-CLIENT1 - XPDR1-NETWORK1 + XPDR1-NETWORK1 inService inService XPONDER-CLIENT XPDR1-CLIENT2 - XPDR1-NETWORK2 + XPDR1-NETWORK2 inService inService XPONDER-CLIENT XPDR1-NETWORK2 - XPDR1-CLIENT2 + XPDR1-CLIENT2 inService inService XPONDER-NETWORK XPDR1-NETWORK1 - XPDR1-CLIENT1 + XPDR1-CLIENT1 inService inService XPONDER-NETWORK diff --git a/tapi/src/test/resources/otn-topology.xml b/tapi/src/test/resources/otn-topology.xml index e02d8d031..c2086f650 100644 --- a/tapi/src/test/resources/otn-topology.xml +++ b/tapi/src/test/resources/otn-topology.xml @@ -12,7 +12,7 @@ inService XPDR1-CLIENT1 - XPDR1-NETWORK1 + XPDR1-NETWORK1 x:if-100GE @@ -25,7 +25,7 @@ XPDR1-CLIENT2 - XPDR1-NETWORK2 + XPDR1-NETWORK2 x:if-100GE @@ -43,7 +43,7 @@ XPDR-C1-XPDR1 XPDR1-NETWORK2 - XPDR1-CLIENT2 + XPDR1-CLIENT2 x:if-OCH @@ -61,7 +61,7 @@ XPDR-C1-XPDR1 XPDR1-NETWORK1 - XPDR1-CLIENT1 + XPDR1-CLIENT1 x:if-OCH @@ -403,7 +403,7 @@ inService XPDR1-CLIENT1 - XPDR1-NETWORK1 + XPDR1-NETWORK1 x:if-100GE @@ -416,7 +416,7 @@ XPDR1-CLIENT2 - XPDR1-NETWORK2 + XPDR1-NETWORK2 x:if-100GE @@ -434,7 +434,7 @@ XPDR-A1-XPDR1 XPDR1-NETWORK2 - XPDR1-CLIENT2 + XPDR1-CLIENT2 x:if-OCH @@ -452,7 +452,7 @@ XPDR-A1-XPDR1 XPDR1-NETWORK1 - XPDR1-CLIENT1 + XPDR1-CLIENT1 x:if-OCH @@ -1431,7 +1431,7 @@ XPDR1-NETWORK1 SPDR-SA1-XPDR1 - OTU4 + OTU4 OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 @@ -1449,7 +1449,7 @@ XPDR1-NETWORK1 SPDR-SC1-XPDR1 - OTU4 + OTU4 ODTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1 @@ -1467,7 +1467,7 @@ XPDR1-NETWORK1 SPDR-SA1-XPDR1 - ODTU4 + ODTU4 ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 @@ -1485,7 +1485,7 @@ XPDR1-NETWORK1 SPDR-SC1-XPDR1 - ODTU4 + ODTU4 diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml index 20d05c964..e0f1176d8 100644 --- a/tests/sample_configs/NW-for-test-5-4.xml +++ b/tests/sample_configs/NW-for-test-5-4.xml @@ -157,56 +157,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -368,56 +368,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -579,56 +579,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -790,56 +790,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -1001,56 +1001,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -1212,56 +1212,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -1423,56 +1423,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -1634,56 +1634,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -1845,56 +1845,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -2056,56 +2056,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -2267,56 +2267,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -2478,56 +2478,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -2689,56 +2689,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -2900,56 +2900,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -3111,56 +3111,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -3322,56 +3322,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -3533,56 +3533,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -3744,56 +3744,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -3955,56 +3955,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService @@ -4166,56 +4166,56 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService diff --git a/tests/sample_configs/NW-simple-topology.xml b/tests/sample_configs/NW-simple-topology.xml index 646868ba2..6153b9700 100644 --- a/tests/sample_configs/NW-simple-topology.xml +++ b/tests/sample_configs/NW-simple-topology.xml @@ -176,101 +176,101 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService Client-1 XPONDER-CLIENT - XPDR-NW1 + XPDR-NW1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService Client-2 XPONDER-CLIENT - XPDR-NW2 + XPDR-NW2 XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService Client-3 XPONDER-CLIENT - XPDR-NW3 + XPDR-NW3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService Client-4 XPONDER-CLIENT - XPDR-NW4 + XPDR-NW4 inService inService XPDR-NW5-RX XPONDER-NETWORK - Client-5 + Client-5 inService inService XPDR-NW5-TX XPONDER-NETWORK - Client-5 + Client-5 inService inService Client-5 XPONDER-CLIENT - XPDR-NW5 + XPDR-NW5 inService inService @@ -444,105 +444,105 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService Client-1 XPONDER-CLIENT - XPDR-NW1 + XPDR-NW1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService Client-2 XPONDER-CLIENT - XPDR-NW2 + XPDR-NW2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService Client-3 XPONDER-CLIENT - XPDR-NW3 + XPDR-NW3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService Client-4 XPONDER-CLIENT - XPDR-NW4 + XPDR-NW4 inService inService XPDR-NW5-RX XPONDER-NETWORK - Client-5 + Client-5 inService inService XPDR-NW5-TX XPONDER-NETWORK - Client-5 + Client-5 inService inService Client-5 XPONDER-CLIENT - XPDR-NW5 + XPDR-NW5 inService inService @@ -716,105 +716,105 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService Client-1 XPONDER-CLIENT - XPDR-NW1 + XPDR-NW1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService Client-2 XPONDER-CLIENT - XPDR-NW2 + XPDR-NW2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService Client-3 XPONDER-CLIENT - XPDR-NW3 + XPDR-NW3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService Client-4 XPONDER-CLIENT - XPDR-NW4 + XPDR-NW4 inService inService XPDR-NW5-RX XPONDER-NETWORK - Client-5 + Client-5 inService inService XPDR-NW5-TX XPONDER-NETWORK - Client-5 + Client-5 inService inService Client-5 XPONDER-CLIENT - XPDR-NW5 + XPDR-NW5 inService inService @@ -988,105 +988,105 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService Client-1 XPONDER-CLIENT - XPDR-NW1 + XPDR-NW1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService Client-2 XPONDER-CLIENT - XPDR-NW2 + XPDR-NW2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService Client-3 XPONDER-CLIENT - XPDR-NW3 + XPDR-NW3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService Client-4 XPONDER-CLIENT - XPDR-NW4 + XPDR-NW4 inService inService XPDR-NW5-RX XPONDER-NETWORK - Client-5 + Client-5 inService inService XPDR-NW5-TX XPONDER-NETWORK - Client-5 + Client-5 inService inService Client-5 XPONDER-CLIENT - XPDR-NW5 + XPDR-NW5 inService inService @@ -1260,105 +1260,105 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService Client-1 XPONDER-CLIENT - XPDR-NW1 + XPDR-NW1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService Client-2 XPONDER-CLIENT - XPDR-NW2 + XPDR-NW2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService Client-3 XPONDER-CLIENT - XPDR-NW3 + XPDR-NW3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService Client-4 XPONDER-CLIENT - XPDR-NW4 + XPDR-NW4 inService inService XPDR-NW5-RX XPONDER-NETWORK - Client-5 + Client-5 inService inService XPDR-NW5-TX XPONDER-NETWORK - Client-5 + Client-5 inService inService Client-5 XPONDER-CLIENT - XPDR-NW5 + XPDR-NW5 inService inService @@ -1532,105 +1532,105 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService Client-1 XPONDER-CLIENT - XPDR-NW1 + XPDR-NW1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService Client-2 XPONDER-CLIENT - XPDR-NW2 + XPDR-NW2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService Client-3 XPONDER-CLIENT - XPDR-NW3 + XPDR-NW3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService Client-4 XPONDER-CLIENT - XPDR-NW4 + XPDR-NW4 inService inService XPDR-NW5-RX XPONDER-NETWORK - Client-5 + Client-5 inService inService XPDR-NW5-TX XPONDER-NETWORK - Client-5 + Client-5 inService inService Client-5 XPONDER-CLIENT - XPDR-NW5 + XPDR-NW5 inService inService @@ -1804,105 +1804,105 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService Client-1 XPONDER-CLIENT - XPDR-NW1 + XPDR-NW1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService Client-2 XPONDER-CLIENT - XPDR-NW2 + XPDR-NW2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService Client-3 XPONDER-CLIENT - XPDR-NW3 + XPDR-NW3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService Client-4 XPONDER-CLIENT - XPDR-NW4 + XPDR-NW4 inService inService XPDR-NW5-RX XPONDER-NETWORK - Client-5 + Client-5 inService inService XPDR-NW5-TX XPONDER-NETWORK - Client-5 + Client-5 inService inService Client-5 XPONDER-CLIENT - XPDR-NW5 + XPDR-NW5 inService inService @@ -2076,105 +2076,105 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService Client-1 XPONDER-CLIENT - XPDR-NW1 + XPDR-NW1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService Client-2 XPONDER-CLIENT - XPDR-NW2 + XPDR-NW2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService Client-3 XPONDER-CLIENT - XPDR-NW3 + XPDR-NW3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService Client-4 XPONDER-CLIENT - XPDR-NW4 + XPDR-NW4 inService inService XPDR-NW5-RX XPONDER-NETWORK - Client-5 + Client-5 inService inService XPDR-NW5-TX XPONDER-NETWORK - Client-5 + Client-5 inService inService Client-5 XPONDER-CLIENT - XPDR-NW5 + XPDR-NW5 inService inService @@ -2348,105 +2348,105 @@ XPDR-NW1-RX XPONDER-NETWORK - Client-1 + Client-1 inService inService XPDR-NW1-TX XPONDER-NETWORK - Client-1 + Client-1 inService inService Client-1 XPONDER-CLIENT - XPDR-NW1 + XPDR-NW1 inService inService XPDR-NW2-RX XPONDER-NETWORK - Client-2 + Client-2 inService inService XPDR-NW2-TX XPONDER-NETWORK - Client-2 + Client-2 inService inService Client-2 XPONDER-CLIENT - XPDR-NW2 + XPDR-NW2 inService inService XPDR-NW3-RX XPONDER-NETWORK - Client-3 + Client-3 inService inService XPDR-NW3-TX XPONDER-NETWORK - Client-3 + Client-3 inService inService Client-3 XPONDER-CLIENT - XPDR-NW3 + XPDR-NW3 inService inService XPDR-NW4-RX XPONDER-NETWORK - Client-4 + Client-4 inService inService XPDR-NW4-TX XPONDER-NETWORK - Client-4 + Client-4 inService inService Client-4 XPONDER-CLIENT - XPDR-NW4 + XPDR-NW4 inService inService XPDR-NW5-RX XPONDER-NETWORK - Client-5 + Client-5 inService inService XPDR-NW5-TX XPONDER-NETWORK - Client-5 + Client-5 inService inService Client-5 XPONDER-CLIENT - XPDR-NW5 + XPDR-NW5 inService inService diff --git a/tests/sample_configs/gnpy/openroadmTopology.json b/tests/sample_configs/gnpy/openroadmTopology.json index 3029dcacc..283c4c6b9 100644 --- a/tests/sample_configs/gnpy/openroadmTopology.json +++ b/tests/sample_configs/gnpy/openroadmTopology.json @@ -2691,70 +2691,90 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" @@ -2809,70 +2829,90 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" @@ -2927,70 +2967,90 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" @@ -3045,70 +3105,90 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" @@ -3163,70 +3243,90 @@ "ietf-network-topology:termination-point": [ { "tp-id": "XPDR-NW1-RX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-RX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-RX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-RX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW1-TX", - "transportpce-topology:associated-connection-map-port": "Client-1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-1" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-RX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW2-TX", - "transportpce-topology:associated-connection-map-port": "Client-2", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-2" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW5-TX", - "transportpce-topology:associated-connection-map-port": "Client-5", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-5" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW3-TX", - "transportpce-topology:associated-connection-map-port": "Client-3", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-3" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" }, { "tp-id": "XPDR-NW4-TX", - "transportpce-topology:associated-connection-map-port": "Client-4", + "org-openroadm-common-network:associated-connection-map-tp": [ + "Client-4" + ], "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "administrative-state": "inService", "operational-state": "inService" diff --git a/tests/sample_configs/honeynode-otntopo400G.json b/tests/sample_configs/honeynode-otntopo400G.json index c23fb1b00..a4cd5f3a3 100644 --- a/tests/sample_configs/honeynode-otntopo400G.json +++ b/tests/sample_configs/honeynode-otntopo400G.json @@ -24,7 +24,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-NETWORK1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" @@ -45,7 +47,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-CLIENT1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" @@ -84,7 +88,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-NETWORK1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" @@ -105,7 +111,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-CLIENT1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" diff --git a/tests/sample_configs/honeynode-otntopo400GwithODUC4.json b/tests/sample_configs/honeynode-otntopo400GwithODUC4.json index 5d69ad00f..548b0b291 100644 --- a/tests/sample_configs/honeynode-otntopo400GwithODUC4.json +++ b/tests/sample_configs/honeynode-otntopo400GwithODUC4.json @@ -24,7 +24,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-NETWORK1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" @@ -45,7 +47,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-CLIENT1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" @@ -84,7 +88,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-NETWORK1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" @@ -105,7 +111,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-CLIENT1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" @@ -555,7 +563,7 @@ "org-openroadm-otn-network-topology:available-bandwidth": "0", "org-openroadm-otn-network-topology:used-bandwidth": "400000", "org-openroadm-common-network:link-type": "OTN-LINK", - "transportpce-topology:otn-link-type": "OTUC4", + "transportpce-networkutils:otn-link-type": "OTUC4", "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:opposite-link": "OTUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1" @@ -575,7 +583,7 @@ "org-openroadm-common-network:link-type": "OTN-LINK", "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", - "transportpce-topology:otn-link-type": "OTUC4", + "transportpce-networkutils:otn-link-type": "OTUC4", "org-openroadm-common-network:opposite-link": "OTUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1" }, { @@ -591,7 +599,7 @@ "org-openroadm-otn-network-topology:available-bandwidth": "400000", "org-openroadm-otn-network-topology:used-bandwidth": "0", "org-openroadm-common-network:link-type": "OTN-LINK", - "transportpce-topology:otn-link-type": "ODUC4", + "transportpce-networkutils:otn-link-type": "ODUC4", "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:opposite-link": "ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1" @@ -611,7 +619,7 @@ "org-openroadm-common-network:link-type": "OTN-LINK", "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", - "transportpce-topology:otn-link-type": "ODUC4", + "transportpce-networkutils:otn-link-type": "ODUC4", "org-openroadm-common-network:opposite-link": "ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1" } ] diff --git a/tests/sample_configs/honeynode-otntopo400GwithOTUC4.json b/tests/sample_configs/honeynode-otntopo400GwithOTUC4.json index 74f345a35..09acf29bc 100644 --- a/tests/sample_configs/honeynode-otntopo400GwithOTUC4.json +++ b/tests/sample_configs/honeynode-otntopo400GwithOTUC4.json @@ -24,7 +24,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-NETWORK1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" @@ -45,7 +47,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-CLIENT1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" @@ -84,7 +88,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-NETWORK1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" @@ -105,7 +111,9 @@ } ] }, - "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1", + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-CLIENT1" + ], "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-NETWORK" @@ -363,7 +371,7 @@ "org-openroadm-otn-network-topology:available-bandwidth": "400000", "org-openroadm-otn-network-topology:used-bandwidth": "0", "org-openroadm-common-network:link-type": "OTN-LINK", - "transportpce-topology:otn-link-type": "OTUC4", + "transportpce-networkutils:otn-link-type": "OTUC4", "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:opposite-link": "OTUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1" @@ -383,7 +391,7 @@ "org-openroadm-common-network:link-type": "OTN-LINK", "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", - "transportpce-topology:otn-link-type": "OTUC4", + "transportpce-networkutils:otn-link-type": "OTUC4", "org-openroadm-common-network:opposite-link": "OTUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1" } ] diff --git a/tests/sample_configs/honeynode-topo.xml b/tests/sample_configs/honeynode-topo.xml index 86f80015b..67eeadbbf 100644 --- a/tests/sample_configs/honeynode-topo.xml +++ b/tests/sample_configs/honeynode-topo.xml @@ -640,28 +640,28 @@ XPDR1-NETWORK2 XPONDER-NETWORK - XPDR1-CLIENT2 + XPDR1-CLIENT2 inService inService XPDR1-CLIENT2 XPONDER-CLIENT - XPDR1-NETWORK2 + XPDR1-NETWORK2 inService inService XPDR1-CLIENT1 XPONDER-CLIENT - XPDR1-NETWORK1 + XPDR1-NETWORK1 inService inService XPDR1-NETWORK1 XPONDER-NETWORK - XPDR1-CLIENT1 + XPDR1-CLIENT1 inService inService @@ -719,28 +719,28 @@ XPDR1-NETWORK2 XPONDER-NETWORK - XPDR1-CLIENT2 + XPDR1-CLIENT2 inService inService XPDR1-CLIENT2 XPONDER-CLIENT - XPDR1-NETWORK2 + XPDR1-NETWORK2 inService inService XPDR1-CLIENT1 XPONDER-CLIENT - XPDR1-NETWORK1 + XPDR1-NETWORK1 inService inService XPDR1-NETWORK1 XPONDER-NETWORK - XPDR1-CLIENT1 + XPDR1-CLIENT1 inService inService diff --git a/tests/sample_configs/honeynode-topo400G.json b/tests/sample_configs/honeynode-topo400G.json index 854adea78..12b66cdc8 100644 --- a/tests/sample_configs/honeynode-topo400G.json +++ b/tests/sample_configs/honeynode-topo400G.json @@ -76,7 +76,9 @@ "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-CLIENT", - "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1" + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-NETWORK1" + ] }, { "tp-id": "XPDR1-NETWORK1", @@ -86,7 +88,9 @@ "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", - "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1" + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-CLIENT1" + ] } ], "supporting-node": [ @@ -111,7 +115,9 @@ "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-CLIENT", - "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1" + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-NETWORK1" + ] }, { "tp-id": "XPDR1-NETWORK1", @@ -121,7 +127,9 @@ "org-openroadm-common-network:operational-state": "inService", "org-openroadm-common-network:administrative-state": "inService", "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", - "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1" + "org-openroadm-common-network:associated-connection-map-tp": [ + "XPDR1-CLIENT1" + ] } ], "supporting-node": [ diff --git a/tests/transportpce_tests/1.2.1/test03_topology.py b/tests/transportpce_tests/1.2.1/test03_topology.py index 1600fe200..d6ac68084 100644 --- a/tests/transportpce_tests/1.2.1/test03_topology.py +++ b/tests/transportpce_tests/1.2.1/test03_topology.py @@ -230,9 +230,11 @@ class TransportPCETopologyTesting(unittest.TestCase): elif tpType == 'XPONDER-NETWORK': network += 1 if tpId == 'XPDR1-NETWORK2': - self.assertEqual(tp['transportpce-topology:associated-connection-map-port'], 'XPDR1-CLIENT3') + self.assertEqual( + tp['org-openroadm-common-network:associated-connection-map-tp'], ['XPDR1-CLIENT3']) elif tpId == 'XPDR1-CLIENT3': - self.assertEqual(tp['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2') + self.assertEqual( + tp['org-openroadm-common-network:associated-connection-map-tp'], ['XPDR1-NETWORK2']) self.assertTrue(client == 4) self.assertTrue(network == 2) listNode.remove(nodeId) diff --git a/tests/transportpce_tests/2.2.1/test03_topology.py b/tests/transportpce_tests/2.2.1/test03_topology.py index 88ae14f69..be11ec3ab 100644 --- a/tests/transportpce_tests/2.2.1/test03_topology.py +++ b/tests/transportpce_tests/2.2.1/test03_topology.py @@ -233,9 +233,11 @@ class TransportPCEtesting(unittest.TestCase): elif tpType == 'XPONDER-NETWORK': network += 1 if tpId == 'XPDR1-NETWORK2': - self.assertEqual(tp['transportpce-topology:associated-connection-map-port'], 'XPDR1-CLIENT2') + self.assertEqual( + tp['org-openroadm-common-network:associated-connection-map-tp'], ['XPDR1-CLIENT2']) if tpId == 'XPDR1-CLIENT2': - self.assertEqual(tp['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2') + self.assertEqual( + tp['org-openroadm-common-network:associated-connection-map-tp'], ['XPDR1-NETWORK2']) self.assertEqual(client, 2) self.assertEqual(network, 2) listNode.remove(nodeId) diff --git a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py index fab752179..feb95046d 100644 --- a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py +++ b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py @@ -426,7 +426,7 @@ class TransportPCEtesting(unittest.TestCase): for link in res['network'][0]['ietf-network-topology:link']: self.assertIn(link['link-id'], listLinkId) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'OTU4') + link['transportpce-networkutils:otn-link-type'], 'OTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertEqual( @@ -553,7 +553,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual( link['org-openroadm-otn-network-topology:used-bandwidth'], 0) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'ODTU4') + link['transportpce-networkutils:otn-link-type'], 'ODTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertIn(link['org-openroadm-common-network:opposite-link'], diff --git a/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py b/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py index 4169b0860..22707c43e 100644 --- a/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py +++ b/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py @@ -595,7 +595,7 @@ class TransportPCEtesting(unittest.TestCase): for link in res['network'][0]['ietf-network-topology:link']: self.assertIn(link['link-id'], listLinkId) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'OTU4') + link['transportpce-networkutils:otn-link-type'], 'OTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertEqual( @@ -847,7 +847,7 @@ class TransportPCEtesting(unittest.TestCase): for link in res['network'][0]['ietf-network-topology:link']: self.assertIn(link['link-id'], listLinkId) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'OTU4') + link['transportpce-networkutils:otn-link-type'], 'OTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertEqual( diff --git a/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py b/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py index 388c4fa25..11de71040 100644 --- a/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py +++ b/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py @@ -424,7 +424,7 @@ class TransportPCEtesting(unittest.TestCase): for link in res['network'][0]['ietf-network-topology:link']: self.assertIn(link['link-id'], listLinkId) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'OTU4') + link['transportpce-networkutils:otn-link-type'], 'OTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertEqual( @@ -486,7 +486,7 @@ class TransportPCEtesting(unittest.TestCase): for link in res['network'][0]['ietf-network-topology:link']: self.assertIn(link['link-id'], listLinkId) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'OTU4') + link['transportpce-networkutils:otn-link-type'], 'OTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertEqual( @@ -695,7 +695,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual( link['org-openroadm-otn-network-topology:used-bandwidth'], 0) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'ODTU4') + link['transportpce-networkutils:otn-link-type'], 'ODTU4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertIn(link['org-openroadm-common-network:opposite-link'], diff --git a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py index fa90adc38..2bd319118 100644 --- a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py +++ b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py @@ -445,7 +445,7 @@ class TransportPCEtesting(unittest.TestCase): for link in res['network'][0]['ietf-network-topology:link']: self.assertIn(link['link-id'], listLinkId) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'OTUC4') + link['transportpce-networkutils:otn-link-type'], 'OTUC4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertEqual( @@ -570,7 +570,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual( link['org-openroadm-otn-network-topology:used-bandwidth'], 0) self.assertEqual( - link['transportpce-topology:otn-link-type'], 'ODUC4') + link['transportpce-networkutils:otn-link-type'], 'ODUC4') self.assertEqual( link['org-openroadm-common-network:link-type'], 'OTN-LINK') self.assertIn(link['org-openroadm-common-network:opposite-link'], -- 2.36.6