Upgrade to OpenROADM 7.1.0 network models

[transportpce.git] / ordmodels / network / src / main / yang / org-openroadm-link@2020-05-29.yang

diff --git a/ordmodels/network/src/main/yang/org-openroadm-link@2018-11-30.yang b/ordmodels/network/src/main/yang/org-openroadm-link@2020-05-29.yang
similarity index 87%
rename from ordmodels/network/src/main/yang/org-openroadm-link@2018-11-30.yang
rename to ordmodels/network/src/main/yang/org-openroadm-link@2020-05-29.yang
index 97c2cc39956d835edbf4246dc9d09c81be44d046..2c20b215a5ef41a1df9c3f256089b93c62972721 100644 (file)
--- a/ordmodels/network/src/main/yang/org-openroadm-link@2018-11-30.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-link@2020-05-29.yang
@@ -5,19 +5,23 @@ module org-openroadm-link {
 
   import org-openroadm-equipment-states-types {
     prefix org-openroadm-equipment-states-types;
-    revision-date 2018-11-30;
+    revision-date 2019-11-29;
   }
   import org-openroadm-common-link-types {
     prefix org-openroadm-common-link-types;
-    revision-date 2018-11-30;
+    revision-date 2019-11-29;
   }
   import org-openroadm-common-node-types {
     prefix org-openroadm-common-node-types;
-    revision-date 2018-11-30;
+    revision-date 2019-11-29;
   }
   import org-openroadm-amplifier {
     prefix org-openroadm-amplifier;
-    revision-date 2018-11-30;
+    revision-date 2019-11-29;
+  }
+  import org-openroadm-network-types {
+    prefix org-openroadm-network-types;
+    revision-date 2020-05-29;
   }
 
   organization
@@ -54,6 +58,30 @@ module org-openroadm-link {
      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.";
 
+  revision 2020-05-29 {
+    description
+      "Version 7.1.0";
+  }
+  revision 2020-03-27 {
+    description
+      "Version 7.0.0";
+  }
+  revision 2019-11-29 {
+    description
+      "Version 6.1.0";
+  }
+  revision 2019-09-27 {
+    description
+      "Version 6.0.0";
+  }
+  revision 2019-05-31 {
+    description
+      "Version 5.1.0";
+  }
+  revision 2019-03-29 {
+    description
+      "Version 5.0.0";
+  }
   revision 2018-11-30 {
     description
       "Version 4.1.0";
@@ -83,18 +111,7 @@ module org-openroadm-link {
       "Version 2.0";
   }
 
-  grouping OMS-attributes {
-    leaf TE-metric {
-      type uint32;
-      status deprecated;
-    }
-  }
-
   grouping span-attributes {
-    leaf clfi {
-      type string;
-      status deprecated;
-    }
     leaf auto-spanloss {
       type boolean;
       default "true";
@@ -132,42 +149,42 @@ module org-openroadm-link {
       }
       leaf fiber-type {
         type enumeration {
-          enum "smf" {
+          enum smf {
             value 0;
             description
               "Single Mode Fiber";
           }
-          enum "eleaf" {
+          enum eleaf {
             value 1;
             description
               "ELEAF";
           }
-          enum "oleaf" {
+          enum oleaf {
             value 2;
             description
               "OLEAF";
           }
-          enum "dsf" {
+          enum dsf {
             value 3;
             description
               "DSF";
           }
-          enum "truewave" {
+          enum truewave {
             value 4;
             description
               "TRUEWAVE Reduced Slope";
           }
-          enum "truewavec" {
+          enum truewavec {
             value 5;
             description
               "TRUEWAVE Classic";
           }
-          enum "nz-dsf" {
+          enum nz-dsf {
             value 6;
             description
               "NZ-DSF";
           }
-          enum "ull" {
+          enum ull {
             value 7;
             description
               "Ultra Low Loss (ULL)";
@@ -202,6 +219,7 @@ module org-openroadm-link {
           case ila {
             container ila {
               uses org-openroadm-amplifier:amplifier-node-attributes;
+              uses org-openroadm-network-types:type-variety-grp;
               leaf node-id {
                 type org-openroadm-common-node-types:node-id-type;
                 mandatory true;