Upgrade Network model from 2.1 to 4.1

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

diff --git a/ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2018-11-30.yang
similarity index 73%
rename from ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2017-09-29.yang
rename to ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2018-11-30.yang
index 5f9b6d8e4ecfa28faca721ded1d5c1b9ffddd9ae..c14f9dd51329b36c98e8e08f991e668dced3affb 100644 (file)
--- a/ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2018-11-30.yang
@@ -1,10 +1,19 @@
 module org-openroadm-external-pluggable {
+  yang-version 1.1;
   namespace "http://org/openroadm/external/pluggable";
   prefix plg;
 
-  import org-openroadm-common-types {
-    prefix org-openroadm-common-types;
-    revision-date 2017-09-29;
+  import org-openroadm-common-equipment-types {
+    prefix org-openroadm-common-equipment-types;
+    revision-date 2018-11-30;
+  }
+  import org-openroadm-common-state-types {
+    prefix org-openroadm-common-state-types;
+    revision-date 2018-11-30;
+  }
+  import org-openroadm-common-optical-channel-types {
+    prefix org-openroadm-common-optical-channel-types;
+    revision-date 2018-11-30;
   }
 
   organization
@@ -16,7 +25,7 @@ module org-openroadm-external-pluggable {
 
 
      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:
@@ -41,6 +50,26 @@ module org-openroadm-external-pluggable {
      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";
@@ -85,19 +114,19 @@ module org-openroadm-external-pluggable {
   grouping pluggable-tp-attributes {
     leaf rate {
       type identityref {
-        base org-openroadm-common-types:och-rate-identity;
+        base org-openroadm-common-optical-channel-types:och-rate-identity;
       }
       description
         "rate";
     }
     leaf modulation-format {
-      type org-openroadm-common-types:modulation-format;
+      type org-openroadm-common-optical-channel-types:modulation-format;
     }
     leaf optic {
-      type org-openroadm-common-types:optic-types;
+      type org-openroadm-common-equipment-types:optic-types;
     }
     leaf state {
-      type org-openroadm-common-types:state;
+      type org-openroadm-common-state-types:state;
       description
         "A xponder can be in one of the following
                states";