Replace tpce-topology yang by existing ordmodels

author Thierry Jiao <thierry.jiao@orange.com>

Thu, 30 Jun 2022 09:08:50 +0000 (11:08 +0200)

committer Thierry Jiao <thierry.jiao@orange.com>

Wed, 13 Jul 2022 12:02:49 +0000 (14:02 +0200)
author Thierry Jiao <thierry.jiao@orange.com>
Thu, 30 Jun 2022 09:08:50 +0000 (11:08 +0200)
committer Thierry Jiao <thierry.jiao@orange.com>
Wed, 13 Jul 2022 12:02:49 +0000 (14:02 +0200)
diff --git a/api/pom.xml b/api/pom.xml

index cc6de817c2ef0a3287a09810802590544b01ee5b..ff32883bca7998ad33f1a5838196129dc31fe844 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -37,6 +37,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <artifactId>transportpce-ordmodels-service</artifactId>
        <version>${project.version}</version>
      </dependency>
+    <dependency>
+      <groupId>${project.groupId}.ordmodels</groupId>
+      <artifactId>transportpce-ordmodels-network</artifactId>
+      <version>${project.version}</version>
+    </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>transportpce-tapimodels</artifactId>
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 8426fa31bc77988d66d974b1f1b5794406eadce7..1e58eef1d9739bc22cd95c3f44ed65d21a4287b8 100644 (file)
--- 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 b85554ee234e50da13d8d957e3763de4c0efba08..a10b7f04bf50505210c020828200930af5f49938 100644 (file)
--- 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 f8cc331967f818e0a7fe4015040b0cb123c922c7..18d5b5e7355c1173494aeea3262f56ddee3aac94 100644 (file)
--- 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 f1c56764f1e7305e2ce99413552c1fd34e056c74..0abee07537959a79b96cb48a0081ba83422c5934 100644 (file)
--- 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 1d799ada4ff093e42cb4ffa9b6176a7d194fce8f..b954aa37e3162d7b661a8d098016b8a626e5ea4c 100644 (file)
--- 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 ba108903f330fd8bddc774bbff1a424b6fe558da..26c8f4b6dda256c2f6254dc3c895bcdf59aec8d8 100644 (file)
--- 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 6c05f8a663920b53e8e51265b22f72a3b6a699e4..a40e55bbdcb3ef3d84cb557e331140c22f46c784 100644 (file)
--- 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 8f126883815e2b37d7d28b318201e2805d5d2022..1a518514c40f1aff462be53547ad3b9f79e20f91 100644 (file)
--- 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 a0f506ae64460acbb336a4364cafc3e65e9381f2..dbbf0aaaf0e3cbb4f5ad18408522a15ba398df94 100644 (file)
--- 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 c9ddfe112c7c94a7b11916e54f7365cfdb92bee6..e71c5dc52b722a422b984c7d41b1e27e1c0f9891 100644 (file)
--- 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 22742cfe4d14bb5b362038ed4ea4c45a0d5af416..5e8bf12ecc18af3c20d8c18f3a978f8d44d11711 100644 (file)
--- 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 58824cc50a0e9bacafbb82b448fecf60718a7ce8..9843bd987473553859c3ddc99535b28aa00cbe24 100644 (file)
--- 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<Link> 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<TerminationPointKey, TerminationPoint> 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<SupportingTerminationPointKey, SupportingTerminationPoint> 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 5384547bd442dcab3d021aced721badc81e5381e..d53b05567e9350ae0b22f44d0a74eac1f6a9b6c4 100644 (file)
--- 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 2db827b4c57c1c376554d748283c53719818f5a2..04dec312dc3c22401616a9d053e8df4c58fba81c 100644 (file)
--- 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 bccb0ff2afe96f32ce0a24dea2fd3fdf060f35b9..5c5f959df9561955a0c2cc650e9e629954af780b 100644 (file)
--- 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 b8c3c62e13b252a1e3a36e1205586be4d6a633a4..4acee5cbda6f2b79394b0f1e47bd0f8be18f7c83 100644 (file)
--- 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 897c1ca76c3b2b76334e474f786e69501372c331..bfc6f672f7a2adbc2aca650319c27f56782d03fa 100644 (file)
--- 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 d8d90aa8ddc93686926c823d46de405af47c6cc4..28f50657b9d1b5c7105151ab24bbe6baada34f10 100644 (file)
--- a/networkmodel/src/test/resources/openroadm-topology.xml
+++ b/networkmodel/src/test/resources/openroadm-topology.xml
@@ -59,29 +59,25 @@
      <termination-point
        xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT1</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
      </termination-point>
      <termination-point
        xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT2</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
      </termination-point>
      <termination-point
        xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-NETWORK2</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
      </termination-point>
      <termination-point
        xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-NETWORK1</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
        <xpdr-network-attributes
          xmlns="http://org/openroadm/network/topology">
          <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP1-TXRX
@@ -185,29 +181,25 @@
      <termination-point
        xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT1</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
      </termination-point>
      <termination-point
        xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT2</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
      </termination-point>
      <termination-point
        xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-NETWORK2</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
      </termination-point>
      <termination-point
        xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-NETWORK1</tp-id>
-      <associated-connection-map-port
-        xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
        <xpdr-network-attributes
          xmlns="http://org/openroadm/network/topology">
          <tail-equipment-id>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 (file)

index 39c7399..0000000
--- 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 7eb06d8cbd3e463d7aac79a772a51c88233c6a20..9e28aa9bdec02f9acb68469af2dab6d777e16b9e 100644 (file)
--- 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 7e96ea39860a053edfa02c9c8caae4bccdcc52b9..01bf4d34cd22012090d892679659f6b2b2b4c83a 100644 (file)
--- 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 9f902b809424a178b62aa0d7b90b8f8fa91d260c..da07adf49466a356eca54c6dda0364471f310bef 100644 (file)
--- 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 4add60c57d1f78a0964e8299b6d9315718ac0a85..f8e22e28b68fa793ab8edb546a37b04c47a279cb 100644 (file)
--- 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 9eb124cad5d1dc1325e38762bb82431b6ec3085a..f983d37745e172a30a9e4d0a6f19ef2ee2ff9b17 100644 (file)
--- 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 03a39fac62d957c50a626c56aaaf81531a4991ff..d7c5c21f539411f7fe87904550abde6e0c52163c 100644 (file)
--- 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<TpId> 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 7abf12f2578e813b6f718463a0df4b9a420ab615..aab9df4b0d1b5435e5142d39ba74cf9c57b6c2cf 100644 (file)
--- 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<TpId> 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 edfa562c0facea57fc96ce2621f0ebd5331719b5..57990165125d57822f4696a28c00b2c9f68bba3a 100644 (file)
--- 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 af77db43a9896d9583886b1f3a9fb3424fdc7865..02cba20e2c94c4627b7b5b4ddb359c8994390196 100644 (file)
--- 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 54068af2237707aac4b5473baa929ccc3be29cc7..f0da0c7fb5d366dffa727bf68c48b05d18432cf5 100644 (file)
--- a/tapi/src/test/resources/openroadm-topology.xml
+++ b/tapi/src/test/resources/openroadm-topology.xml
@@ -65,28 +65,28 @@
      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT2</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-NETWORK2</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-NETWORK1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
          <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP1-TXRX</tail-equipment-id>
        </xpdr-network-attributes>
@@ -235,28 +235,28 @@
      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT2</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-NETWORK2</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-NETWORK1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
diff --git a/tapi/src/test/resources/otn-topology.xml b/tapi/src/test/resources/otn-topology.xml

index e02d8d0316d64dcc66ecdb6b4c3b3c226287c059..c2086f6505084f33bb10c824dd4c28c6e273ebae 100644 (file)
--- a/tapi/src/test/resources/otn-topology.xml
+++ b/tapi/src/test/resources/otn-topology.xml
@@ -12,7 +12,7 @@
      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
        <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
          <supported-interface-capability>
            <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
@@ -25,7 +25,7 @@
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT2</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
        <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
          <supported-interface-capability>
            <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
@@ -43,7 +43,7 @@
          <node-ref>XPDR-C1-XPDR1</node-ref>
          <tp-ref>XPDR1-NETWORK2</tp-ref>
        </supporting-termination-point>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
        <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
          <supported-interface-capability>
            <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH</if-cap-type>
@@ -61,7 +61,7 @@
          <node-ref>XPDR-C1-XPDR1</node-ref>
          <tp-ref>XPDR1-NETWORK1</tp-ref>
        </supporting-termination-point>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
        <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
          <supported-interface-capability>
            <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH</if-cap-type>
@@ -403,7 +403,7 @@
      <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
        <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
          <supported-interface-capability>
            <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
@@ -416,7 +416,7 @@
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
        <tp-id>XPDR1-CLIENT2</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
        <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
          <supported-interface-capability>
            <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-100GE</if-cap-type>
@@ -434,7 +434,7 @@
          <node-ref>XPDR-A1-XPDR1</node-ref>
          <tp-ref>XPDR1-NETWORK2</tp-ref>
        </supporting-termination-point>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
        <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
          <supported-interface-capability>
            <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH</if-cap-type>
@@ -452,7 +452,7 @@
          <node-ref>XPDR-A1-XPDR1</node-ref>
          <tp-ref>XPDR1-NETWORK1</tp-ref>
        </supporting-termination-point>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
        <tp-supported-interfaces xmlns="http://org/openroadm/otn/network/topology">
          <supported-interface-capability>
            <if-cap-type xmlns:x="http://org/openroadm/port/types">x:if-OCH</if-cap-type>
@@ -1431,7 +1431,7 @@
        <dest-tp>XPDR1-NETWORK1</dest-tp>
        <dest-node>SPDR-SA1-XPDR1</dest-node>
      </destination>
-    <otn-link-type xmlns="http://transportpce/topology">OTU4</otn-link-type>
+    <otn-link-type xmlns="http://org/opendaylight/transportpce/networkutils">OTU4</otn-link-type>
    </link>
    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
      <link-id>OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1</link-id>
@@ -1449,7 +1449,7 @@
        <dest-tp>XPDR1-NETWORK1</dest-tp>
        <dest-node>SPDR-SC1-XPDR1</dest-node>
      </destination>
-    <otn-link-type xmlns="http://transportpce/topology">OTU4</otn-link-type>
+    <otn-link-type xmlns="http://org/opendaylight/transportpce/networkutils">OTU4</otn-link-type>
    </link>
    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
      <link-id>ODTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1</link-id>
@@ -1467,7 +1467,7 @@
        <dest-tp>XPDR1-NETWORK1</dest-tp>
        <dest-node>SPDR-SA1-XPDR1</dest-node>
      </destination>
-    <otn-link-type xmlns="http://transportpce/topology">ODTU4</otn-link-type>
+    <otn-link-type xmlns="http://org/opendaylight/transportpce/networkutils">ODTU4</otn-link-type>
    </link>
    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
      <link-id>ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1</link-id>
@@ -1485,7 +1485,7 @@
        <dest-tp>XPDR1-NETWORK1</dest-tp>
        <dest-node>SPDR-SC1-XPDR1</dest-node>
      </destination>
-    <otn-link-type xmlns="http://transportpce/topology">ODTU4</otn-link-type>
+    <otn-link-type xmlns="http://org/opendaylight/transportpce/networkutils">ODTU4</otn-link-type>
    </link>
  </network>
  </networks>
diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml

index 20d05c964eb3b93698b06094b601d7fb0c075cb9..e0f1176d81eb17e359415a5d59dbb2148a63ac5f 100644 (file)
--- a/tests/sample_configs/NW-for-test-5-4.xml
+++ b/tests/sample_configs/NW-for-test-5-4.xml
@@ -157,56 +157,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -368,56 +368,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -579,56 +579,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -790,56 +790,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -1001,56 +1001,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -1212,56 +1212,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -1423,56 +1423,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -1634,56 +1634,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -1845,56 +1845,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -2056,56 +2056,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -2267,56 +2267,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -2478,56 +2478,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -2689,56 +2689,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -2900,56 +2900,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -3111,56 +3111,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -3322,56 +3322,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -3533,56 +3533,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -3744,56 +3744,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -3955,56 +3955,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -4166,56 +4166,56 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
diff --git a/tests/sample_configs/NW-simple-topology.xml b/tests/sample_configs/NW-simple-topology.xml

index 646868ba25a46528a548b9e582ad30e6f1a98890..6153b9700d0406c2b25fd3015cdde4161fcf10fc 100644 (file)
--- a/tests/sample_configs/NW-simple-topology.xml
+++ b/tests/sample_configs/NW-simple-topology.xml
@@ -176,101 +176,101 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-1</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-2</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-3</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-4</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-5</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -444,105 +444,105 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-1</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-2</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-3</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-4</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-5</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -716,105 +716,105 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-1</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-2</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-3</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-4</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-5</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -988,105 +988,105 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-1</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-2</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-3</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-4</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-5</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -1260,105 +1260,105 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-1</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-2</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-3</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-4</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-5</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -1532,105 +1532,105 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-1</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-2</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-3</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-4</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-5</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -1804,105 +1804,105 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-1</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-2</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-3</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-4</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-5</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -2076,105 +2076,105 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-1</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-2</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-3</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-4</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-5</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
@@ -2348,105 +2348,105 @@
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW1-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-1</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW2-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-2</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW3-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-3</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW4-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-4</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-RX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>XPDR-NW5-TX</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
      <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
          <tp-id>Client-5</tp-id>
          <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
          <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
          <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
      </termination-point>
diff --git a/tests/sample_configs/gnpy/openroadmTopology.json b/tests/sample_configs/gnpy/openroadmTopology.json

index 3029dcaccb24843c0e27ca6c65990a7de4b9d159..283c4c6b9fa5fc74db5bfe9e1f16a18342fd7ffc 100644 (file)
--- 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 c23fb1b00c72dd22c07b83867a674fcf8faeee84..a4cd5f3a3f692e9f4ad7e2f959f8b1e8baa4cc50 100644 (file)
--- 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 5d69ad00f2480ea89acce1c7c541f687e6635b5b..548b0b291d69db00e5a927846de22f381a4c069f 100644 (file)
--- 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 74f345a35ee95b7f05509a70f2efca4507398833..09acf29bc5d4a89aba63195b1185901a713d2009 100644 (file)
--- 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 86f80015b039260d09fb63742dc35484cecfc0c7..67eeadbbfb691eb55330a340cd6377688a0fb92d 100644 (file)
--- a/tests/sample_configs/honeynode-topo.xml
+++ b/tests/sample_configs/honeynode-topo.xml
@@ -640,28 +640,28 @@
          <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
              <tp-id>XPDR1-NETWORK2</tp-id>
              <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
              <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
          </termination-point>
          <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
              <tp-id>XPDR1-CLIENT2</tp-id>
              <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
              <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
          </termination-point>
          <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
              <tp-id>XPDR1-CLIENT1</tp-id>
              <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
              <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
          </termination-point>
          <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
              <tp-id>XPDR1-NETWORK1</tp-id>
              <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
              <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
          </termination-point>
@@ -719,28 +719,28 @@
          <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
              <tp-id>XPDR1-NETWORK2</tp-id>
              <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
              <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
          </termination-point>
          <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
              <tp-id>XPDR1-CLIENT2</tp-id>
              <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
              <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
          </termination-point>
          <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
              <tp-id>XPDR1-CLIENT1</tp-id>
              <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
              <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
          </termination-point>
          <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
              <tp-id>XPDR1-NETWORK1</tp-id>
              <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
              <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
          </termination-point>
diff --git a/tests/sample_configs/honeynode-topo400G.json b/tests/sample_configs/honeynode-topo400G.json

index 854adea78d767b089d60a2a6dcc99d80fbb99f87..12b66cdc85b66ecc25d58c351ecab6f0b9cd3092 100644 (file)
--- 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 1600fe200b2286e4aea8ed8c697ec83777fe8cb9..d6ac68084bd8f2c3af1e13d8360d29dd0325e424 100644 (file)
--- 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 88ae14f69ea583e11aef79472de9071e62eaf1e0..be11ec3ab60d3d2938f53192cd045fd7ee93b5ed 100644 (file)
--- 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 fab75217983c8dd09f860fd5995d73ae61a6c15b..feb95046dfd3509c7a32d5885f741852fbcdcf99 100644 (file)
--- 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 4169b086090ab881ea32bb8cbd10b480d292a67a..22707c43eea07aec84fe65150069de697b547e85 100644 (file)
--- 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 388c4fa25079c21999fca09b64aef081ccd284ff..11de7104007c392eb7860173434f4484c1a07631 100644 (file)
--- 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 fa90adc38e0684497c567719f75cd2d29a661483..2bd319118ee204569bec52104d6bfc11a5c752f9 100644 (file)
--- 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'],
author	Thierry Jiao <thierry.jiao@orange.com>
	Thu, 30 Jun 2022 09:08:50 +0000 (11:08 +0200)
committer	Thierry Jiao <thierry.jiao@orange.com>
	Wed, 13 Jul 2022 12:02:49 +0000 (14:02 +0200)
api/pom.xml		patch \| blob \| history
api/src/main/yang/transportpce-networkutils@2022-06-30.yang	[moved from api/src/main/yang/transportpce-networkutils@2017-08-18.yang with 57% similarity]	patch \| blob \| history
lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java		patch \| blob \| history
lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java		patch \| blob \| history
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java		patch \| blob \| history
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java		patch \| blob \| history
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java		patch \| blob \| history
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java		patch \| blob \| history
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java		patch \| blob \| history
networkmodel/src/test/resources/openroadm-topology.xml		patch \| blob \| history
ordmodels/network/src/main/yang/transportpce-topology@2022-01-23.yang	[deleted file]	patch \| blob \| history
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java		patch \| blob \| history
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java		patch \| blob \| history
pce/src/test/resources/gnpy/gnpy_topology.json		patch \| blob \| history
renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java		patch \| blob \| history
servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java		patch \| blob \| history
tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java		patch \| blob \| history
tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java		patch \| blob \| history
tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java		patch \| blob \| history
tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java		patch \| blob \| history
tapi/src/test/resources/openroadm-topology.xml		patch \| blob \| history
tapi/src/test/resources/otn-topology.xml		patch \| blob \| history
tests/sample_configs/NW-for-test-5-4.xml		patch \| blob \| history
tests/sample_configs/NW-simple-topology.xml		patch \| blob \| history
tests/sample_configs/gnpy/openroadmTopology.json		patch \| blob \| history
tests/sample_configs/honeynode-otntopo400G.json		patch \| blob \| history
tests/sample_configs/honeynode-otntopo400GwithODUC4.json		patch \| blob \| history
tests/sample_configs/honeynode-otntopo400GwithOTUC4.json		patch \| blob \| history
tests/sample_configs/honeynode-topo.xml		patch \| blob \| history
tests/sample_configs/honeynode-topo400G.json		patch \| blob \| history
tests/transportpce_tests/1.2.1/test03_topology.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test03_topology.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test11_otn_end2end.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py		patch \| blob \| history
tests/transportpce_tests/hybrid/test02_B100G_end2end.py		patch \| blob \| history