reformat api YANG models with pyang

using pyang 2.4.0 via pyangformat tox profile

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

diff --git a/api/src/main/yang/gnpy-eqpt-config@2018-11-19.yang b/api/src/main/yang/gnpy-eqpt-config@2018-11-19.yang
index 1ea1c2a659a0300e484740dc2f9822d6bcccc9d5..23fa129e762e801744afbd1a267efb21557ca2f0 100644 (file)
--- a/api/src/main/yang/gnpy-eqpt-config@2018-11-19.yang
+++ b/api/src/main/yang/gnpy-eqpt-config@2018-11-19.yang
@@ -1,30 +1,29 @@
 module gnpy-eqpt-config {
   yang-version 1;
   namespace "gnpy:gnpy-eqpt-config";
-
-  prefix "gnpyeqpt";
+  prefix gnpyeqpt;
 
   organization
     "Telecom Infra Project OOPT PSE
      Working Group";
-
   contact
     "WG Web:   <https://github.com/Telecominfraproject/oopt-gnpy>
      contact:  <mailto:ahmed.triki@orange.com>
      contact:  <mailto:esther.lerouzic@orange.com>
-   ";
-
-  description "Base YANG model for gnpy equipment library input for path computation - transportPCE preversion";
-
-  revision "2018-11-19" {
-    description "first draft";
-    reference "Base YANG model for equipment library input for path computation with gnpy";
+    ";
+  description
+    "Base YANG model for gnpy equipment library input for path computation - transportPCE preversion";
+
+  revision 2018-11-19 {
+    description
+      "first draft";
+    reference
+      "Base YANG model for equipment library input for path computation with gnpy";
   }
 
   /*
    * Identities
 
-
   identity edfa-variety {
     description "edfa variety" ;
   }
@@ -37,51 +36,41 @@ module gnpy-eqpt-config {
     description "base identity for transceiver variety" ;
   }
 
-  */
+   */
 
   list Edfa {
-    key type_variety;
+    key "type_variety";
     leaf type_variety {
       type string;
-      description "a unique name to ID the amplifier in the JSON/Excel template topology input file" ;
+      description
+        "a unique name to ID the amplifier in the JSON/Excel template topology input file";
     }
   }
-
-
   list Fiber {
-    key type_variety ;
+    key "type_variety";
+    description
+      "a unique name to ID the fiber in the JSON or Excel template topology input file";
     leaf type_variety {
-      type string ;
-      }
-      description "a unique name to ID the fiber in the JSON or Excel template topology input file" ;
+      type string;
     }
-
-
-  list Transceiver{
-    key type_variety ;
+  }
+  list Transceiver {
+    key "type_variety";
+    description
+      "a unique name to ID the transceiver in the JSON or Excel template topology input file";
     leaf type_variety {
-      type string ;
-      }
-      description "a unique name to ID the transceiver in the JSON or Excel template topology input file" ;
-    }
-    list mode {
-      key format ;
-      leaf format {
-        type string ;
-        description "unique name of the mode" ;
-      }
+      type string;
     }
-
-  container Spans {
-
-  }
-
-  container Roadms {
-
   }
-
-  container SI {
-
+  list mode {
+    key "format";
+    leaf format {
+      type string;
+      description
+        "unique name of the mode";
+    }
   }
+  container Spans;
+  container Roadms;
+  container SI;
 }
-

diff --git a/api/src/main/yang/gnpy-network-topology@2018-12-14.yang b/api/src/main/yang/gnpy-network-topology@2018-12-14.yang
index f6f557d74981e71f70d9fb7ad8f08940a5e6ad2b..3cb00655b43e6fdb63845e6563c00bc2901ae07c 100644 (file)
--- a/api/src/main/yang/gnpy-network-topology@2018-12-14.yang
+++ b/api/src/main/yang/gnpy-network-topology@2018-12-14.yang
@@ -2,10 +2,6 @@ module gnpy-network-topology {
   yang-version 1;
   namespace "gnpy:gnpy-network-topology";
   prefix gnpynt;
-
-  import gnpy-eqpt-config {
-    prefix geqpt;
-  }
   import ietf-inet-types {
     prefix inet;
   }

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 a2393632cb71e3d8d90a9be581cad9219f0f5d69..0299fbe3fb2a125d992c2d1710acef8f56a2e698 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
@@ -1,120 +1,31 @@
 module gnpy-path-computation-simplified {
   yang-version 1;
   namespace "gnpy:path";
-
-  prefix "gnpypc";
+  prefix gnpypc;
 
   import ietf-inet-types {
     prefix inet;
   }
-    organization
-    "Telecom Infra Project OOPT PSE Working Group";
 
+  organization
+    "Telecom Infra Project OOPT PSE Working Group";
   contact
     "WG Web:   <https://github.com/Telecominfraproject/oopt-gnpy>
      contact:  <mailto:ahmed.triki@orange.com>
      contact:  <mailto:esther.lerouzic@orange.com>
-   ";
-
-  description "YANG model for gnpy path computation simplified for transportPCE";
-
-  revision "2020-09-09" {
-    description "remove key from route-object-include-exclude";
-  }
-
-  revision "2020-02-02" {
-    description "second draft with detailed blocking reasons";
-    reference "YANG model for path computation with gnpy inputs";
-  }
-
-  grouping effective-freq-slot{
-         /* content copied from ietf-flexi-grid-media-channel, because only M and N are needed
-            from the initial grouping.
-         */
-         description "The effective frequency slot is an attribute
-            of a media channel and, being a frequency slot, it is
-            described by its nominal central frequency and slot
-            width";
-         reference "rfc7698";
-            leaf N {
-               type int32;
-               description
-                  "Is used to determine the Nominal Central
-                  Frequency. The set of nominal central frequencies
-                  can be built using the following expression:
-                     f = 193.1 THz + n x 0.00625 THz,
-                  where 193.1 THz is ITU-T ''anchor frequency'' for
-                  transmission over the C band, n is a positive or
-                  negative integer including 0.";
-               reference "rfc7698";
-            }
-            leaf M {
-               type int32;
-               description
-                  "Is used to determine the slot width. A slot width
-                  is constrained to be M x SWG (that is, M x 12.5 GHz),
-                  where M is an integer greater than or equal to 1.";
-               reference "rfc7698";
-    }
-  }
+    ";
+  description
+    "YANG model for gnpy path computation simplified for transportPCE";
 
-  grouping gnpy-specific-parameters{
+  revision 2020-09-09 {
     description
-      "This grouping defines the gnpy specific parameters for requests.";
-        leaf technology {
-            type string;
-            default "flexi-grid";
-            description
-          "Data plane technology type.";
-          }
-      leaf trx_type {
-        type string ;
-        mandatory true;
-        description "name of the transponder type (to be read from equipment library";
-
-      }
-      leaf trx_mode {
-        type string ;
-        description "name of the transponder mode (to be read from equipment library";
-
-      }
-      list effective-freq-slot {
-        key "N";
-        uses effective-freq-slot ;
-      }
-      leaf spacing {
-        mandatory true;
-        type decimal64 {
-          fraction-digits 1;
-        }
-        units Hz;
-        description
-          "It is the spacing between channels assuming full load with
-          same channels as the requested one. multiple of 12.5 GHz";
-
-      }
-      leaf max-nb-of-channel{
-        type uint32 ;
-        description "Nb of channel to take into account for the full load case.
-        ";
-
-      }
-      leaf output-power{
-        type decimal64 {
-          fraction-digits 5;
-        }
-        units W;
-        description "optical power setting to be used for the propagation";
-
-      }
-      leaf path_bandwidth{
-        type decimal64 {
-          fraction-digits 5;
-        }
-        mandatory true;
-        units bit/s;
-        description "Capacity required";
-      }
+      "remove key from route-object-include-exclude";
+  }
+  revision 2020-02-02 {
+    description
+      "second draft with detailed blocking reasons";
+    reference
+      "YANG model for path computation with gnpy inputs";
   }
 
   identity SNR-bandwidth {
@@ -148,54 +59,9 @@ module gnpy-path-computation-simplified {
   }
 
   identity path_bandwidth {
-     base path-metric-type;
-     description
-       "to be revised";
-  }
-
-  grouping transponder{
-        leaf transponder-type {
-        type string ;
-        description
-          "transponder type.";
-          }
-      leaf transponder-mode {
-        type string ;
-        description
-          "transponder mode.";
-          }
-  }
-
-  grouping hop-attribute{
+    base path-metric-type;
     description
-      "This grouping defines the hop attribute parameters for request or response";
-    choice hop-type{
-      case tsp {
-        container transponder{
-          uses transponder ;
-        }
-      }
-      case regen {
-        container regenerator{
-          leaf regenerator-id{
-            type string ;
-          }
-          uses transponder ;
-        }
-      }
-      case pow {
-        container optical-power{
-          leaf optical-power{
-            type decimal64 {
-              fraction-digits 5;
-            }
-            units W;
-            description "hop output (input??) power";
-          }
-        }
-      }
-    }
-
+      "to be revised";
   }
 
   identity path-metric-type {
@@ -238,24 +104,28 @@ module gnpy-path-computation-simplified {
       }
     }
     description
-     "enumerated type for specifying loose or strict
-      paths";
-    reference "RFC3209: section-4.3.2";
+      "enumerated type for specifying loose or strict
+       paths";
+    reference
+      "RFC3209: section-4.3.2";
   }
 
   typedef te-path-disjointness {
     type bits {
       bit node {
         position 0;
-        description "Node disjoint.";
+        description
+          "Node disjoint.";
       }
       bit link {
         position 1;
-        description "Link disjoint.";
+        description
+          "Link disjoint.";
       }
       bit srlg {
         position 2;
-        description "SRLG (Shared Risk Link Group) disjoint.";
+        description
+          "SRLG (Shared Risk Link Group) disjoint.";
       }
     }
     description
@@ -278,7 +148,7 @@ module gnpy-path-computation-simplified {
 
   typedef te-tp-id {
     type union {
-      type uint32;          // Unnumbered
+      type uint32; // Unnumbered
       type inet:ip-address; // IPv4 or IPv6 address
     }
     description
@@ -287,15 +157,153 @@ module gnpy-path-computation-simplified {
        RFC3630 and RFC5305.";
   }
 
-    typedef accumulated-metric-type {
-      type union {
-        type uint64;
-        type decimal64 {
-          fraction-digits 2;
-        }
+  typedef accumulated-metric-type {
+    type union {
+      type uint64;
+      type decimal64 {
+        fraction-digits 2;
+      }
+    }
+    description
+      "type useable for accumulative-value";
+  }
+
+  grouping effective-freq-slot {
+    /* content copied from ietf-flexi-grid-media-channel, because only M and N are needed
+       from the initial grouping.
+     */
+    description
+      "The effective frequency slot is an attribute
+       of a media channel and, being a frequency slot, it is
+       described by its nominal central frequency and slot
+       width";
+    reference
+      "rfc7698";
+    leaf N {
+      type int32;
+      description
+        "Is used to determine the Nominal Central
+         Frequency. The set of nominal central frequencies
+         can be built using the following expression:
+           f = 193.1 THz + n x 0.00625 THz,
+         where 193.1 THz is ITU-T ''anchor frequency'' for
+         transmission over the C band, n is a positive or
+         negative integer including 0.";
+      reference
+        "rfc7698";
+    }
+    leaf M {
+      type int32;
+      description
+        "Is used to determine the slot width. A slot width
+         is constrained to be M x SWG (that is, M x 12.5 GHz),
+         where M is an integer greater than or equal to 1.";
+      reference
+        "rfc7698";
+    }
+  }
+
+  grouping gnpy-specific-parameters {
+    description
+      "This grouping defines the gnpy specific parameters for requests.";
+    leaf technology {
+      type string;
+      default "flexi-grid";
+      description
+        "Data plane technology type.";
+    }
+    leaf trx_type {
+      type string;
+      mandatory true;
+      description
+        "name of the transponder type (to be read from equipment library";
+    }
+    leaf trx_mode {
+      type string;
+      description
+        "name of the transponder mode (to be read from equipment library";
+    }
+    list effective-freq-slot {
+      key "N";
+      uses effective-freq-slot;
+    }
+    leaf spacing {
+      type decimal64 {
+        fraction-digits 1;
+      }
+      units "Hz";
+      mandatory true;
+      description
+        "It is the spacing between channels assuming full load with
+         same channels as the requested one. multiple of 12.5 GHz";
+    }
+    leaf max-nb-of-channel {
+      type uint32;
+      description
+        "Nb of channel to take into account for the full load case.\n";
+    }
+    leaf output-power {
+      type decimal64 {
+        fraction-digits 5;
+      }
+      units "W";
+      description
+        "optical power setting to be used for the propagation";
+    }
+    leaf path_bandwidth {
+      type decimal64 {
+        fraction-digits 5;
       }
+      units "bit/s";
+      mandatory true;
       description
-          "type useable for accumulative-value";
+        "Capacity required";
+    }
+  }
+
+  grouping transponder {
+    leaf transponder-type {
+      type string;
+      description
+        "transponder type.";
+    }
+    leaf transponder-mode {
+      type string;
+      description
+        "transponder mode.";
+    }
+  }
+
+  grouping hop-attribute {
+    description
+      "This grouping defines the hop attribute parameters for request or response";
+    choice hop-type {
+      case tsp {
+        container transponder {
+          uses transponder;
+        }
+      }
+      case regen {
+        container regenerator {
+          leaf regenerator-id {
+            type string;
+          }
+          uses transponder;
+        }
+      }
+      case pow {
+        container optical-power {
+          leaf optical-power {
+            type decimal64 {
+              fraction-digits 5;
+            }
+            units "W";
+            description
+              "hop output (input??) power";
+          }
+        }
+      }
+    }
   }
 
   grouping path-route-objects {
@@ -313,15 +321,17 @@ module gnpy-path-computation-simplified {
           type identityref {
             base route-usage-type;
           }
-          description "Explicit-route usage.";
+          description
+            "Explicit-route usage.";
         }
-        uses explicit-route-hop ;
+        uses explicit-route-hop;
       }
     }
   }
 
   grouping generic-path-disjointness {
-    description "Path disjointness grouping";
+    description
+      "Path disjointness grouping";
     leaf disjointness {
       type te-path-disjointness;
       description
@@ -341,26 +351,30 @@ module gnpy-path-computation-simplified {
   grouping generic-path-constraints {
     description
       "Global named path constraints configuration
-      grouping";
+       grouping";
     container path-constraints {
-      description "TE named path constraints container";
+      description
+        "TE named path constraints container";
       uses common-path-constraints-attributes;
     }
   }
 
-
   grouping explicit-route-hop {
     description
       "The explicit route subobject grouping";
     leaf index {
       type uint32;
-      description "ERO subobject index";
+      description
+        "ERO subobject index";
     }
     choice type {
       description
         "The explicit route subobject type";
       case num-unnum-hop {
         container num-unnum-hop {
+          description
+            "Numbered and Unnumbered link/node explicit route
+             subobject";
           leaf node-id {
             //type te-node-id;
             type string;
@@ -372,28 +386,27 @@ module gnpy-path-computation-simplified {
             type string;
             description
               "TE link termination point identifier. The combination
-              of TE link ID and the TE node ID is used to identify an
-              unnumbered TE link.";
+               of TE link ID and the TE node ID is used to identify an
+               unnumbered TE link.";
           }
           leaf hop-type {
             type te-hop-type;
-            description "strict or loose hop";
+            description
+              "strict or loose hop";
           }
-          description
-            "Numbered and Unnumbered link/node explicit route
-            subobject";
         }
       }
       case label {
+        description
+          "The Label ERO subobject";
         container label-hop {
-          description "Label hop type";
+          description
+            "Label hop type";
           uses effective-freq-slot;
         }
-        description
-          "The Label ERO subobject";
       }
-      case hop-attribute{
-        uses gnpypc:hop-attribute ;
+      case hop-attribute {
+        uses gnpypc:hop-attribute;
       }
     }
   }
@@ -402,129 +415,144 @@ module gnpy-path-computation-simplified {
     description
       "Common constraints grouping that can be set on
        a constraint set or directly on the tunnel";
-
     container te-bandwidth {
-      uses gnpy-specific-parameters ;
       description
         "A requested bandwidth to use for path computation";
+      uses gnpy-specific-parameters;
     }
   }
 
   grouping end-points {
     description
       "Common grouping to define the TE tunnel end-points";
-
     leaf source {
       type inet:ip-address;
-      description "TE tunnel source address.";
+      description
+        "TE tunnel source address.";
     }
     leaf destination {
       type inet:ip-address;
-      description "P2P tunnel destination address";
+      description
+        "P2P tunnel destination address";
     }
     leaf src-tp-id {
       type binary;
-      description "TE tunnel source termination point identifier.";
+      description
+        "TE tunnel source termination point identifier.";
     }
     leaf dst-tp-id {
       type binary;
-
-      description "TE tunnel destination termination point
-identifier.";
+      description
+        "TE tunnel destination termination point
+         identifier.";
     }
   }
 
   grouping synchronization-info {
-    description "Information for sync";
+    description
+      "Information for sync";
     list synchronization {
       key "synchronization-id";
-      description "sync list";
+      description
+        "sync list";
       leaf synchronization-id {
         type uint32;
-        description "index";
+        description
+          "index";
       }
       container svec {
         description
-         "Synchronization VECtor";
+          "Synchronization VECtor";
         leaf relaxable {
           type boolean;
-          default true;
+          default "true";
           description
-           "If this leaf is true, path computation process is free
-to ignore svec content.
-            otherwise it must take into account this svec.";
+            "If this leaf is true, path computation process is free
+             to ignore svec content.
+             otherwise it must take into account this svec.";
         }
         uses generic-path-disjointness;
         leaf-list request-id-number {
           type uint32;
-          description "This list reports the set of M path computation requests that must be synchronized.";
+          description
+            "This list reports the set of M path computation requests that must be synchronized.";
         }
       }
     }
   }
 
   grouping generic-path-properties {
-    description "TE generic path properties grouping";
+    description
+      "TE generic path properties grouping";
     container path-properties {
       config false;
-      description "The TE path properties";
+      description
+        "The TE path properties";
       list path-metric {
-        key metric-type;
-        description "TE path metric type";
+        key "metric-type";
+        description
+          "TE path metric type";
         leaf metric-type {
           type identityref {
             base path-metric-type;
           }
-          description "TE path metric type";
+          description
+            "TE path metric type";
         }
         leaf accumulative-value {
           type decimal64 {
-              fraction-digits 2;
+            fraction-digits 2;
           }
-          description "TE path metric accumulative value";
+          description
+            "TE path metric accumulative value";
         }
       }
-//      container path-route-objects {
-//        description
-//          "Container for the list of route objects either returned by
-//           the computation engine or actually used by an LSP";
-//        list path-route-object {
-//          key index;
-//          description
-//            "List of route objects either returned by the computation
-//             engine or actually used by an LSP";
-//          uses explicit-route-hop;
-//        }
-//      }
+      //      container path-route-objects {
+      //        description
+      //          "Container for the list of route objects either returned by
+      //           the computation engine or actually used by an LSP";
+      //        list path-route-object {
+      //          key index;
+      //          description
+      //            "List of route objects either returned by the computation
+      //             engine or actually used by an LSP";
+      //          uses explicit-route-hop;
+      //        }
+      //      }
       list path-route-objects {
+        description
+          "Container for the list of route objects either returned by
+           the computation engine or actually used by an LSP";
+        container path-route-object {
           description
-            "Container for the list of route objects either returned by
-             the computation engine or actually used by an LSP";
-          container path-route-object {
-            description
-              "List of route objects either returned by the computation
-               engine or actually used by an LSP";
-            uses explicit-route-hop;
-          }
+            "List of route objects either returned by the computation
+             engine or actually used by an LSP";
+          uses explicit-route-hop;
         }
+      }
     }
   }
 
   grouping path-info {
+    description
+      "Path computation output information";
     uses generic-path-properties;
-    description "Path computation output information";
   }
 
-// adding some blocking reasons and info on path in case of blocking
+  // adding some blocking reasons and info on path in case of blocking
 
   grouping no-path-info {
-    description "no-path-info";
+    description
+      "no-path-info";
     container no-path {
       presence "Response without path information, due to failure
-        performing the path computation";
+                performing the path computation";
+      description
+        "if path computation cannot identify a path,
+         rpc returns no path.";
       leaf no-path {
         type string;
-        mandatory true ;
+        mandatory true;
         description
           "returned blocking reasons:
             NO_PATH
@@ -535,65 +563,70 @@ to ignore svec content.
             MODE_NOT_FEASIBLE
             NO_SPECTRUM
           ";
-        }
-      uses generic-path-properties ;
-      description "if path computation cannot identify a path,
-        rpc returns no path.";
+      }
+      uses generic-path-properties;
     }
   }
 
   /* TODO : correct the following with good trees:
-  *  te:tunnels-rpc/te:input/te:tunnel-info
-  *  te:tunnels-rpc/te:output/te:result
-  */
-   grouping service {
-     list path-request {
-       key "request-id";
-       description "request-list";
-       leaf request-id {
-         type uint32;
-         mandatory true;
-         description "Each path computation request is uniquely identified by the request-id-number.";
-       }
-       leaf bidirectional {
-         type boolean;
-         mandatory true;
-         description "Specify the bidirectionality of the path";
-       }
-
-       uses end-points;
-       uses path-route-objects;
-       uses generic-path-constraints;
-     }
-     uses synchronization-info;
-   }
-
-   grouping result {
-     list response {
-       key response-id;
-       config false;
-       description "response";
-       leaf response-id {
-         type uint32;
-         description
-         "The list key that has to reuse request-id-number.";
-       }
-       choice response-type {
-         config false;
-         description "response-type";
-         case no-path-case {
-           uses no-path-info;
-         }
-         case path-case {
-           uses path-info;
-           description "Path computation service.";
-         }
-       }
-     }
-   }
-   container result {
-     uses result;
-     description
-     "Describe the service file to connect to gnpy";
-   }
+   *  te:tunnels-rpc/te:input/te:tunnel-info
+   *  te:tunnels-rpc/te:output/te:result
+   */
+
+  grouping service {
+    list path-request {
+      key "request-id";
+      description
+        "request-list";
+      leaf request-id {
+        type uint32;
+        mandatory true;
+        description
+          "Each path computation request is uniquely identified by the request-id-number.";
+      }
+      leaf bidirectional {
+        type boolean;
+        mandatory true;
+        description
+          "Specify the bidirectionality of the path";
+      }
+      uses end-points;
+      uses path-route-objects;
+      uses generic-path-constraints;
+    }
+    uses synchronization-info;
+  }
+
+  grouping result {
+    list response {
+      key "response-id";
+      config false;
+      description
+        "response";
+      leaf response-id {
+        type uint32;
+        description
+          "The list key that has to reuse request-id-number.";
+      }
+      choice response-type {
+        config false;
+        description
+          "response-type";
+        case no-path-case {
+          uses no-path-info;
+        }
+        case path-case {
+          description
+            "Path computation service.";
+          uses path-info;
+        }
+      }
+    }
+  }
+
+  container result {
+    description
+      "Describe the service file to connect to gnpy";
+    uses result;
+  }
 }

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 36d668fb94ec13a444148e7093e6ee1b1ce582bc..1a920c9c85c1c46c2c1db52c4108f900965f18fd 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
@@ -38,19 +38,18 @@ module transportpce-pathDescription {
       POSSIBILITY OF SUCH DAMAGE";
 
   revision 2020-06-29 {
-        description
-          "Version 1.6.1. To manage otn services";
+    description
+      "Version 1.6.1. To manage otn services";
   }
   revision 2017-10-17 {
-      description
-        "Version 1.6";
+    description
+      "Version 1.6";
   }
   revision 2017-04-26 {
     description
       "Version 1.5";
   }
 
-
   grouping PCE-resource {
     description
       "This resource identifier is intended to provide a generic identifer

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 537e83a3022f0ba161d605633afdceb0f007a8b0..0c413ff795fbf7106551d1fe2e3f164ff11e4425 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
@@ -56,7 +56,6 @@ module transportpce-renderer {
     description
       "Version 1.6.1";
   }
-
   revision 2017-10-17 {
     description
       "Version 1.6";

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 1c8bb1284edce383875a6634a7baa5bddcf18fc7..71014216c96758699e6491862992d81ec25f1b92 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
@@ -37,15 +37,14 @@ module transportpce-routing-constraints {
       POSSIBILITY OF SUCH DAMAGE";
 
   revision 2017-10-17 {
-      description
-        "Version 1.6";
+    description
+      "Version 1.6";
   }
   revision 2017-04-26 {
     description
       "Version 1.5";
   }
 
-
   grouping common-constraints-sp {
     leaf-list SRLG {
       type string;

diff --git a/api/src/main/yang/tapi@2018-09-28.yang b/api/src/main/yang/tapi@2018-09-28.yang
index 4ae39532f02fa59886bad468f8ebbdd421a23cd0..89314aa944d21f437a195c36a3281a76ab16418d 100644 (file)
--- a/api/src/main/yang/tapi@2018-09-28.yang
+++ b/api/src/main/yang/tapi@2018-09-28.yang
@@ -7,10 +7,6 @@ module tapi {
     prefix tapi-topology;
     revision-date 2018-12-10;
   }
-  import org-openroadm-service {
-    prefix oor-service;
-    revision-date 2019-05-31;
-  }
   import tapi-common {
     prefix tapi-common;
     revision-date 2018-12-10;

diff --git a/api/src/main/yang/transportpce-portmapping@2020-10-12.yang b/api/src/main/yang/transportpce-portmapping@2020-10-12.yang
index 92c1916d67264e1d48f790a504b017b9ad9098f1..99cad2572a54fb0a90829bba85d9952c9fecaf9a 100644 (file)
--- a/api/src/main/yang/transportpce-portmapping@2020-10-12.yang
+++ b/api/src/main/yang/transportpce-portmapping@2020-10-12.yang
@@ -40,8 +40,8 @@ module transportpce-portmapping {
   }
   revision 2020-08-27 {
     description
-    "Add support to differentiate flexible and fixed
-     grid capabilities with mc-capabilities";
+      "Add support to differentiate flexible and fixed
+       grid capabilities with mc-capabilities";
   }
   revision 2020-04-29 {
     description
@@ -203,32 +203,32 @@ module transportpce-portmapping {
           type string;
           description
             "Hash value generated from node-id and lcp. This value will be used to map-
-            back SAPI and DAPI resource";
+             back SAPI and DAPI resource";
         }
       }
       list mc-capabilities {
-          key mc-node-name;
-          when "../node-info/node-type = 'rdm'";
+        when "../node-info/node-type = 'rdm'";
+        key "mc-node-name";
+        description
+          "Capabilities of the media channel associated with a degree or a SRG.";
+        leaf mc-node-name {
+          type string;
           description
-            "Capabilities of the media channel associated with a degree or a SRG.";
-          leaf mc-node-name {
-            type string;
-            description
-              "Name of the node, it has the format of DEGi-TTP or SRGj-PP
-              Where i, and j are the degree and SRG numbers respectively";
-          }
-          leaf slot-width-granularity {
-            type org-openroadm-common-optical-channel-types:frequency-GHz;
-            default "50";
-            description
-              "Width of a slot measured in GHz.";
-          }
-          leaf center-freq-granularity {
-            type org-openroadm-common-optical-channel-types:frequency-GHz;
-            default "50";
-            description
-              "Width of a slot measured in GHz.";
-          }
+            "Name of the node, it has the format of DEGi-TTP or SRGj-PP
+             Where i, and j are the degree and SRG numbers respectively";
+        }
+        leaf slot-width-granularity {
+          type org-openroadm-common-optical-channel-types:frequency-GHz;
+          default "50";
+          description
+            "Width of a slot measured in GHz.";
+        }
+        leaf center-freq-granularity {
+          type org-openroadm-common-optical-channel-types:frequency-GHz;
+          default "50";
+          description
+            "Width of a slot measured in GHz.";
+        }
       }
       list cp-to-degree {
         key "circuit-pack-name";