Upgrade Network model from 2.1 to 4.1

[transportpce.git] / ordmodels / network / src / main / yang / org-openroadm-degree@2018-11-30.yang

diff --git a/ordmodels/network/src/main/yang/org-openroadm-degree@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-degree@2018-11-30.yang
similarity index 80%
rename from ordmodels/network/src/main/yang/org-openroadm-degree@2017-09-29.yang
rename to ordmodels/network/src/main/yang/org-openroadm-degree@2018-11-30.yang
index b336718f1cecfc3781f39c7763a896c7e6e7a827..01420c5db1ea30afd8ef8f2ad48e8e42162ccd3d 100644 (file)
--- a/ordmodels/network/src/main/yang/org-openroadm-degree@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-degree@2018-11-30.yang
@@ -1,14 +1,15 @@
 module org-openroadm-degree {
+  yang-version 1.1;
   namespace "http://org/openroadm/degree";
   prefix dgr;
 
-  import org-openroadm-common-types {
-    prefix org-openroadm-common-types;
-    revision-date 2017-09-29;
+  import org-openroadm-common-link-types {
+    prefix org-openroadm-common-link-types;
+    revision-date 2018-11-30;
   }
   import org-openroadm-network-types {
     prefix org-openroadm-network-types;
-    revision-date 2017-09-29;
+    revision-date 2018-11-30;
   }
 
   organization
@@ -20,7 +21,7 @@ module org-openroadm-degree {
 
 
      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016,
-     AT&T Intellectual Property.  All other rights reserved.
+     All other rights reserved.
 
      Redistribution and use in source and binary forms, with or without modification,
      are permitted provided that the following conditions are met:
@@ -45,6 +46,26 @@ module org-openroadm-degree {
      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.";
 
+  revision 2018-11-30 {
+    description
+      "Version 4.1.0";
+  }
+  revision 2018-09-28 {
+    description
+      "Version 4.0.0";
+  }
+  revision 2018-05-30 {
+    description
+      "Version 3.1.0";
+  }
+  revision 2018-03-30 {
+    description
+      "Version 3.0.0";
+  }
+  revision 2017-12-15 {
+    description
+      "Version 2.2";
+  }
   revision 2017-09-29 {
     description
       "Version 2.1";
@@ -66,11 +87,10 @@ module org-openroadm-degree {
     description
       "This list is created to accommodate fixed grid (1.2.1) as well as flex grid (2.0 above). In case of fixed grid
        index number will refer to one of the 96 WL defined in the wavelength map file. In case of flex grid this
-      will hold list of used spectrums";
+       will hold list of used spectra";
     list used-wavelengths {
       key "index";
       uses org-openroadm-network-types:wavelengths;
-
     }
   }
 
@@ -87,23 +107,23 @@ module org-openroadm-degree {
     }
     list available-wavelengths {
       key "index";
-      uses org-openroadm-network-types:wavelengths;
-     description
+      description
         "This list is created to accommodate fixed grid (1.2.1) as well as flex grid (2.0 above). In case of fixed grid
-      index number will refer to one of the 96 WL defined in the wavelength map file. In case of flex grid this
-      will hold list of available spectrums";
+         index number will refer to one of the 96 WL defined in the wavelength map file. In case of flex grid this
+         will hold list of available spectra";
+      uses org-openroadm-network-types:wavelengths;
     }
     leaf ingress-span-loss-aging-margin {
-      type org-openroadm-common-types:ratio-dB;
+      type org-openroadm-common-link-types:ratio-dB;
+      config true;
       description
         "Span-loss margin extracted from corresponding device OTS interface container, optional";
-      config true;
     }
     leaf eol-max-load-pIn {
-      type org-openroadm-common-types:power-dBm;
+      type org-openroadm-common-link-types:power-dBm;
+      config true;
       description
         "End Of Life Total input power at maximum load extracted from corresponding device OTS interface container";
-      config true;
     }
   }
 }