Upgrade Network model from 2.1 to 4.1

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

diff --git a/ordmodels/network/src/main/yang/org-openroadm-amplifier@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-amplifier@2018-11-30.yang
similarity index 80%
rename from ordmodels/network/src/main/yang/org-openroadm-amplifier@2017-09-29.yang
rename to ordmodels/network/src/main/yang/org-openroadm-amplifier@2018-11-30.yang
index 679da99747f5e9b7a27361656553172385263c1e..2db0c3082261baa8d3c83716bc84b93128231022 100644 (file)
--- a/ordmodels/network/src/main/yang/org-openroadm-amplifier@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-amplifier@2018-11-30.yang
@@ -1,10 +1,15 @@
 module org-openroadm-amplifier {
+  yang-version 1.1;
   namespace "http://org/openroadm/amplifier";
   prefix amp;
 
-  import org-openroadm-common-types {
-    prefix org-openroadm-common-types;
-    revision-date 2017-09-29;
+  import org-openroadm-common-amplifier-types {
+    prefix org-openroadm-common-amplifier-types;
+    revision-date 2018-11-30;
+  }
+  import org-openroadm-common-link-types {
+    prefix org-openroadm-common-link-types;
+    revision-date 2018-11-30;
   }
 
   organization
@@ -16,7 +21,7 @@ module org-openroadm-amplifier {
 
 
      Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2017,
-     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:
@@ -41,6 +46,18 @@ module org-openroadm-amplifier {
      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-03-30 {
+    description
+      "Version 3.0.0";
+  }
+  revision 2017-12-15 {
+    description
+      "Version 2.2";
+  }
   revision 2017-09-29 {
     description
       "Version 2.1";
@@ -58,75 +75,75 @@ module org-openroadm-amplifier {
     description
       "Defines the group of amplifier attributes";
     leaf amp-type {
-      description
-        "Amplifier type";
-      type org-openroadm-common-types:amplifier-types;
+      type org-openroadm-common-amplifier-types:amplifier-types;
       config true;
       mandatory true;
+      description
+        "Amplifier type";
     }
     leaf amp-gain-range {
+      type org-openroadm-common-amplifier-types:amplifier-gain-range;
+      config true;
       description
         "Amplifier gain-range (gain-range 1 to 4 for switched gain amplifiers)
          gain-range-1 for standard amplifiers";
-      type org-openroadm-common-types:amplifier-gain-range;
-      config true;
     }
     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 used to set optical amplifier gain and output-voa
          extracted from corresponding device OTS interface container, optional
          since it concerns only line facing amp";
-      config true;
     }
     leaf gain {
-      type org-openroadm-common-types:ratio-dB;
+      type org-openroadm-common-link-types:ratio-dB;
+      config true;
+      mandatory true;
       description
         "Overall Amplifier Signal gain, excluding ASE, including VOA attenuation
          retrieved from operational value (PM)";
-      config true;
-      mandatory true;
     }
     leaf initially-planned-gain {
-      type org-openroadm-common-types:ratio-dB;
+      type org-openroadm-common-link-types:ratio-dB;
+      config true;
       description
         "Overall Amplifier Signal gain, excluding ASE, including VOA attenuation:
          value coming from planning tool initial design";
-      config true;
     }
     leaf tilt {
-      type org-openroadm-common-types:ratio-dB;
+      type org-openroadm-common-link-types:ratio-dB;
+      config true;
       description
         "Tilt of smart EDFA retrieved from operational value (PM)";
-      config true;
     }
     leaf initially-planned-tilt {
-      type org-openroadm-common-types:ratio-dB;
+      type org-openroadm-common-link-types:ratio-dB;
+      config true;
       description
         "Tilt of smart EDFA:
          value coming from planning tool initial design";
-      config true;
     }
     leaf out-voa-att {
-      type org-openroadm-common-types:ratio-dB;
+      type org-openroadm-common-link-types:ratio-dB;
+      config true;
       description
         "output VOA attenuation";
-      config true;
     }
     leaf initially-planned-out-voa-att {
-      type org-openroadm-common-types:ratio-dB;
+      type org-openroadm-common-link-types:ratio-dB;
+      config true;
       description
         "output VOA attenuation: value coming from planning tool initial design.
          As in R2.0, output VOA can not be configured by controller, this parameter may be used by the controller
          to check that value set by amplifiers is in the range of calculated value and take relevant decision if not";
-      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 used for amplifier and VOA setting
          extracted from corresponding device OTS interface container";
-      config true;
     }
   }
 }