Clean up API YANG models with the help of pyang

This addresses the following pyang generated warnings
 - Remove any unused imports
 - Add revision dates to the imports
 - Order the revisions
 - Fix a warning in org-openroadm-resource (MSA related)

JIRA: TRNSPRTPCE-340
Change-Id: I37dae25c3a54d5245a84b209b0f1f1981799fe5a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/api/src/main/yang/gnpy-path-computation-simplified@2020-09-09.yang b/api/src/main/yang/gnpy-path-computation-simplified@2020-09-09.yang
index 7275ddf2c9664878692ae234e0e56421c00d2657..a2393632cb71e3d8d90a9be581cad9219f0f5d69 100644 (file)
--- a/api/src/main/yang/gnpy-path-computation-simplified@2020-09-09.yang
+++ b/api/src/main/yang/gnpy-path-computation-simplified@2020-09-09.yang
@@ -4,10 +4,6 @@ module gnpy-path-computation-simplified {
 
   prefix "gnpypc";
 
-  import ietf-yang-types {
-    prefix "yang-types";
-  }
-
   import ietf-inet-types {
     prefix inet;
   }

diff --git a/api/src/main/yang/service_path/transportpce-common-service-path-types@2020-01-28.yang b/api/src/main/yang/service_path/transportpce-common-service-path-types@2020-01-28.yang
index b7995d8f988ff8782824841c722af16b4dfa7890..caa8150d664adca6a1cb5c880ed20cca98ccf385 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-common-service-path-types@2020-01-28.yang
+++ b/api/src/main/yang/service_path/transportpce-common-service-path-types@2020-01-28.yang
@@ -2,25 +2,12 @@ module transportpce-common-service-path-types {
   namespace "http://org/transportpce/B-C-interface/service/types";
   prefix transportpce-common-service-path-types;
 
-  import ietf-yang-types {
-    prefix yang;
-  }
-  import ietf-inet-types {
-    prefix inet;
-  }
   import transportpce-routing-constraints {
     prefix transportpce-routing-constraints;
   }
   import transportpce-pathDescription {
     prefix transportpce-pathDescription;
   }
-  import transportpce-common-types {
-    prefix transportpce-common-types;
-  }
-  import org-openroadm-common-types {
-    prefix org-openroadm-common-types;
-    revision-date 2019-05-31;
-  }
   import org-openroadm-otn-common-types {
     prefix org-openroadm-otn-common-types;
     revision-date 2018-11-30;

diff --git a/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang b/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang
index 8bda67743d14a386f3c07bff1886fa1401ba6500..c0e0fb94f7b2972b9d0a40f1b9220b034a3911b9 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang
+++ b/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang
@@ -10,10 +10,6 @@ module transportpce-common-types {
     prefix org-openroadm-pm-types;
     revision-date 2016-10-14;
   }
-  import org-openroadm-otn-common-types {
-    prefix org-openroadm-otn-common-types;
-    revision-date 2018-11-30;
-  }
   import org-openroadm-common-types {
     prefix org-openroadm-common-types;
     revision-date 2018-10-19;

diff --git a/api/src/main/yang/service_path/transportpce-pathDescription@2020-06-29.yang b/api/src/main/yang/service_path/transportpce-pathDescription@2020-06-29.yang
index d5b34bb69b0c90bba82587188727ae9e18435bbb..36d668fb94ec13a444148e7093e6ee1b1ce582bc 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-pathDescription@2020-06-29.yang
+++ b/api/src/main/yang/service_path/transportpce-pathDescription@2020-06-29.yang
@@ -2,10 +2,6 @@ module transportpce-pathDescription {
   namespace "http://org/transportpce/B-C-interface/pathDescription";
   prefix transportpce-pathDescription;
 
-  import org-openroadm-resource {
-    prefix org-openroadm-resource;
-  }
-
   organization
     "transportPCE";
   contact
@@ -41,18 +37,19 @@ module transportpce-pathDescription {
       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
       POSSIBILITY OF SUCH DAMAGE";
 
-  revision 2017-04-26 {
-    description
-      "Version 1.5";
+  revision 2020-06-29 {
+        description
+          "Version 1.6.1. To manage otn services";
   }
   revision 2017-10-17 {
+      description
+        "Version 1.6";
+  }
+  revision 2017-04-26 {
     description
-      "Version 1.6";
+      "Version 1.5";
   }
-  revision 2020-06-29 {
-      description
-        "Version 1.6.1. To manage otn services";
-    }
+
 
   grouping PCE-resource {
     description

diff --git a/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang b/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang
index 0d40d33675a5f463993842e26a67494f26d2c6b2..8c8943abc49d7aed205ae2b0045aa2035997e960 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang
+++ b/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang
@@ -2,14 +2,12 @@ module transportpce-pce {
   namespace "http://org/opendaylight/transportpce/pce";
   prefix org-opendaylight-transportpce-pce;
 
-  import ietf-yang-types {
-    prefix yang;
-  }
   import transportpce-routing-constraints {
     prefix transportpce-routing-constraints;
   }
   import org-openroadm-common-service-types {
     prefix org-openroadm-common-service-types;
+    revision-date 2019-05-31;
   }
   import transportpce-common-service-path-types {
     prefix transportpce-common-service-path-types;

diff --git a/api/src/main/yang/service_path/transportpce-renderer@2020-05-20.yang b/api/src/main/yang/service_path/transportpce-renderer@2020-05-20.yang
index 4fed73decf113a9b8ee50898e154dceda1d71a95..537e83a3022f0ba161d605633afdceb0f007a8b0 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-renderer@2020-05-20.yang
+++ b/api/src/main/yang/service_path/transportpce-renderer@2020-05-20.yang
@@ -2,17 +2,16 @@ module transportpce-renderer {
   namespace "http://org/opendaylight/transportpce/renderer";
   prefix org-opendaylight-transportpce-renderer;
 
-  import ietf-yang-types {
-    prefix yang;
-  }
   import org-openroadm-common-service-types {
     prefix org-openroadm-common-service-types;
+    revision-date 2019-05-31;
   }
   import transportpce-common-service-path-types {
     prefix transportpce-common-service-path-types;
   }
   import org-openroadm-topology {
     prefix org-openroadm-topology;
+    revision-date 2019-05-31;
   }
   import transportpce-pathDescription {
     prefix transportpce-pathDescription;

diff --git a/api/src/main/yang/service_path/transportpce-routing-constraints@2017-10-17.yang b/api/src/main/yang/service_path/transportpce-routing-constraints@2017-10-17.yang
index af265c566bc177d5e82cd2965e3ea4d721c17100..1c8bb1284edce383875a6634a7baa5bddcf18fc7 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-routing-constraints@2017-10-17.yang
+++ b/api/src/main/yang/service_path/transportpce-routing-constraints@2017-10-17.yang
@@ -36,14 +36,15 @@ module transportpce-routing-constraints {
       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
       POSSIBILITY OF SUCH DAMAGE";
 
+  revision 2017-10-17 {
+      description
+        "Version 1.6";
+  }
   revision 2017-04-26 {
     description
       "Version 1.5";
   }
-  revision 2017-10-17 {
-    description
-      "Version 1.6";
-  }
+
 
   grouping common-constraints-sp {
     leaf-list SRLG {

diff --git a/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang b/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang
index 8e063130cc80e1ab5eae2967a34b6221be0d9e0c..b42a4e436bdc6dd824cdc6f24af4c0c9194ea421 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang
+++ b/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang
@@ -1,10 +1,7 @@
-module transportpce-servicepath {
+module transportpce-service-path {
   namespace "http://org/transportpce/B-C-interface/servicepath";
-  prefix transportpce-servicepath;
+  prefix transportpce-service-path;
 
-  import ietf-yang-types {
-    prefix yang;
-  }
   import transportpce-common-service-path-types {
     prefix transportpce-common-service-path-types;
   }

diff --git a/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang b/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang
index f967bc89b94e54186af60236c1d392d9e5aed4ff..5d2cae495e90f4704fc4229337187f4a94fea7c6 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang
+++ b/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang
@@ -2,30 +2,13 @@ module transportpce-servicehandler {
   namespace "http://org/opendaylight/transportpce/servicehandler";
   prefix org-opendaylight-transportpce-servicehandler;
 
-  import ietf-yang-types {
-    prefix yang;
-  }
-  import transportpce-routing-constraints {
-    prefix transportpce-routing-constraints;
-  }
-  import org-openroadm-common-types {
-    prefix org-openroadm-common-types;
-  }
-  import org-openroadm-resource-types {
-    prefix org-openroadm-resource-types;
-  }
   import org-openroadm-common-service-types {
     prefix org-openroadm-common-service-types;
+    revision-date 2019-05-31;
   }
   import transportpce-common-service-path-types {
     prefix transportpce-common-service-path-types;
   }
-  import transportpce-pathDescription {
-    prefix transportpce-pathDescription;
-  }
-  import org-openroadm-topology {
-    prefix org-openroadm-topology;
-  }
 
   organization
     "transportPCE";

diff --git a/ordmodels/common/src/main/yang/org-openroadm-resource@2019-05-31.yang b/ordmodels/common/src/main/yang/org-openroadm-resource@2019-05-31.yang
index 3089afd1924ca6ccde1f7a6d431e2a9f7c04c336..9bbac775786553b7d91112d9eae58914a9d27dda 100644 (file)
--- a/ordmodels/common/src/main/yang/org-openroadm-resource@2019-05-31.yang
+++ b/ordmodels/common/src/main/yang/org-openroadm-resource@2019-05-31.yang
@@ -220,39 +220,39 @@ module org-openroadm-resource {
         "The type of the interface.";
     }
     container ethernet {
-      when "type = 'ethernetCsmacd'";
+      when "../type = 'ethernetCsmacd'";
       description
         "Ethernet Interfaces";
       uses eth-attributes;
     }
     container mc-ttp {
-      when "type = 'mediaChannelTrailTerminationPoint'";
+      when "../type = 'mediaChannelTrailTerminationPoint'";
       description
         "Media Channel Trail Termination Point (MC-TTP)";
       uses mc-ttp-attributes;
     }
     container nmc-ctp {
-      when "type = 'networkMediaChannelConnectionTerminationPoint'";
+      when "../type = 'networkMediaChannelConnectionTerminationPoint'";
       description
         "Network Media Channel Connection Termination Point (NMC-CTP)";
       uses nmc-ctp-attributes;
     }
     container och {
-      when "type = 'opticalChannel'";
+      when "../type = 'opticalChannel'";
       description
         "Optical Channel (OCh):
          Models the optical channel interfaces for an Optical White Box.";
       uses och-attributes;
     }
     container odu {
-      when "type = 'otnOdu'";
+      when "../type = 'otnOdu'";
       presence "Attribute Nodes for Optical Data Unit (ODU)";
       description
         "Optical Channel Data Unit (ODU)";
       uses odu-attributes;
     }
     container otu {
-      when "type = 'otnOtu'";
+      when "../type = 'otnOtu'";
       description
         "Optical Channel Transport Unit (OTU)";
       uses otu-attributes;