upgrade portmapping YANG to introduce OTN

- add otn data to portmapping YANG model
(odu-switching-pool, supported-interface-capability, xponder-type)
- rename associated-lcp in connection-map-lcp to avoid potential
  confusions to come
- update revision
- modify code accordingly to support this new revision
- update tests accordingly

JIRA: TRNSPRTPCE-177
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule.com>
Change-Id: Ice6c2cff6bb105cb04abdf04b49976daa976571d

diff --git a/api/src/main/yang/transportpce-portmapping@2019-11-15.yang b/api/src/main/yang/transportpce-portmapping@2020-01-13.yang
similarity index 60%
rename from api/src/main/yang/transportpce-portmapping@2019-11-15.yang
rename to api/src/main/yang/transportpce-portmapping@2020-01-13.yang
index 00a6be48137a0b1d1118fec9b0518d22b025a27d..fc7ebe1b0f8b06127fab20c5093514aa1fe32b6a 100644 (file)
--- a/api/src/main/yang/transportpce-portmapping@2019-11-15.yang
+++ b/api/src/main/yang/transportpce-portmapping@2020-01-13.yang
@@ -4,6 +4,9 @@ module transportpce-portmapping {
   prefix "org-opendaylight-transportpce-portmapping";
 
   import org-openroadm-common-types { prefix org-openroadm-common-types; revision-date 2018-10-19; }
+  import org-openroadm-switching-pool-types { prefix org-openroadm-switching-pool-types; revision-date 2017-12-15; }
+  import org-openroadm-port-types {prefix org-openroadm-port-types; revision-date 2018-10-19; }
+
   import ietf-inet-types { prefix ietf-inet-types; revision-date 2013-07-15; }
 
   organization
@@ -15,6 +18,11 @@ module transportpce-portmapping {
     AT&T and others. All rights reserved. authors: Dhruv Bhardwaj
     ( db929a@att.com ) Shweta Vachhani ( sv111y@att.com )";
 
+  revision "2020-01-13" {
+      description "Add OTN data from device and necessary
+          to build node inside otn topology";
+    }
+
   revision "2019-11-15" {
     description "OTN support";
   }
@@ -115,41 +123,49 @@ module transportpce-portmapping {
         leaf port-qual {
           type string;
           description
-             "Useful to identify from portmapping client from network ports
-             of XPDR";
+            "Useful to identify from portmapping client from network ports
+            of XPDR";
         }
         leaf supporting-ethernet{
           type string;
           description
             "Ethernet interface provisioned on the port";
-         }
-         leaf supporting-odu4{
-           type string;
-           description
-             "ODU4 interface provisioned on the port";
-         }
-         leaf rate{
-            type string;
-            description
-              "Rate supported by the port";
         }
-        leaf associated-lcp {
+        leaf supporting-odu4{
+          type string;
+          description
+            "ODU4 interface provisioned on the port";
+        }
+        leaf rate{
           type string;
           description
-             "For XPDR, associate two logical-connection-points from device/connnection-map
-             data";
+            "Rate supported by the port";
+        }
+        leaf-list supported-interface-capability {
+          type identityref {
+            base org-openroadm-port-types:supported-if-capability;
+          }
+        }
+        leaf xponder-type {
+          type org-openroadm-common-types:xpdr-node-types;
+        }
+        leaf connection-map-lcp {
+          type string;
+          description
+            "For XPDR, associate two logical-connection-points from device/connnection-map
+            data";
         }
         leaf partner-lcp {
           type string;
           description
-             "For XPDR unidirectional NETWORK port, associate two logical-connection-points
-             from device/partner port data";
+            "For XPDR unidirectional NETWORK port, associate two logical-connection-points
+            from device/partner port data";
         }
       }
       list cp-to-degree {
         description
-             "This mapping helps locate degree number of the circuitpack that
-             does lldp protocol management";
+          "This mapping helps locate degree number of the circuitpack that
+          does lldp protocol management";
         key circuit-pack-name;
         leaf circuit-pack-name {
           type string;
@@ -161,6 +177,43 @@ module transportpce-portmapping {
           type string;
         }
       }
+
+      list switching-pool-lcp {
+        description
+          "For MUXPDR and SWITCH, associates from device/odu-switching-pools data, the logical-connection-points";
+        key "switching-pool-number";
+        leaf switching-pool-number {
+          type uint16;
+          description
+            "Unique identifier for this odu-switching-pool";
+        }
+        leaf switching-pool-type {
+          type org-openroadm-switching-pool-types:switching-pool-types;
+        }
+        list non-blocking-list {
+          key "nbl-number";
+          leaf nbl-number {
+            type uint16;
+            description
+              "Identifier for this non-blocking-list. Unique within odu-switching-pool";
+          }
+          leaf interconnect-bandwidth-unit {
+            type uint32;
+            description
+              "Switch fabric interconnect bandwidth unit rate in bits per second.
+               Represents granularity of switch fabric";
+          }
+          leaf interconnect-bandwidth {
+            type uint32;
+            description
+              "Total interconnect bandwidth for a non-blocking element expressed as
+               number of inter-connect-bandwidth units";
+          }
+          leaf-list lcp-list {
+            type string;
+          }
+        }
+      }
     }
   }
 }

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
index 60c8e82631604f68d5adbdfefde89b93caa3479a..1642b60bad0c53da316d498360f1ce98da48eb99 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
@@ -13,10 +13,10 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.StringConstants;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java
index e6da7201eca71f7bfa6641709c69ec41d2669602..9ae8e9c8b6d759f047e6cedea66fc87e1e8bc3ca 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.transportpce.common.mapping;
 
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
 
 public interface PortMapping {
 

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
index abed310d84a52d16dc3befe9e042f11587258f9b..c8600f821c8544a0af9a582d0daaf63431f18d5c 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
@@ -19,13 +19,13 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -112,11 +112,11 @@ public class PortMappingImpl implements PortMapping {
             return portMappingVersion121.updateMapping(nodeId,oldMapping);
         }
         else if (openROADMversion.getIntValue() == 2) {
-            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes
+            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes
                 .MappingBuilder oldMapping2Bldr = new MappingBuilder().setLogicalConnectionPoint(oldMapping
                 .getLogicalConnectionPoint()).setPortDirection(oldMapping.getPortDirection());
-            if (oldMapping.getAssociatedLcp() != null) {
-                oldMapping2Bldr.setAssociatedLcp(oldMapping.getAssociatedLcp());
+            if (oldMapping.getConnectionMapLcp() != null) {
+                oldMapping2Bldr.setConnectionMapLcp(oldMapping.getConnectionMapLcp());
             }
             if (oldMapping.getPartnerLcp() != null) {
                 oldMapping2Bldr.setPartnerLcp(oldMapping.getPartnerLcp());

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java
index 2b62b540e11a82b581adf83012648b17d358a063..d07a972e417bfcea4221d398ef20c87ddeda65be 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java
@@ -29,20 +29,20 @@ import org.opendaylight.transportpce.common.Timeouts;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.NetworkBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegree;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.NetworkBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegree;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfoBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.Direction;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.CircuitPack;
@@ -652,7 +652,7 @@ public class PortMappingVersion121 {
         if (mapping != null && assoLcp != null) {
             // update existing mapping
             mpBldr = new MappingBuilder(mapping);
-            mpBldr.setAssociatedLcp(assoLcp);
+            mpBldr.setConnectionMapLcp(assoLcp);
         } else {
             // create a new mapping
             mpBldr = new MappingBuilder();

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java
index aaa54c2fc7ce3d3015052adc94796bcd424195ab..5df5edc937b58f2863a43ed197de2675e73c3c6a 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java
@@ -28,20 +28,20 @@ import org.opendaylight.transportpce.common.Timeouts;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.NetworkBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegree;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.NetworkBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegree;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfoBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.Direction;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PortQual;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CircuitPack;
@@ -766,7 +766,7 @@ public class PortMappingVersion221 {
         if (mapping != null && assoLcp != null) {
             // update existing mapping
             mpBldr = new MappingBuilder(mapping);
-            mpBldr.setAssociatedLcp(assoLcp);
+            mpBldr.setConnectionMapLcp(assoLcp);
         } else {
             // create a new mapping
             mpBldr = new MappingBuilder();

diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java
index d946513c3f9cff07ffc1907238e7b62d896cbb02..945ea2fa8316650bf8abac84956e67a4c6dbb28d 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
@@ -149,7 +149,7 @@ public final class TPCEUtils {
             org.opendaylight.yang.gen.v1.gnpy.gnpy.eqpt.config.rev181119.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.gnpy.path.rev190502.$YangModuleInfoImpl.getInstance(),
-            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.$YangModuleInfoImpl.getInstance(),
+            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.$YangModuleInfoImpl.getInstance(),
 
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev171017.$YangModuleInfoImpl.getInstance(),

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java
index d9af53e53bd92a63a2bfafc0e02ce85507bf2858..0cf4e4dce5af55d22c32d8ef5a8a5d50a2a1fc09 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java
@@ -26,11 +26,11 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegree;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegree;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev170929.Direction;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.Protocols;

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
index 99db959fb97011477bf6069967ca44eacf6ab2eb..0b075e74018c958d13af1e6f98ccb1a3bd4ce6cb 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
@@ -24,8 +24,8 @@ import org.opendaylight.transportpce.networkmodel.util.ClliNetwork;
 import org.opendaylight.transportpce.networkmodel.util.OpenRoadmFactory;
 import org.opendaylight.transportpce.networkmodel.util.OpenRoadmNetwork;
 import org.opendaylight.transportpce.networkmodel.util.OpenRoadmOtnTopology22;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/ClliNetwork.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/ClliNetwork.java
index 037bbded9cbcc36c94854c6bbfef11c8800546a6..248fb4581959f7c4ea2816fed1cbf5df3749465d 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/ClliNetwork.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/ClliNetwork.java
@@ -15,7 +15,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.NetworkTypes1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.NetworkTypes1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.Node1;

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java
index addef27749586e2418cd95bf70fa3967a439dca8..da4cb0c26f6a2136a0009824184754e6aa885ee6 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java
@@ -10,7 +10,7 @@ package org.opendaylight.transportpce.networkmodel.util;
 import org.opendaylight.transportpce.common.mapping.MappingUtils;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java
index 917926e5129d12f03c73baeba1b44361c120c315..5ce3167c37e864873b5f28723bc3f4d15c8feec9 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java
@@ -17,7 +17,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.network.types.OpenroadmCommonNetworkBuilder;

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology22.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology22.java
index 8926a997b2cca235c8f06b9c84f877339abc09b3..95017daff753150b597878a97820b80c7b45b073 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology22.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology22.java
@@ -24,8 +24,8 @@ import org.opendaylight.transportpce.common.Timeouts;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.network.types.OpenroadmCommonNetworkBuilder;
@@ -227,7 +227,7 @@ public class OpenRoadmOtnTopology22 {
                     LOG.warn("no rate in portmapping for lcp {} of {}", ma.getLogicalConnectionPoint(),
                         mappingNode.getNodeId());
                 }
-                xpdrTpBuilder.setTailEquipmentId(ma.getAssociatedLcp());
+                xpdrTpBuilder.setTailEquipmentId(ma.getConnectionMapLcp());
                 ontTp1Bldr.setXpdrTpPortConnectionAttributes(xpdrTpBuilder.build());
                 ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build());
                 tpList.add(ietfTpBldr.build());
@@ -248,7 +248,7 @@ public class OpenRoadmOtnTopology22 {
                     LOG.warn("no rate in portmapping for lcp {} of {}", ma.getLogicalConnectionPoint(),
                         mappingNode.getNodeId());
                 }
-                xpdrTpBuilder.setTailEquipmentId(ma.getAssociatedLcp());
+                xpdrTpBuilder.setTailEquipmentId(ma.getConnectionMapLcp());
                 ontTp1Bldr.setXpdrTpPortConnectionAttributes(xpdrTpBuilder.build());
                 ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build());
                 tpList.add(ietfTpBldr.build());

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java
index 7fb4a91cd7bafcb3b77510d3721f599b7587691d..bd3c8665a74d90fd9194844ce71f48d30de10d2b 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java
@@ -23,8 +23,8 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1;
@@ -215,12 +215,12 @@ public class OpenRoadmTopology22 {
                 .network.rev181130.TerminationPoint1Builder();
             if (m.getPortQual().equals("xpdr-network")) {
                 XpdrNetworkAttributesBuilder xpdrNwAttrBldr = new XpdrNetworkAttributesBuilder()
-                        .setTailEquipmentId(m.getAssociatedLcp());
+                        .setTailEquipmentId(m.getConnectionMapLcp());
                 ontTp1Bldr.setXpdrNetworkAttributes(xpdrNwAttrBldr.build());
                 ocnTp1Bldr.setTpType(OpenroadmTpType.XPONDERNETWORK);
                 org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder tpceTp1Bldr =
                     new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder()
-                        .setAssociatedConnectionMapPort(m.getAssociatedLcp());
+                        .setAssociatedConnectionMapPort(m.getConnectionMapLcp());
                 ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build())
                     .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
                         .TerminationPoint1.class, ocnTp1Bldr.build())
@@ -229,12 +229,12 @@ public class OpenRoadmTopology22 {
                 tpList.add(ietfTpBldr.build());
             } else if (m.getPortQual().equals("xpdr-client")) {
                 XpdrClientAttributesBuilder xpdrNwAttrBldr = new XpdrClientAttributesBuilder()
-                        .setTailEquipmentId(m.getAssociatedLcp());
+                        .setTailEquipmentId(m.getConnectionMapLcp());
                 ontTp1Bldr.setXpdrClientAttributes(xpdrNwAttrBldr.build());
                 ocnTp1Bldr.setTpType(OpenroadmTpType.XPONDERCLIENT);
                 org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder tpceTp1Bldr =
                     new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder()
-                        .setAssociatedConnectionMapPort(m.getAssociatedLcp());
+                        .setAssociatedConnectionMapPort(m.getConnectionMapLcp());
                 ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build())
                     .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130
                         .TerminationPoint1.class, ocnTp1Bldr.build())

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
index 549b8c5d70188eddb8ee23e3cacf5264ddec80fb..179f641934d86577b763c1640fc957b2a6b69a73 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
@@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public  final class TopologyUtils {
+public final class TopologyUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(TopologyUtils.class);
 
@@ -43,28 +43,26 @@ public  final class TopologyUtils {
     public static LinkBuilder createLink(String srcNode, String dstNode, String srcTp, String destTp) {
 
         // Create Destination for link
-        DestinationBuilder dstNodeBldr = new DestinationBuilder();
-        dstNodeBldr.setDestTp(destTp);
-        dstNodeBldr.setDestNode(new NodeId(dstNode));
+        DestinationBuilder dstNodeBldr = new DestinationBuilder()
+            .setDestTp(destTp)
+            .setDestNode(new NodeId(dstNode));
 
         // Create Source for the link
-        SourceBuilder srcNodeBldr = new SourceBuilder();
-        srcNodeBldr.setSourceNode(new NodeId(srcNode));
-        srcNodeBldr.setSourceTp(srcTp);
+        SourceBuilder srcNodeBldr = new SourceBuilder()
+            .setSourceNode(new NodeId(srcNode))
+            .setSourceTp(srcTp);
 
         // set link builder attribute
-        LinkBuilder lnkBldr = new LinkBuilder();
-
-        lnkBldr.setDestination(dstNodeBldr.build());
-        lnkBldr.setSource(srcNodeBldr.build());
-        lnkBldr.setLinkId(LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp));
+        LinkBuilder lnkBldr = new LinkBuilder()
+            .setDestination(dstNodeBldr.build())
+            .setSource(srcNodeBldr.build())
+            .setLinkId(LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp));
         lnkBldr.withKey(new LinkKey(lnkBldr.getLinkId()));
 
         //set opposite link
-        Link1Builder lnk1Bldr = new Link1Builder();
         LinkId oppositeLinkId = LinkIdUtil.getOppositeLinkId(srcNode, srcTp, dstNode, destTp);
-        lnk1Bldr.setOppositeLink(oppositeLinkId);
-        lnkBldr.addAugmentation(Link1.class,lnk1Bldr.build());
+        Link1 lnk1 = new Link1Builder().setOppositeLink(oppositeLinkId).build();
+        lnkBldr.addAugmentation(Link1.class,lnk1);
         return lnkBldr;
     }
 

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java
index 7c497d2093451e9f731ecd5043cd2f9d77476e4d..03c9249a99a71e1db19118677b488abb720cb7a1 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java
@@ -21,10 +21,10 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa
 import org.opendaylight.transportpce.olm.util.OlmUtils;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface;

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
index b91fe7ccc4b96d46eb7d26b4935b241db6fb81d4..6a6b9af05df5d2e45296496316e450264b2b9603 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
@@ -61,8 +61,8 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev17
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.calculate.spanloss.base.output.Spans;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.calculate.spanloss.base.output.SpansBuilder;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface;

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
index f207d9fe048cb96193c5fc26bd0def3ed4612435..f5db3f776fb9ecae85520f78c9a9c0edd7e7c5d8 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
@@ -18,10 +18,10 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java
index 7656d2a30e41559bd8a3813ade3a54be4785df43..fb432772de3d2966b55e4cd8718da37816d7da93 100644 (file)
--- a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java
+++ b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java
@@ -45,15 +45,15 @@ import org.opendaylight.transportpce.olm.util.OlmPowerServiceRpcImplUtil;
 import org.opendaylight.transportpce.olm.util.OlmUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfoBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;

diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
index b5dd347c3c0f094ad03c05a786daf2705703506c..c0388193faaf522a373105df53d3eb26eae410d4 100644 (file)
--- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
+++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
@@ -19,8 +19,8 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.FiberPmd;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State;

diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
index d96d880a3ab0c5986f60ffcf46222a4226082678..0de5c5cbcba7eae2c58e591cfdc85a5c74d63731 100644 (file)
--- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
+++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
@@ -19,17 +19,17 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegree;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.CpToDegreeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegree;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.CpToDegreeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.NodeInfoBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.FiberPmd;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State;

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
index 113135541659e803c9345e7c1fe5a3c00a66dc9a..4c5688439f04545dbdf1c5a7ddbd1b9f48d0a923 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
@@ -94,7 +94,6 @@ public class PceCalculation {
             returnStructure.setRC(ResponseCodes.RESPONSE_FAILED);
             return;
         }
-
         MapUtils.mapDiversityConstraints(allNodes, allLinks, pceHardConstraints);
 
         if (!analyzeNw()) {

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java
index 0ce6603babd2a9d91be2e728b2aba0ecadc5ffbf..524ddc2c0be5b15ba513a9019d0323cae301bf10 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java
@@ -20,7 +20,7 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.mapping.PortMapping;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.PowerDBm;
 
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder;

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java
index 049673c89c65c5e2327aa62b50e919e79429f4b4..772f1a53b62bcd62645984c68b6acac45e81494b 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java
@@ -21,7 +21,7 @@ import org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface;
 import org.opendaylight.transportpce.common.mapping.PortMapping;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyGHz;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyTHz;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PowerDBm;

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java
index d16850434caf72b2651511884b9005a77768aac3..bb1134319613a4f2d08c293b59b2b270a03a6842 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java
@@ -14,7 +14,7 @@ import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.mapping.MappingUtils;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.OchAttributes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.RateIdentity;
 

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java
index eef609904f17947537f918466620f0e63066f70d..31aab0f5d0e13de0c8e6d630f9fdf3cc7d7210d8 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java
@@ -41,7 +41,7 @@ import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.Servic
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.ServiceNodelist;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistBuilder;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutputBuilder;

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java
index 2c013421da2969a48ee5349a0425e7542cd5bd3d..3aa4686d0f4dd97ea14f41f80ce51b8a8728dd13 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java
@@ -19,7 +19,7 @@ import org.opendaylight.transportpce.common.mapping.PortMapping;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
 import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder;
 
 public class OpenRoadMInterface221Test extends AbstractTest {
 

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java
index dd1a96a2b3b9b75ea667ecc30f220ab1a19440ae..98c4f14b56258424fea40d49a333065ec1009a7d 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java
@@ -17,12 +17,12 @@ import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.renderer.stub.MountPointStub;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.GetConnectionPortTrailOutput;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.GetConnectionPortTrailOutputBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceService;

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java
index 6bd0c28b5a7c235770c463f6947149ee88417f94..9f4b06c8d23cfbcdc0e3e2ae402531869c6c9fdb 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
@@ -27,10 +27,10 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.InstanceIdentifiers;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingKey;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType;
@@ -286,7 +286,7 @@ public class TapiTopologyImpl implements TapiTopologyService {
             .getAssociatedConnectionMapPort();
         @NonNull
         KeyedInstanceIdentifier<Mapping, MappingKey> pmIID = InstanceIdentifier.create(
-            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network.class)
+            org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network.class)
             .child(Nodes.class, new NodesKey(nodeIdPortMap)).child(Mapping.class, new MappingKey(networkLcp));
         @NonNull
         FluentFuture<Optional<Mapping>> mappingOpt = dataBroker.newReadOnlyTransaction().read(

diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
index 936ff6f667ecd8dfeeee5156637e2374efb6e7c6..352a65a85f86691843a47f9a0af11c0ddaf4db83 100644 (file)
--- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
+++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
@@ -19,7 +19,7 @@ import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.DataStoreContext;
 import org.opendaylight.transportpce.common.converter.XMLDataObjectConverter;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.Network;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInput;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInputBuilder;

diff --git a/tapi/src/test/resources/openroadm-topology2.xml b/tapi/src/test/resources/openroadm-topology2.xml
index 88459e9621968b578e1a3463803ef802e4ddbd66..6227643cd8b415164042ea12a15620e00c2f9e15 100644 (file)
--- a/tapi/src/test/resources/openroadm-topology2.xml
+++ b/tapi/src/test/resources/openroadm-topology2.xml
@@ -1,7 +1,10 @@
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
- <networks xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
-  <network>
+<networks xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
+<network>
   <network-id>openroadm-topology</network-id>
+  <network-types>
+    <openroadm-common-network xmlns="http://org/openroadm/common/network"/>
+  </network-types>
   <node>
     <node-id>ROADM-A1-SRG3</node-id>
     <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -294,31 +297,35 @@
         <index>15</index>
       </available-wavelengths>
     </srg-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-CP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP2-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP4-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP1-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG3-PP3-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-C1-DEG2</node-id>
@@ -613,19 +620,23 @@
         <index>15</index>
       </available-wavelengths>
     </degree-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-CTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-TTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-C1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeC</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-C1-SRG1</node-id>
@@ -919,31 +930,35 @@
         <index>15</index>
       </available-wavelengths>
     </srg-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP4-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-CP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP2-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP1-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP3-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-C1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeC</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-A1-SRG1</node-id>
@@ -1237,71 +1252,70 @@
         <index>15</index>
       </available-wavelengths>
     </srg-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP4-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-CP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-CP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP2-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP1-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>SRG1-PP3-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>XPDR-A1-XPDR1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
     <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>
-      <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
-      </xpdr-client-attributes>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+      <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>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-CLIENT2</tail-equipment-id>
-      </xpdr-network-attributes>
+      <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-CLIENT1</tp-id>
       <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
-      <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-      </xpdr-client-attributes>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+      <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-NETWORK1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
       <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-CLIENT1</tail-equipment-id>
+        <tail-equipment-id>ROADM-A1-SRG1--SRG1-PP1-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>XPDR-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-A1-DEG2</node-id>
@@ -1596,19 +1610,23 @@
         <index>15</index>
       </available-wavelengths>
     </degree-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-CTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG2-TTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-A1-DEG1</node-id>
@@ -1903,59 +1921,58 @@
         <index>15</index>
       </available-wavelengths>
     </degree-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-TTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-CTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-A1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeA</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>XPDR-C1-XPDR1</node-id>
-    <node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
     <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>
-      <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-NETWORK2</tail-equipment-id>
-      </xpdr-client-attributes>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+      <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>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
-      <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-CLIENT2</tail-equipment-id>
-      </xpdr-network-attributes>
+      <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-CLIENT1</tp-id>
       <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
-      <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-NETWORK1</tail-equipment-id>
-      </xpdr-client-attributes>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-CLIENT</tp-type>
+      <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-NETWORK1</tp-id>
-      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
-      <tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
       <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>XPDR1-CLIENT1</tail-equipment-id>
+        <tail-equipment-id>ROADM-C1-SRG1--SRG1-PP1-TXRX</tail-equipment-id>
       </xpdr-network-attributes>
+      <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+      <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>XPDR-C1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeC</node-ref>
+    </supporting-node>
   </node>
   <node>
     <node-id>ROADM-C1-DEG1</node-id>
@@ -2250,34 +2267,35 @@
         <index>15</index>
       </available-wavelengths>
     </degree-attributes>
-    <node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-TTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
       <tp-id>DEG1-CTP-TXRX</tp-id>
-      <tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
+      <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
     </termination-point>
+    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <supporting-node>
       <network-ref>openroadm-network</network-ref>
       <node-ref>ROADM-C1</node-ref>
     </supporting-node>
+    <supporting-node>
+      <network-ref>clli-network</network-ref>
+      <node-ref>NodeC</node-ref>
+    </supporting-node>
   </node>
-  <network-types>
-    <openroadm-common-network xmlns="http://org/openroadm/common/network"/>
-  </network-types>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</link-id>
     <source>
       <source-node>ROADM-A1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG3</dest-node>
       <dest-tp>SRG3-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2286,11 +2304,11 @@
       <source-node>ROADM-A1-SRG3</source-node>
       <source-tp>SRG3-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2302,11 +2320,11 @@
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
       <opposite-link>ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX</opposite-link>
     </OMS-attributes>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG2</dest-node>
       <dest-tp>DEG2-TTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2315,11 +2333,11 @@
       <source-node>ROADM-C1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-SRG1</dest-node>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2331,11 +2349,11 @@
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
       <opposite-link>ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX</opposite-link>
     </OMS-attributes>
-    <link-type xmlns="http://org/openroadm/network/topology">ROADM-TO-ROADM</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG1</dest-node>
       <dest-tp>DEG1-TTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2344,11 +2362,11 @@
       <source-node>ROADM-C1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2357,12 +2375,11 @@
       <source-node>XPDR-A1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
-    <opposite-link xmlns="http://org/openroadm/network/topology">ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1</opposite-link>
-    <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG1</dest-node>
       <dest-tp>SRG1-PP1-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2371,12 +2388,11 @@
       <source-node>XPDR-C1-XPDR1</source-node>
       <source-tp>XPDR1-NETWORK1</source-tp>
     </source>
-    <opposite-link xmlns="http://org/openroadm/network/topology">ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1</opposite-link>
-    <link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
     <destination>
       <dest-node>ROADM-C1-SRG1</dest-node>
       <dest-tp>SRG1-PP1-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2385,12 +2401,11 @@
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-PP1-TXRX</source-tp>
     </source>
-    <opposite-link xmlns="http://org/openroadm/network/topology">XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX</opposite-link>
-    <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
     <destination>
       <dest-node>XPDR-C1-XPDR1</dest-node>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2399,11 +2414,11 @@
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG1</dest-node>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2412,11 +2427,11 @@
       <source-node>ROADM-C1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2425,11 +2440,11 @@
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG3</dest-node>
       <dest-tp>SRG3-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2438,11 +2453,11 @@
       <source-node>ROADM-A1-DEG2</source-node>
       <source-tp>DEG2-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2451,11 +2466,11 @@
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2464,11 +2479,11 @@
       <source-node>ROADM-C1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-SRG1</dest-node>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2477,11 +2492,11 @@
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2490,11 +2505,11 @@
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2503,12 +2518,11 @@
       <source-node>ROADM-A1-SRG1</source-node>
       <source-tp>SRG1-PP1-TXRX</source-tp>
     </source>
-    <opposite-link xmlns="http://org/openroadm/network/topology">XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX</opposite-link>
-    <link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
     <destination>
       <dest-node>XPDR-A1-XPDR1</dest-node>
       <dest-tp>XPDR1-NETWORK1</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2517,11 +2531,11 @@
       <source-node>ROADM-A1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG2</dest-node>
       <dest-tp>DEG2-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2530,11 +2544,11 @@
       <source-node>ROADM-A1-SRG3</source-node>
       <source-tp>SRG3-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2543,11 +2557,11 @@
       <source-node>ROADM-A1-DEG1</source-node>
       <source-tp>DEG1-CTP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
     <destination>
       <dest-node>ROADM-A1-SRG1</dest-node>
       <dest-tp>SRG1-CP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX</opposite-link>
   </link>
   <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
@@ -2556,11 +2570,11 @@
       <source-node>ROADM-C1-SRG1</source-node>
       <source-tp>SRG1-CP-TXRX</source-tp>
     </source>
-    <link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
     <destination>
       <dest-node>ROADM-C1-DEG1</dest-node>
       <dest-tp>DEG1-CTP-TXRX</dest-tp>
     </destination>
+    <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
     <opposite-link xmlns="http://org/openroadm/common/network">ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX</opposite-link>
   </link>
 </network>

diff --git a/tapi/src/test/resources/portmapping-example.xml b/tapi/src/test/resources/portmapping-example.xml
index 37dbc0cec2d8c00d47f0158ca6985f84eb02f662..f4f6011764f8674d9e6aae1d35ca20dc6e0aa3da 100644 (file)
--- a/tapi/src/test/resources/portmapping-example.xml
+++ b/tapi/src/test/resources/portmapping-example.xml
@@ -1,57 +1,61 @@
 <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <network xmlns="http://org/opendaylight/transportpce/portmapping">
   <nodes>
-    <node-id>XPDR-C1</node-id>
+    <node-id>XPDR-A1</node-id>
     <node-info>
-      <node-type>xpdr</node-type>
-      <node-ip-address>1.2.3.4</node-ip-address>
-      <node-clli>NodeC</node-clli>
       <openroadm-version>2.2.1</openroadm-version>
-      <node-vendor>vendorA</node-vendor>
       <node-model>model2</node-model>
+      <node-clli>NodeA</node-clli>
+      <node-type>xpdr</node-type>
+      <node-vendor>vendorA</node-vendor>
+      <node-ip-address>1.2.3.4</node-ip-address>
     </node-info>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK1</logical-connection-point>
-      <supporting-circuit-pack-name>1/0/1-PLUG-NET</supporting-circuit-pack-name>
+      <logical-connection-point>XPDR1-NETWORK2</logical-connection-point>
       <port-qual>xpdr-network</port-qual>
-      <associated-lcp>XPDR1-CLIENT1</associated-lcp>
-      <port-direction>bidirectional</port-direction>
+      <connection-map-lcp>XPDR1-CLIENT2</connection-map-lcp>
+      <supporting-circuit-pack-name>1/0/2-PLUG-NET</supporting-circuit-pack-name>
       <supporting-port>1</supporting-port>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK2</logical-connection-point>
-      <supporting-circuit-pack-name>1/0/2-PLUG-NET</supporting-circuit-pack-name>
+      <logical-connection-point>XPDR1-NETWORK1</logical-connection-point>
       <port-qual>xpdr-network</port-qual>
-      <associated-lcp>XPDR1-CLIENT2</associated-lcp>
-      <port-direction>bidirectional</port-direction>
+      <connection-map-lcp>XPDR1-CLIENT1</connection-map-lcp>
+      <supporting-circuit-pack-name>1/0/1-PLUG-NET</supporting-circuit-pack-name>
       <supporting-port>1</supporting-port>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
       <logical-connection-point>XPDR1-CLIENT1</logical-connection-point>
-      <supporting-circuit-pack-name>1/0/1-PLUG-CLIENT</supporting-circuit-pack-name>
       <port-qual>xpdr-client</port-qual>
-      <associated-lcp>XPDR1-NETWORK1</associated-lcp>
-      <port-direction>bidirectional</port-direction>
+      <connection-map-lcp>XPDR1-NETWORK1</connection-map-lcp>
+      <supporting-circuit-pack-name>1/0/1-PLUG-CLIENT</supporting-circuit-pack-name>
       <supporting-port>C1</supporting-port>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
       <logical-connection-point>XPDR1-CLIENT2</logical-connection-point>
-      <supporting-circuit-pack-name>1/0/2-PLUG-CLIENT</supporting-circuit-pack-name>
       <port-qual>xpdr-client</port-qual>
-      <associated-lcp>XPDR1-NETWORK2</associated-lcp>
-      <port-direction>bidirectional</port-direction>
+      <connection-map-lcp>XPDR1-NETWORK2</connection-map-lcp>
+      <supporting-circuit-pack-name>1/0/2-PLUG-CLIENT</supporting-circuit-pack-name>
       <supporting-port>C1</supporting-port>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <port-direction>bidirectional</port-direction>
     </mapping>
   </nodes>
   <nodes>
-    <node-id>ROADM-C1</node-id>
+    <node-id>ROADM-A1</node-id>
     <node-info>
-      <node-type>rdm</node-type>
-      <node-ip-address>127.0.0.11</node-ip-address>
-      <node-clli>NodeC</node-clli>
       <openroadm-version>2.2.1</openroadm-version>
-      <node-vendor>vendorA</node-vendor>
       <node-model>model2</node-model>
+      <node-clli>NodeA</node-clli>
+      <node-type>rdm</node-type>
+      <node-vendor>vendorA</node-vendor>
+      <node-ip-address>127.0.0.11</node-ip-address>
     </node-info>
     <cp-to-degree>
       <circuit-pack-name>2/0</circuit-pack-name>
@@ -74,96 +78,124 @@
       <interface-name>1GE-interface-2</interface-name>
     </cp-to-degree>
     <mapping>
-      <logical-connection-point>SRG1-PP1-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <port-direction>bidirectional</port-direction>
+      <logical-connection-point>SRG3-PP1-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
       <supporting-port>C1</supporting-port>
-    </mapping>
-    <mapping>
-      <logical-connection-point>DEG1-TTP-TXRX</logical-connection-point>
-      <supporting-oms>OMS-DEG1-TTP-TXRX</supporting-oms>
-      <supporting-circuit-pack-name>1/0</supporting-circuit-pack-name>
-      <supporting-ots>OTS-DEG1-TTP-TXRX</supporting-ots>
       <port-direction>bidirectional</port-direction>
-      <supporting-port>L1</supporting-port>
     </mapping>
     <mapping>
       <logical-connection-point>SRG1-PP2-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <port-direction>bidirectional</port-direction>
       <supporting-port>C2</supporting-port>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG1-PP3-TXRX</logical-connection-point>
+      <logical-connection-point>SRG3-PP4-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
+      <supporting-port>C4</supporting-port>
+      <port-direction>bidirectional</port-direction>
+    </mapping>
+    <mapping>
+      <logical-connection-point>SRG1-PP4-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
+      <supporting-port>C4</supporting-port>
       <port-direction>bidirectional</port-direction>
+    </mapping>
+    <mapping>
+      <logical-connection-point>SRG3-PP3-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
       <supporting-port>C3</supporting-port>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
       <logical-connection-point>DEG2-TTP-TXRX</logical-connection-point>
+      <supporting-ots>OTS-DEG2-TTP-TXRX</supporting-ots>
       <supporting-circuit-pack-name>2/0</supporting-circuit-pack-name>
+      <supporting-oms>OMS-DEG2-TTP-TXRX</supporting-oms>
+      <supporting-port>L1</supporting-port>
+      <port-direction>bidirectional</port-direction>
+    </mapping>
+    <mapping>
+      <logical-connection-point>SRG1-PP3-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
+      <supporting-port>C3</supporting-port>
       <port-direction>bidirectional</port-direction>
+    </mapping>
+    <mapping>
+      <logical-connection-point>SRG3-PP2-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
+      <supporting-port>C2</supporting-port>
+      <port-direction>bidirectional</port-direction>
+    </mapping>
+    <mapping>
+      <logical-connection-point>DEG1-TTP-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>1/0</supporting-circuit-pack-name>
       <supporting-port>L1</supporting-port>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG1-PP4-TXRX</logical-connection-point>
+      <logical-connection-point>SRG1-PP1-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
+      <supporting-port>C1</supporting-port>
       <port-direction>bidirectional</port-direction>
-      <supporting-port>C4</supporting-port>
     </mapping>
   </nodes>
   <nodes>
-    <node-id>XPDR-A1</node-id>
+    <node-id>XPDR-C1</node-id>
     <node-info>
-      <node-type>xpdr</node-type>
-      <node-ip-address>1.2.3.4</node-ip-address>
-      <node-clli>NodeA</node-clli>
       <openroadm-version>2.2.1</openroadm-version>
-      <node-vendor>vendorA</node-vendor>
       <node-model>model2</node-model>
+      <node-clli>NodeC</node-clli>
+      <node-type>xpdr</node-type>
+      <node-vendor>vendorA</node-vendor>
+      <node-ip-address>1.2.3.4</node-ip-address>
     </node-info>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK1</logical-connection-point>
-      <supporting-circuit-pack-name>1/0/1-PLUG-NET</supporting-circuit-pack-name>
+      <logical-connection-point>XPDR1-NETWORK2</logical-connection-point>
       <port-qual>xpdr-network</port-qual>
-      <associated-lcp>XPDR1-CLIENT1</associated-lcp>
-      <port-direction>bidirectional</port-direction>
+      <connection-map-lcp>XPDR1-CLIENT2</connection-map-lcp>
+      <supporting-circuit-pack-name>1/0/2-PLUG-NET</supporting-circuit-pack-name>
       <supporting-port>1</supporting-port>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
-      <logical-connection-point>XPDR1-NETWORK2</logical-connection-point>
-      <supporting-circuit-pack-name>1/0/2-PLUG-NET</supporting-circuit-pack-name>
+      <logical-connection-point>XPDR1-NETWORK1</logical-connection-point>
       <port-qual>xpdr-network</port-qual>
-      <associated-lcp>XPDR1-CLIENT2</associated-lcp>
-      <port-direction>bidirectional</port-direction>
+      <connection-map-lcp>XPDR1-CLIENT1</connection-map-lcp>
+      <supporting-circuit-pack-name>1/0/1-PLUG-NET</supporting-circuit-pack-name>
       <supporting-port>1</supporting-port>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-OCH</supported-interface-capability>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
       <logical-connection-point>XPDR1-CLIENT1</logical-connection-point>
-      <supporting-circuit-pack-name>1/0/1-PLUG-CLIENT</supporting-circuit-pack-name>
       <port-qual>xpdr-client</port-qual>
-      <associated-lcp>XPDR1-NETWORK1</associated-lcp>
-      <port-direction>bidirectional</port-direction>
+      <connection-map-lcp>XPDR1-NETWORK1</connection-map-lcp>
+      <supporting-circuit-pack-name>1/0/1-PLUG-CLIENT</supporting-circuit-pack-name>
       <supporting-port>C1</supporting-port>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
       <logical-connection-point>XPDR1-CLIENT2</logical-connection-point>
-      <supporting-circuit-pack-name>1/0/2-PLUG-CLIENT</supporting-circuit-pack-name>
       <port-qual>xpdr-client</port-qual>
-      <associated-lcp>XPDR1-NETWORK2</associated-lcp>
-      <port-direction>bidirectional</port-direction>
+      <connection-map-lcp>XPDR1-NETWORK2</connection-map-lcp>
+      <supporting-circuit-pack-name>1/0/2-PLUG-CLIENT</supporting-circuit-pack-name>
       <supporting-port>C1</supporting-port>
+      <supported-interface-capability xmlns:x="http://org/openroadm/port/types">x:if-100GE</supported-interface-capability>
+      <port-direction>bidirectional</port-direction>
     </mapping>
   </nodes>
   <nodes>
-    <node-id>ROADM-A1</node-id>
+    <node-id>ROADM-C1</node-id>
     <node-info>
-      <node-type>rdm</node-type>
-      <node-ip-address>127.0.0.11</node-ip-address>
-      <node-clli>NodeA</node-clli>
       <openroadm-version>2.2.1</openroadm-version>
-      <node-vendor>vendorA</node-vendor>
       <node-model>model2</node-model>
+      <node-clli>NodeC</node-clli>
+      <node-type>rdm</node-type>
+      <node-vendor>vendorA</node-vendor>
+      <node-ip-address>127.0.0.11</node-ip-address>
     </node-info>
     <cp-to-degree>
       <circuit-pack-name>2/0</circuit-pack-name>
@@ -186,66 +218,42 @@
       <interface-name>1GE-interface-2</interface-name>
     </cp-to-degree>
     <mapping>
-      <logical-connection-point>SRG1-PP1-TXRX</logical-connection-point>
+      <logical-connection-point>SRG1-PP2-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <port-direction>bidirectional</port-direction>
-      <supporting-port>C1</supporting-port>
-    </mapping>
-    <mapping>
-      <logical-connection-point>SRG3-PP3-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
-      <port-direction>bidirectional</port-direction>
-      <supporting-port>C3</supporting-port>
-    </mapping>
-    <mapping>
-      <logical-connection-point>DEG1-TTP-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>1/0</supporting-circuit-pack-name>
-      <port-direction>bidirectional</port-direction>
-      <supporting-port>L1</supporting-port>
-    </mapping>
-    <mapping>
-      <logical-connection-point>SRG3-PP2-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
-      <port-direction>bidirectional</port-direction>
       <supporting-port>C2</supporting-port>
-    </mapping>
-    <mapping>
-      <logical-connection-point>SRG3-PP1-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
       <port-direction>bidirectional</port-direction>
-      <supporting-port>C1</supporting-port>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG1-PP2-TXRX</logical-connection-point>
+      <logical-connection-point>SRG1-PP4-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
+      <supporting-port>C4</supporting-port>
       <port-direction>bidirectional</port-direction>
-      <supporting-port>C2</supporting-port>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG3-PP4-TXRX</logical-connection-point>
-      <supporting-circuit-pack-name>5/0</supporting-circuit-pack-name>
+      <logical-connection-point>DEG2-TTP-TXRX</logical-connection-point>
+      <supporting-circuit-pack-name>2/0</supporting-circuit-pack-name>
+      <supporting-port>L1</supporting-port>
       <port-direction>bidirectional</port-direction>
-      <supporting-port>C4</supporting-port>
     </mapping>
     <mapping>
       <logical-connection-point>SRG1-PP3-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
-      <port-direction>bidirectional</port-direction>
       <supporting-port>C3</supporting-port>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
-      <logical-connection-point>DEG2-TTP-TXRX</logical-connection-point>
-      <supporting-oms>OMS-DEG2-TTP-TXRX</supporting-oms>
-      <supporting-circuit-pack-name>2/0</supporting-circuit-pack-name>
-      <supporting-ots>OTS-DEG2-TTP-TXRX</supporting-ots>
-      <port-direction>bidirectional</port-direction>
+      <logical-connection-point>DEG1-TTP-TXRX</logical-connection-point>
+      <supporting-ots>OTS-DEG1-TTP-TXRX</supporting-ots>
+      <supporting-circuit-pack-name>1/0</supporting-circuit-pack-name>
+      <supporting-oms>OMS-DEG1-TTP-TXRX</supporting-oms>
       <supporting-port>L1</supporting-port>
+      <port-direction>bidirectional</port-direction>
     </mapping>
     <mapping>
-      <logical-connection-point>SRG1-PP4-TXRX</logical-connection-point>
+      <logical-connection-point>SRG1-PP1-TXRX</logical-connection-point>
       <supporting-circuit-pack-name>3/0</supporting-circuit-pack-name>
+      <supporting-port>C1</supporting-port>
       <port-direction>bidirectional</port-direction>
-      <supporting-port>C4</supporting-port>
     </mapping>
   </nodes>
 </network>

diff --git a/tests/transportpce_tests/1.2.1/test_portmapping.py b/tests/transportpce_tests/1.2.1/test_portmapping.py
index 5a16be582cb14b48f5ee92472b45b47ae10ad4d9..424e6f7d6d723b059b963f61d569c954dfe3b9ee 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test_portmapping.py
@@ -247,7 +247,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
              'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional',
-             'associated-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'},
+             'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'},
             res['mapping'])
 
     def test_11_xpdr_portmapping_NETWORK2(self):
@@ -262,7 +262,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET',
              'logical-connection-point': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional',
-             'associated-lcp': 'XPDR1-CLIENT3', 'port-qual': 'xpdr-network'},
+             'connection-map-lcp': 'XPDR1-CLIENT3', 'port-qual': 'xpdr-network'},
             res['mapping'])
 
     def test_12_xpdr_portmapping_CLIENT1(self):
@@ -278,7 +278,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             {'supporting-port': 'C1',
              'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
              'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
-             'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
+             'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
             res['mapping'])
 
     def test_13_xpdr_portmapping_CLIENT2(self):
@@ -310,7 +310,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             {'supporting-port': 'C3',
              'supporting-circuit-pack-name': '1/0/C3-PLUG-CLIENT',
              'logical-connection-point': 'XPDR1-CLIENT3',
-             'associated-lcp': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional',
+             'connection-map-lcp': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional',
              'port-qual': 'xpdr-client'},
             res['mapping'])
 

diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
index 7d0980299fe0ae504c6e923a70426249f17bd288..807cbde8c7c60852f9ab4c20c5bee533ec515876 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
@@ -138,13 +138,13 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertIn(
              {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
               'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional',
-              'associated-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'},
+              'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'},
              res['nodes'][0]['mapping'])
         self.assertIn(
              {'supporting-port': 'C1',
               'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
               'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
-              'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
+              'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
              res['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):

diff --git a/tests/transportpce_tests/2.2.1/test_portmapping.py b/tests/transportpce_tests/2.2.1/test_portmapping.py
index 4b54cb284eae92ee4865c1305c0d3f27c66e71ad..b5a4e4738da13d6e3e4c4bc7e365db0e7503a697 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_portmapping.py
+++ b/tests/transportpce_tests/2.2.1/test_portmapping.py
@@ -238,7 +238,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
              'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network',
-             'port-direction': 'bidirectional', 'associated-lcp': 'XPDR1-CLIENT1'},
+             'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1'},
             res['mapping'])
 
     def test_12_xpdr_portmapping_NETWORK2(self):
@@ -253,7 +253,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET',
              'logical-connection-point': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional',
-             'associated-lcp': 'XPDR1-CLIENT2', 'port-qual': 'xpdr-network'},
+             'connection-map-lcp': 'XPDR1-CLIENT2', 'port-qual': 'xpdr-network'},
             res['mapping'])
 
     def test_13_xpdr_portmapping_CLIENT1(self):
@@ -269,7 +269,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             {'supporting-port': 'C1',
              'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
              'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
-             'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
+             'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
             res['mapping'])
 
     def test_14_xpdr_portmapping_CLIENT2(self):
@@ -285,7 +285,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             {'supporting-port': 'C1',
                  'supporting-circuit-pack-name': '1/0/2-PLUG-CLIENT',
                  'logical-connection-point': 'XPDR1-CLIENT2', 'port-direction': 'bidirectional',
-                 'associated-lcp': 'XPDR1-NETWORK2', 'port-qual': 'xpdr-client'},
+                 'connection-map-lcp': 'XPDR1-NETWORK2', 'port-qual': 'xpdr-client'},
             res['mapping'])
 
     def test_15_xpdr_device_disconnected(self):

diff --git a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
index c70bf9dd1ce1f9865e46f209338a0aaf3695d469..436e769db09b84e3413e11f57a17ccd21be08ff3 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
@@ -139,13 +139,13 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertIn(
              {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
               'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network',
-              'port-direction': 'bidirectional', 'associated-lcp': 'XPDR1-CLIENT1'},
+              'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1'},
              res['nodes'][0]['mapping'])
         self.assertIn(
              {'supporting-port': 'C1',
               'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
               'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
-              'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
+              'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
              res['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):