From 34cbca4ad81fbd29e833197f0e4b09128daa8b95 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Fri, 17 Jan 2020 11:38:53 +0100 Subject: [PATCH] upgrade portmapping YANG to introduce OTN - add otn data to portmapping YANG model (odu-switching-pool, supported-interface-capability, xponder-type) - rename associated-lcp in connection-map-lcp to avoid potential confusions to come - update revision - modify code accordingly to support this new revision - update tests accordingly JIRA: TRNSPRTPCE-177 Signed-off-by: guillaume.lambert Co-authored-by: Christophe Betoule Change-Id: Ice6c2cff6bb105cb04abdf04b49976daa976571d --- ... transportpce-portmapping@2020-01-13.yang} | 91 ++++++-- .../common/mapping/MappingUtilsImpl.java | 8 +- .../common/mapping/PortMapping.java | 4 +- .../common/mapping/PortMappingImpl.java | 20 +- .../common/mapping/PortMappingVersion121.java | 30 +-- .../common/mapping/PortMappingVersion221.java | 30 +-- .../controllers/tpce/utils/TPCEUtils.java | 2 +- .../networkmodel/R2RLinkDiscovery.java | 10 +- .../service/NetworkModelServiceImpl.java | 4 +- .../networkmodel/util/ClliNetwork.java | 2 +- .../networkmodel/util/OpenRoadmFactory.java | 2 +- .../networkmodel/util/OpenRoadmNetwork.java | 2 +- .../util/OpenRoadmOtnTopology22.java | 8 +- .../util/OpenRoadmTopology22.java | 12 +- .../networkmodel/util/TopologyUtils.java | 28 ++- .../transportpce/olm/power/PowerMgmtImpl.java | 8 +- .../olm/service/OlmPowerServiceImpl.java | 4 +- .../transportpce/olm/util/OlmUtils.java | 8 +- .../olm/power/PowerMgmtPowerMockTest.java | 18 +- .../olm/util/OlmTransactionUtils.java | 4 +- .../olm/util/TransactionUtils.java | 22 +- .../pce/networkanalyzer/PceCalculation.java | 1 - .../OpenRoadmInterface121.java | 2 +- .../OpenRoadmInterface221.java | 2 +- .../OpenRoadmInterfaceFactory.java | 2 +- .../DeviceRendererServiceImpl.java | 2 +- .../OpenRoadMInterface221Test.java | 2 +- .../renderer/utils/MountPointUtils.java | 12 +- .../tapi/topology/TapiTopologyImpl.java | 10 +- .../tapi/utils/TopologyDataUtils.java | 2 +- .../test/resources/openroadm-topology2.xml | 200 +++++++++-------- .../test/resources/portmapping-example.xml | 208 +++++++++--------- .../1.2.1/test_portmapping.py | 8 +- .../test_renderer_service_path_nominal.py | 4 +- .../2.2.1/test_portmapping.py | 8 +- .../test_renderer_service_path_nominal.py | 4 +- 36 files changed, 428 insertions(+), 356 deletions(-) rename api/src/main/yang/{transportpce-portmapping@2019-11-15.yang => transportpce-portmapping@2020-01-13.yang} (60%) diff --git a/api/src/main/yang/transportpce-portmapping@2019-11-15.yang b/api/src/main/yang/transportpce-portmapping@2020-01-13.yang similarity index 60% rename from api/src/main/yang/transportpce-portmapping@2019-11-15.yang rename to api/src/main/yang/transportpce-portmapping@2020-01-13.yang index 00a6be481..fc7ebe1b0 100644 --- a/api/src/main/yang/transportpce-portmapping@2019-11-15.yang +++ b/api/src/main/yang/transportpce-portmapping@2020-01-13.yang @@ -4,6 +4,9 @@ module transportpce-portmapping { prefix "org-opendaylight-transportpce-portmapping"; import org-openroadm-common-types { prefix org-openroadm-common-types; revision-date 2018-10-19; } + import org-openroadm-switching-pool-types { prefix org-openroadm-switching-pool-types; revision-date 2017-12-15; } + import org-openroadm-port-types {prefix org-openroadm-port-types; revision-date 2018-10-19; } + import ietf-inet-types { prefix ietf-inet-types; revision-date 2013-07-15; } organization @@ -15,6 +18,11 @@ module transportpce-portmapping { AT&T and others. All rights reserved. authors: Dhruv Bhardwaj ( db929a@att.com ) Shweta Vachhani ( sv111y@att.com )"; + revision "2020-01-13" { + description "Add OTN data from device and necessary + to build node inside otn topology"; + } + revision "2019-11-15" { description "OTN support"; } @@ -115,41 +123,49 @@ module transportpce-portmapping { leaf port-qual { type string; description - "Useful to identify from portmapping client from network ports - of XPDR"; + "Useful to identify from portmapping client from network ports + of XPDR"; } leaf supporting-ethernet{ type string; description "Ethernet interface provisioned on the port"; - } - leaf supporting-odu4{ - type string; - description - "ODU4 interface provisioned on the port"; - } - leaf rate{ - type string; - description - "Rate supported by the port"; } - leaf associated-lcp { + leaf supporting-odu4{ + type string; + description + "ODU4 interface provisioned on the port"; + } + leaf rate{ type string; description - "For XPDR, associate two logical-connection-points from device/connnection-map - data"; + "Rate supported by the port"; + } + leaf-list supported-interface-capability { + type identityref { + base org-openroadm-port-types:supported-if-capability; + } + } + leaf xponder-type { + type org-openroadm-common-types:xpdr-node-types; + } + leaf connection-map-lcp { + type string; + description + "For XPDR, associate two logical-connection-points from device/connnection-map + data"; } leaf partner-lcp { type string; description - "For XPDR unidirectional NETWORK port, associate two logical-connection-points - from device/partner port data"; + "For XPDR unidirectional NETWORK port, associate two logical-connection-points + from device/partner port data"; } } list cp-to-degree { description - "This mapping helps locate degree number of the circuitpack that - does lldp protocol management"; + "This mapping helps locate degree number of the circuitpack that + does lldp protocol management"; key circuit-pack-name; leaf circuit-pack-name { type string; @@ -161,6 +177,43 @@ module transportpce-portmapping { type string; } } + + list switching-pool-lcp { + description + "For MUXPDR and SWITCH, associates from device/odu-switching-pools data, the logical-connection-points"; + key "switching-pool-number"; + leaf switching-pool-number { + type uint16; + description + "Unique identifier for this odu-switching-pool"; + } + leaf switching-pool-type { + type org-openroadm-switching-pool-types:switching-pool-types; + } + list non-blocking-list { + key "nbl-number"; + leaf nbl-number { + type uint16; + description + "Identifier for this non-blocking-list. Unique within odu-switching-pool"; + } + leaf interconnect-bandwidth-unit { + type uint32; + description + "Switch fabric interconnect bandwidth unit rate in bits per second. + Represents granularity of switch fabric"; + } + leaf interconnect-bandwidth { + type uint32; + description + "Total interconnect bandwidth for a non-blocking element expressed as + number of inter-connect-bandwidth units"; + } + leaf-list lcp-list { + type string; + } + } + } } } } diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java index 60c8e8263..1642b60ba 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java @@ -13,10 +13,10 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java index e6da7201e..9ae8e9c8b 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java @@ -8,8 +8,8 @@ package org.opendaylight.transportpce.common.mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; public interface PortMapping { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java index abed310d8..c8600f821 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java @@ -19,13 +19,13 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadTransaction; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -112,11 +112,11 @@ public class PortMappingImpl implements PortMapping { return portMappingVersion121.updateMapping(nodeId,oldMapping); } else if (openROADMversion.getIntValue() == 2) { - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes .MappingBuilder oldMapping2Bldr = new MappingBuilder().setLogicalConnectionPoint(oldMapping .getLogicalConnectionPoint()).setPortDirection(oldMapping.getPortDirection()); - if (oldMapping.getAssociatedLcp() != null) { - oldMapping2Bldr.setAssociatedLcp(oldMapping.getAssociatedLcp()); + if (oldMapping.getConnectionMapLcp() != null) { + oldMapping2Bldr.setConnectionMapLcp(oldMapping.getConnectionMapLcp()); } if (oldMapping.getPartnerLcp() != null) { oldMapping2Bldr.setPartnerLcp(oldMapping.getPartnerLcp()); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java index 2b62b540e..d07a972e4 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java @@ -29,20 +29,20 @@ import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.NetworkBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfoBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.Direction; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.CircuitPack; @@ -652,7 +652,7 @@ public class PortMappingVersion121 { if (mapping != null && assoLcp != null) { // update existing mapping mpBldr = new MappingBuilder(mapping); - mpBldr.setAssociatedLcp(assoLcp); + mpBldr.setConnectionMapLcp(assoLcp); } else { // create a new mapping mpBldr = new MappingBuilder(); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java index aaa54c2fc..5df5edc93 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java @@ -28,20 +28,20 @@ import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.NetworkBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfoBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.Direction; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PortQual; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CircuitPack; @@ -766,7 +766,7 @@ public class PortMappingVersion221 { if (mapping != null && assoLcp != null) { // update existing mapping mpBldr = new MappingBuilder(mapping); - mpBldr.setAssociatedLcp(assoLcp); + mpBldr.setConnectionMapLcp(assoLcp); } else { // create a new mapping mpBldr = new MappingBuilder(); 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 d946513c3..945ea2fa8 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 @@ -149,7 +149,7 @@ public final class TPCEUtils { org.opendaylight.yang.gen.v1.gnpy.gnpy.eqpt.config.rev181119.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.gnpy.path.rev190502.$YangModuleInfoImpl.getInstance(), - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.$YangModuleInfoImpl.getInstance(), + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.$YangModuleInfoImpl.getInstance(), 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 d9af53e53..0cf4e4dce 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java @@ -26,11 +26,11 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev170929.Direction; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.Protocols; 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 99db959fb..0b075e740 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 @@ -24,8 +24,8 @@ import org.opendaylight.transportpce.networkmodel.util.ClliNetwork; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmNetwork; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmOtnTopology22; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes; 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; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/ClliNetwork.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/ClliNetwork.java index 037bbded9..248fb4581 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/ClliNetwork.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/ClliNetwork.java @@ -15,7 +15,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker; 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.portmapping.rev191115.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo; import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.NetworkTypes1; import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.NetworkTypes1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.Node1; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java index addef2774..da4cb0c26 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java @@ -10,7 +10,7 @@ package org.opendaylight.transportpce.networkmodel.util; import org.opendaylight.transportpce.common.mapping.MappingUtils; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.networkmodel.dto.TopologyShard; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java index 917926e51..5ce3167c3 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java @@ -17,7 +17,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker; 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.portmapping.rev191115.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.network.types.OpenroadmCommonNetworkBuilder; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology22.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology22.java index 8926a997b..95017daff 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology22.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology22.java @@ -24,8 +24,8 @@ 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.dto.TopologyShard; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.network.types.OpenroadmCommonNetworkBuilder; @@ -227,7 +227,7 @@ public class OpenRoadmOtnTopology22 { LOG.warn("no rate in portmapping for lcp {} of {}", ma.getLogicalConnectionPoint(), mappingNode.getNodeId()); } - xpdrTpBuilder.setTailEquipmentId(ma.getAssociatedLcp()); + xpdrTpBuilder.setTailEquipmentId(ma.getConnectionMapLcp()); ontTp1Bldr.setXpdrTpPortConnectionAttributes(xpdrTpBuilder.build()); ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()); tpList.add(ietfTpBldr.build()); @@ -248,7 +248,7 @@ public class OpenRoadmOtnTopology22 { LOG.warn("no rate in portmapping for lcp {} of {}", ma.getLogicalConnectionPoint(), mappingNode.getNodeId()); } - xpdrTpBuilder.setTailEquipmentId(ma.getAssociatedLcp()); + xpdrTpBuilder.setTailEquipmentId(ma.getConnectionMapLcp()); ontTp1Bldr.setXpdrTpPortConnectionAttributes(xpdrTpBuilder.build()); ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()); tpList.add(ietfTpBldr.build()); diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java index 7fb4a91cd..bd3c8665a 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java @@ -23,8 +23,8 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.networkmodel.dto.TopologyShard; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1; @@ -215,12 +215,12 @@ public class OpenRoadmTopology22 { .network.rev181130.TerminationPoint1Builder(); if (m.getPortQual().equals("xpdr-network")) { XpdrNetworkAttributesBuilder xpdrNwAttrBldr = new XpdrNetworkAttributesBuilder() - .setTailEquipmentId(m.getAssociatedLcp()); + .setTailEquipmentId(m.getConnectionMapLcp()); ontTp1Bldr.setXpdrNetworkAttributes(xpdrNwAttrBldr.build()); ocnTp1Bldr.setTpType(OpenroadmTpType.XPONDERNETWORK); org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder tpceTp1Bldr = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder() - .setAssociatedConnectionMapPort(m.getAssociatedLcp()); + .setAssociatedConnectionMapPort(m.getConnectionMapLcp()); ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()) .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 .TerminationPoint1.class, ocnTp1Bldr.build()) @@ -229,12 +229,12 @@ public class OpenRoadmTopology22 { tpList.add(ietfTpBldr.build()); } else if (m.getPortQual().equals("xpdr-client")) { XpdrClientAttributesBuilder xpdrNwAttrBldr = new XpdrClientAttributesBuilder() - .setTailEquipmentId(m.getAssociatedLcp()); + .setTailEquipmentId(m.getConnectionMapLcp()); ontTp1Bldr.setXpdrClientAttributes(xpdrNwAttrBldr.build()); ocnTp1Bldr.setTpType(OpenroadmTpType.XPONDERCLIENT); org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder tpceTp1Bldr = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder() - .setAssociatedConnectionMapPort(m.getAssociatedLcp()); + .setAssociatedConnectionMapPort(m.getConnectionMapLcp()); ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()) .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 .TerminationPoint1.class, ocnTp1Bldr.build()) diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java index 549b8c5d7..179f64193 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public final class TopologyUtils { +public final class TopologyUtils { private static final Logger LOG = LoggerFactory.getLogger(TopologyUtils.class); @@ -43,28 +43,26 @@ public final class TopologyUtils { public static LinkBuilder createLink(String srcNode, String dstNode, String srcTp, String destTp) { // Create Destination for link - DestinationBuilder dstNodeBldr = new DestinationBuilder(); - dstNodeBldr.setDestTp(destTp); - dstNodeBldr.setDestNode(new NodeId(dstNode)); + DestinationBuilder dstNodeBldr = new DestinationBuilder() + .setDestTp(destTp) + .setDestNode(new NodeId(dstNode)); // Create Source for the link - SourceBuilder srcNodeBldr = new SourceBuilder(); - srcNodeBldr.setSourceNode(new NodeId(srcNode)); - srcNodeBldr.setSourceTp(srcTp); + SourceBuilder srcNodeBldr = new SourceBuilder() + .setSourceNode(new NodeId(srcNode)) + .setSourceTp(srcTp); // set link builder attribute - LinkBuilder lnkBldr = new LinkBuilder(); - - lnkBldr.setDestination(dstNodeBldr.build()); - lnkBldr.setSource(srcNodeBldr.build()); - lnkBldr.setLinkId(LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp)); + LinkBuilder lnkBldr = new LinkBuilder() + .setDestination(dstNodeBldr.build()) + .setSource(srcNodeBldr.build()) + .setLinkId(LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp)); lnkBldr.withKey(new LinkKey(lnkBldr.getLinkId())); //set opposite link - Link1Builder lnk1Bldr = new Link1Builder(); LinkId oppositeLinkId = LinkIdUtil.getOppositeLinkId(srcNode, srcTp, dstNode, destTp); - lnk1Bldr.setOppositeLink(oppositeLinkId); - lnkBldr.addAugmentation(Link1.class,lnk1Bldr.build()); + Link1 lnk1 = new Link1Builder().setOppositeLink(oppositeLinkId).build(); + lnkBldr.addAugmentation(Link1.class,lnk1); return lnkBldr; } diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java index 7c497d209..03c9249a9 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java @@ -21,10 +21,10 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa import org.opendaylight.transportpce.olm.util.OlmUtils; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java index b91fe7ccc..6a6b9af05 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java @@ -61,8 +61,8 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev17 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.calculate.spanloss.base.output.Spans; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.calculate.spanloss.base.output.SpansBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java index f207d9fe0..f5db3f776 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java @@ -18,10 +18,10 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java index 7656d2a30..fb432772d 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java @@ -45,15 +45,15 @@ import org.opendaylight.transportpce.olm.util.OlmPowerServiceRpcImplUtil; import org.opendaylight.transportpce.olm.util.OlmUtils; import org.opendaylight.transportpce.test.AbstractTest; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfoBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java index b5dd347c3..c0388193f 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java @@ -19,8 +19,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.FiberPmd; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.RatioDB; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java index d96d880a3..0de5c5cbc 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java @@ -19,17 +19,17 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfoBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.FiberPmd; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.RatioDB; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java index 113135541..4c5688439 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java @@ -94,7 +94,6 @@ public class PceCalculation { returnStructure.setRC(ResponseCodes.RESPONSE_FAILED); return; } - MapUtils.mapDiversityConstraints(allNodes, allLinks, pceHardConstraints); if (!analyzeNw()) { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java index 0ce6603ba..524ddc2c0 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java @@ -20,7 +20,7 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.PowerDBm; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java index 049673c89..772f1a53b 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java @@ -21,7 +21,7 @@ import org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyGHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyTHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PowerDBm; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java index d16850434..bb1134319 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java @@ -14,7 +14,7 @@ import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.mapping.MappingUtils; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.OchAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.RateIdentity; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java index eef609904..31aab0f5d 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java @@ -41,7 +41,7 @@ import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.Servic import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.ServiceNodelist; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutputBuilder; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java index 2c013421d..3aa4686d0 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java @@ -19,7 +19,7 @@ import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; public class OpenRoadMInterface221Test extends AbstractTest { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java index dd1a96a2b..98c4f14b5 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java @@ -17,12 +17,12 @@ import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.renderer.stub.MountPointStub; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.GetConnectionPortTrailOutput; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.GetConnectionPortTrailOutputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceService; 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 6bd0c28b5..9f4b06c8d 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 @@ -27,10 +27,10 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.NetworkUtils; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; @@ -286,7 +286,7 @@ public class TapiTopologyImpl implements TapiTopologyService { .getAssociatedConnectionMapPort(); @NonNull KeyedInstanceIdentifier pmIID = InstanceIdentifier.create( - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network.class) + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network.class) .child(Nodes.class, new NodesKey(nodeIdPortMap)).child(Mapping.class, new MappingKey(networkLcp)); @NonNull FluentFuture> mappingOpt = dataBroker.newReadOnlyTransaction().read( diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java index 936ff6f66..352a65a85 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java @@ -19,7 +19,7 @@ import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.DataStoreContext; import org.opendaylight.transportpce.common.converter.XMLDataObjectConverter; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInputBuilder; diff --git a/tapi/src/test/resources/openroadm-topology2.xml b/tapi/src/test/resources/openroadm-topology2.xml index 88459e962..6227643cd 100644 --- a/tapi/src/test/resources/openroadm-topology2.xml +++ b/tapi/src/test/resources/openroadm-topology2.xml @@ -1,7 +1,10 @@ - - + + openroadm-topology + + + ROADM-A1-SRG3 @@ -294,31 +297,35 @@ 15 - SRG SRG3-CP-TXRX - SRG-TXRX-CP + SRG-TXRX-CP SRG3-PP2-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG3-PP4-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG3-PP1-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG3-PP3-TXRX - SRG-TXRX-PP + SRG-TXRX-PP + SRG openroadm-network ROADM-A1 + + clli-network + NodeA + ROADM-C1-DEG2 @@ -613,19 +620,23 @@ 15 - DEGREE DEG2-CTP-TXRX - DEGREE-TXRX-CTP + DEGREE-TXRX-CTP DEG2-TTP-TXRX - DEGREE-TXRX-TTP + DEGREE-TXRX-TTP + DEGREE openroadm-network ROADM-C1 + + clli-network + NodeC + ROADM-C1-SRG1 @@ -919,31 +930,35 @@ 15 - SRG SRG1-PP4-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-CP-TXRX - SRG-TXRX-CP + SRG-TXRX-CP SRG1-PP2-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP1-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP3-TXRX - SRG-TXRX-PP + SRG-TXRX-PP + SRG openroadm-network ROADM-C1 + + clli-network + NodeC + ROADM-A1-SRG1 @@ -1237,71 +1252,70 @@ 15 - SRG SRG1-PP4-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-CP-TXRX - SRG-TXRX-CP + SRG-TXRX-CP SRG1-PP2-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP1-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP3-TXRX - SRG-TXRX-PP + SRG-TXRX-PP + SRG openroadm-network ROADM-A1 + + clli-network + NodeA + XPDR-A1-XPDR1 - XPONDER XPDR1-CLIENT2 XPDR1-NETWORK2 - - XPDR1-NETWORK2 - - XPONDER-CLIENT + XPONDER-CLIENT XPDR1-NETWORK2 XPDR1-CLIENT2 - XPONDER-NETWORK - - XPDR1-CLIENT2 - + XPONDER-NETWORK XPDR1-CLIENT1 XPDR1-NETWORK1 - - XPDR1-NETWORK1 - - XPONDER-CLIENT + XPONDER-CLIENT XPDR1-NETWORK1 - XPDR1-CLIENT1 - XPONDER-NETWORK - XPDR1-CLIENT1 + ROADM-A1-SRG1--SRG1-PP1-TXRX + XPDR1-CLIENT1 + XPONDER-NETWORK + XPONDER openroadm-network XPDR-A1 + + clli-network + NodeA + ROADM-A1-DEG2 @@ -1596,19 +1610,23 @@ 15 - DEGREE DEG2-CTP-TXRX - DEGREE-TXRX-CTP + DEGREE-TXRX-CTP DEG2-TTP-TXRX - DEGREE-TXRX-TTP + DEGREE-TXRX-TTP + DEGREE openroadm-network ROADM-A1 + + clli-network + NodeA + ROADM-A1-DEG1 @@ -1903,59 +1921,58 @@ 15 - DEGREE DEG1-TTP-TXRX - DEGREE-TXRX-TTP + DEGREE-TXRX-TTP DEG1-CTP-TXRX - DEGREE-TXRX-CTP + DEGREE-TXRX-CTP + DEGREE openroadm-network ROADM-A1 + + clli-network + NodeA + XPDR-C1-XPDR1 - XPONDER XPDR1-CLIENT2 XPDR1-NETWORK2 - - XPDR1-NETWORK2 - - XPONDER-CLIENT + XPONDER-CLIENT XPDR1-NETWORK2 XPDR1-CLIENT2 - XPONDER-NETWORK - - XPDR1-CLIENT2 - + XPONDER-NETWORK XPDR1-CLIENT1 XPDR1-NETWORK1 - - XPDR1-NETWORK1 - - XPONDER-CLIENT + XPONDER-CLIENT XPDR1-NETWORK1 - XPDR1-CLIENT1 - XPONDER-NETWORK - XPDR1-CLIENT1 + ROADM-C1-SRG1--SRG1-PP1-TXRX + XPDR1-CLIENT1 + XPONDER-NETWORK + XPONDER openroadm-network XPDR-C1 + + clli-network + NodeC + ROADM-C1-DEG1 @@ -2250,34 +2267,35 @@ 15 - DEGREE DEG1-TTP-TXRX - DEGREE-TXRX-TTP + DEGREE-TXRX-TTP DEG1-CTP-TXRX - DEGREE-TXRX-CTP + DEGREE-TXRX-CTP + DEGREE openroadm-network ROADM-C1 + + clli-network + NodeC + - - - ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX ROADM-A1-DEG1 DEG1-CTP-TXRX - DROP-LINK ROADM-A1-SRG3 SRG3-CP-TXRX + DROP-LINK ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX @@ -2286,11 +2304,11 @@ ROADM-A1-SRG3 SRG3-CP-TXRX - ADD-LINK ROADM-A1-DEG2 DEG2-CTP-TXRX + ADD-LINK ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX @@ -2302,11 +2320,11 @@ ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX - ROADM-TO-ROADM ROADM-A1-DEG2 DEG2-TTP-TXRX + ROADM-TO-ROADM ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX @@ -2315,11 +2333,11 @@ ROADM-C1-DEG2 DEG2-CTP-TXRX - DROP-LINK ROADM-C1-SRG1 SRG1-CP-TXRX + DROP-LINK ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX @@ -2331,11 +2349,11 @@ ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX - ROADM-TO-ROADM ROADM-C1-DEG1 DEG1-TTP-TXRX + ROADM-TO-ROADM ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX @@ -2344,11 +2362,11 @@ ROADM-C1-DEG2 DEG2-CTP-TXRX - EXPRESS-LINK ROADM-C1-DEG1 DEG1-CTP-TXRX + EXPRESS-LINK ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX @@ -2357,12 +2375,11 @@ XPDR-A1-XPDR1 XPDR1-NETWORK1 - ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1 - XPONDER-OUTPUT ROADM-A1-SRG1 SRG1-PP1-TXRX + XPONDER-OUTPUT ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1 @@ -2371,12 +2388,11 @@ XPDR-C1-XPDR1 XPDR1-NETWORK1 - ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1 - XPONDER-OUTPUT ROADM-C1-SRG1 SRG1-PP1-TXRX + XPONDER-OUTPUT ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1 @@ -2385,12 +2401,11 @@ ROADM-C1-SRG1 SRG1-PP1-TXRX - XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX - XPONDER-INPUT XPDR-C1-XPDR1 XPDR1-NETWORK1 + XPONDER-INPUT XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX @@ -2399,11 +2414,11 @@ ROADM-A1-DEG2 DEG2-CTP-TXRX - DROP-LINK ROADM-A1-SRG1 SRG1-CP-TXRX + DROP-LINK ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX @@ -2412,11 +2427,11 @@ ROADM-C1-DEG1 DEG1-CTP-TXRX - EXPRESS-LINK ROADM-C1-DEG2 DEG2-CTP-TXRX + EXPRESS-LINK ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX @@ -2425,11 +2440,11 @@ ROADM-A1-DEG2 DEG2-CTP-TXRX - DROP-LINK ROADM-A1-SRG3 SRG3-CP-TXRX + DROP-LINK ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX @@ -2438,11 +2453,11 @@ ROADM-A1-DEG2 DEG2-CTP-TXRX - EXPRESS-LINK ROADM-A1-DEG1 DEG1-CTP-TXRX + EXPRESS-LINK ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX @@ -2451,11 +2466,11 @@ ROADM-A1-SRG1 SRG1-CP-TXRX - ADD-LINK ROADM-A1-DEG1 DEG1-CTP-TXRX + ADD-LINK ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX @@ -2464,11 +2479,11 @@ ROADM-C1-DEG1 DEG1-CTP-TXRX - DROP-LINK ROADM-C1-SRG1 SRG1-CP-TXRX + DROP-LINK ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX @@ -2477,11 +2492,11 @@ ROADM-C1-SRG1 SRG1-CP-TXRX - ADD-LINK ROADM-C1-DEG2 DEG2-CTP-TXRX + ADD-LINK ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX @@ -2490,11 +2505,11 @@ ROADM-A1-SRG1 SRG1-CP-TXRX - ADD-LINK ROADM-A1-DEG2 DEG2-CTP-TXRX + ADD-LINK ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX @@ -2503,12 +2518,11 @@ ROADM-A1-SRG1 SRG1-PP1-TXRX - XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX - XPONDER-INPUT XPDR-A1-XPDR1 XPDR1-NETWORK1 + XPONDER-INPUT XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX @@ -2517,11 +2531,11 @@ ROADM-A1-DEG1 DEG1-CTP-TXRX - EXPRESS-LINK ROADM-A1-DEG2 DEG2-CTP-TXRX + EXPRESS-LINK ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX @@ -2530,11 +2544,11 @@ ROADM-A1-SRG3 SRG3-CP-TXRX - ADD-LINK ROADM-A1-DEG1 DEG1-CTP-TXRX + ADD-LINK ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX @@ -2543,11 +2557,11 @@ ROADM-A1-DEG1 DEG1-CTP-TXRX - DROP-LINK ROADM-A1-SRG1 SRG1-CP-TXRX + DROP-LINK ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX @@ -2556,11 +2570,11 @@ ROADM-C1-SRG1 SRG1-CP-TXRX - ADD-LINK ROADM-C1-DEG1 DEG1-CTP-TXRX + ADD-LINK ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX diff --git a/tapi/src/test/resources/portmapping-example.xml b/tapi/src/test/resources/portmapping-example.xml index 37dbc0cec..f4f601176 100644 --- a/tapi/src/test/resources/portmapping-example.xml +++ b/tapi/src/test/resources/portmapping-example.xml @@ -1,57 +1,61 @@ - XPDR-C1 + XPDR-A1 - xpdr - 1.2.3.4 - NodeC 2.2.1 - vendorA model2 + NodeA + xpdr + vendorA + 1.2.3.4 - XPDR1-NETWORK1 - 1/0/1-PLUG-NET + XPDR1-NETWORK2 xpdr-network - XPDR1-CLIENT1 - bidirectional + XPDR1-CLIENT2 + 1/0/2-PLUG-NET 1 + x:if-OCH + bidirectional - XPDR1-NETWORK2 - 1/0/2-PLUG-NET + XPDR1-NETWORK1 xpdr-network - XPDR1-CLIENT2 - bidirectional + XPDR1-CLIENT1 + 1/0/1-PLUG-NET 1 + x:if-OCH + bidirectional XPDR1-CLIENT1 - 1/0/1-PLUG-CLIENT xpdr-client - XPDR1-NETWORK1 - bidirectional + XPDR1-NETWORK1 + 1/0/1-PLUG-CLIENT C1 + x:if-100GE + bidirectional XPDR1-CLIENT2 - 1/0/2-PLUG-CLIENT xpdr-client - XPDR1-NETWORK2 - bidirectional + XPDR1-NETWORK2 + 1/0/2-PLUG-CLIENT C1 + x:if-100GE + bidirectional - ROADM-C1 + ROADM-A1 - rdm - 127.0.0.11 - NodeC 2.2.1 - vendorA model2 + NodeA + rdm + vendorA + 127.0.0.11 2/0 @@ -74,96 +78,124 @@ 1GE-interface-2 - SRG1-PP1-TXRX - 3/0 - bidirectional + SRG3-PP1-TXRX + 5/0 C1 - - - DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX - 1/0 - OTS-DEG1-TTP-TXRX bidirectional - L1 SRG1-PP2-TXRX 3/0 - bidirectional C2 + bidirectional - SRG1-PP3-TXRX + SRG3-PP4-TXRX + 5/0 + C4 + bidirectional + + + SRG1-PP4-TXRX 3/0 + C4 bidirectional + + + SRG3-PP3-TXRX + 5/0 C3 + bidirectional DEG2-TTP-TXRX + OTS-DEG2-TTP-TXRX 2/0 + OMS-DEG2-TTP-TXRX + L1 + bidirectional + + + SRG1-PP3-TXRX + 3/0 + C3 bidirectional + + + SRG3-PP2-TXRX + 5/0 + C2 + bidirectional + + + DEG1-TTP-TXRX + 1/0 L1 + bidirectional - SRG1-PP4-TXRX + SRG1-PP1-TXRX 3/0 + C1 bidirectional - C4 - XPDR-A1 + XPDR-C1 - xpdr - 1.2.3.4 - NodeA 2.2.1 - vendorA model2 + NodeC + xpdr + vendorA + 1.2.3.4 - XPDR1-NETWORK1 - 1/0/1-PLUG-NET + XPDR1-NETWORK2 xpdr-network - XPDR1-CLIENT1 - bidirectional + XPDR1-CLIENT2 + 1/0/2-PLUG-NET 1 + x:if-OCH + bidirectional - XPDR1-NETWORK2 - 1/0/2-PLUG-NET + XPDR1-NETWORK1 xpdr-network - XPDR1-CLIENT2 - bidirectional + XPDR1-CLIENT1 + 1/0/1-PLUG-NET 1 + x:if-OCH + bidirectional XPDR1-CLIENT1 - 1/0/1-PLUG-CLIENT xpdr-client - XPDR1-NETWORK1 - bidirectional + XPDR1-NETWORK1 + 1/0/1-PLUG-CLIENT C1 + x:if-100GE + bidirectional XPDR1-CLIENT2 - 1/0/2-PLUG-CLIENT xpdr-client - XPDR1-NETWORK2 - bidirectional + XPDR1-NETWORK2 + 1/0/2-PLUG-CLIENT C1 + x:if-100GE + bidirectional - ROADM-A1 + ROADM-C1 - rdm - 127.0.0.11 - NodeA 2.2.1 - vendorA model2 + NodeC + rdm + vendorA + 127.0.0.11 2/0 @@ -186,66 +218,42 @@ 1GE-interface-2 - SRG1-PP1-TXRX + SRG1-PP2-TXRX 3/0 - bidirectional - C1 - - - SRG3-PP3-TXRX - 5/0 - bidirectional - C3 - - - DEG1-TTP-TXRX - 1/0 - bidirectional - L1 - - - SRG3-PP2-TXRX - 5/0 - bidirectional C2 - - - SRG3-PP1-TXRX - 5/0 bidirectional - C1 - SRG1-PP2-TXRX + SRG1-PP4-TXRX 3/0 + C4 bidirectional - C2 - SRG3-PP4-TXRX - 5/0 + DEG2-TTP-TXRX + 2/0 + L1 bidirectional - C4 SRG1-PP3-TXRX 3/0 - bidirectional C3 + bidirectional - DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX - 2/0 - OTS-DEG2-TTP-TXRX - bidirectional + DEG1-TTP-TXRX + OTS-DEG1-TTP-TXRX + 1/0 + OMS-DEG1-TTP-TXRX L1 + bidirectional - SRG1-PP4-TXRX + SRG1-PP1-TXRX 3/0 + C1 bidirectional - C4 diff --git a/tests/transportpce_tests/1.2.1/test_portmapping.py b/tests/transportpce_tests/1.2.1/test_portmapping.py index 5a16be582..424e6f7d6 100644 --- a/tests/transportpce_tests/1.2.1/test_portmapping.py +++ b/tests/transportpce_tests/1.2.1/test_portmapping.py @@ -247,7 +247,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertIn( {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional', - 'associated-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'}, + 'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'}, res['mapping']) def test_11_xpdr_portmapping_NETWORK2(self): @@ -262,7 +262,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertIn( {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional', - 'associated-lcp': 'XPDR1-CLIENT3', 'port-qual': 'xpdr-network'}, + 'connection-map-lcp': 'XPDR1-CLIENT3', 'port-qual': 'xpdr-network'}, res['mapping']) def test_12_xpdr_portmapping_CLIENT1(self): @@ -278,7 +278,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): {'supporting-port': 'C1', 'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', - 'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'}, + 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'}, res['mapping']) def test_13_xpdr_portmapping_CLIENT2(self): @@ -310,7 +310,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): {'supporting-port': 'C3', 'supporting-circuit-pack-name': '1/0/C3-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT3', - 'associated-lcp': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional', + 'connection-map-lcp': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional', 'port-qual': 'xpdr-client'}, res['mapping']) diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py index 7d0980299..807cbde8c 100644 --- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py @@ -138,13 +138,13 @@ class TransportPCERendererTesting(unittest.TestCase): self.assertIn( {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional', - 'associated-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'}, + 'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'}, res['nodes'][0]['mapping']) self.assertIn( {'supporting-port': 'C1', 'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', - 'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'}, + 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'}, res['nodes'][0]['mapping']) def test_05_service_path_create(self): diff --git a/tests/transportpce_tests/2.2.1/test_portmapping.py b/tests/transportpce_tests/2.2.1/test_portmapping.py index 4b54cb284..b5a4e4738 100644 --- a/tests/transportpce_tests/2.2.1/test_portmapping.py +++ b/tests/transportpce_tests/2.2.1/test_portmapping.py @@ -238,7 +238,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertIn( {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network', - 'port-direction': 'bidirectional', 'associated-lcp': 'XPDR1-CLIENT1'}, + 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1'}, res['mapping']) def test_12_xpdr_portmapping_NETWORK2(self): @@ -253,7 +253,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): self.assertIn( {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional', - 'associated-lcp': 'XPDR1-CLIENT2', 'port-qual': 'xpdr-network'}, + 'connection-map-lcp': 'XPDR1-CLIENT2', 'port-qual': 'xpdr-network'}, res['mapping']) def test_13_xpdr_portmapping_CLIENT1(self): @@ -269,7 +269,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): {'supporting-port': 'C1', 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', - 'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'}, + 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'}, res['mapping']) def test_14_xpdr_portmapping_CLIENT2(self): @@ -285,7 +285,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): {'supporting-port': 'C1', 'supporting-circuit-pack-name': '1/0/2-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT2', 'port-direction': 'bidirectional', - 'associated-lcp': 'XPDR1-NETWORK2', 'port-qual': 'xpdr-client'}, + 'connection-map-lcp': 'XPDR1-NETWORK2', 'port-qual': 'xpdr-client'}, res['mapping']) def test_15_xpdr_device_disconnected(self): diff --git a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py index c70bf9dd1..436e769db 100644 --- a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py @@ -139,13 +139,13 @@ class TransportPCERendererTesting(unittest.TestCase): self.assertIn( {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network', - 'port-direction': 'bidirectional', 'associated-lcp': 'XPDR1-CLIENT1'}, + 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1'}, res['nodes'][0]['mapping']) self.assertIn( {'supporting-port': 'C1', 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', - 'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'}, + 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'}, res['nodes'][0]['mapping']) def test_05_service_path_create(self): -- 2.36.6