Upgrade Network model from 2.1 to 4.1

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

diff --git a/ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang b/ordmodels/network/src/main/yang/org-openroadm-xponder@2018-11-30.yang
similarity index 74%
rename from ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang
rename to ordmodels/network/src/main/yang/org-openroadm-xponder@2018-11-30.yang
index d6934d2be20483763775dc3ea72d9c2270d94ee8..124221e1dc0ec3d3a1a012c9c1826d7292129d1b 100644 (file)
--- a/ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-xponder@2018-11-30.yang
@@ -1,26 +1,27 @@
 module org-openroadm-xponder {
+  yang-version 1.1;
   namespace "http://org/openroadm/xponder";
   prefix xpndr;
 
-  import ietf-network {
-    prefix nd;
-    revision-date 2015-06-08;
-  }
-  import ietf-network-topology {
-    prefix nwt;
-    revision-date 2015-06-08;
-  }
   import org-openroadm-network-types {
     prefix org-openroadm-network-types;
-    revision-date 2017-09-29;
+    revision-date 2018-11-30;
+  }
+  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-types {
-    prefix org-openroadm-common-types;
-    revision-date 2017-09-29;
+  import org-openroadm-common-optical-channel-types {
+    prefix org-openroadm-common-optical-channel-types;
+    revision-date 2018-11-30;
   }
   import org-openroadm-otn-common-types {
     prefix org-openroadm-otn-common-types;
-    revision-date 2017-09-29;
+    revision-date 2018-11-30;
   }
 
   organization
@@ -31,7 +32,7 @@ module org-openroadm-xponder {
     "YANG definitions for xponder
 
      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:
@@ -56,6 +57,26 @@ module org-openroadm-xponder {
      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";
@@ -93,19 +114,19 @@ module org-openroadm-xponder {
     }
     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";
@@ -114,7 +135,7 @@ module org-openroadm-xponder {
 
   grouping xpdr-port-connection-attributes {
     container wavelength {
-      uses org-openroadm-network-types:wavelengths;
+      uses org-openroadm-network-types:flex-wave;
     }
     leaf tail-equipment {
       type string;
@@ -127,30 +148,6 @@ module org-openroadm-xponder {
     }
   }
 
-  grouping xpdr-otn-tail-attributes {
-    leaf tp-id {
-      type nwt:tp-id;
-    }
-    leaf network-ref {
-      type leafref {
-        path "/nd:network/nd:network-id";
-      }
-      description
-        "Used to reference a network, for example an underlay
-         network.";
-    }
-    leaf node-ref {
-      type leafref {
-        path "/nd:network[nd:network-id=current()/../network-ref]"+
-          "/nd:node/nd:node-id";
-      }
-      description
-        "Used to reference a node.
-         Nodes are identified relative to the network they are
-         contained in.";
-    }
-  }
-
   grouping xpdr-otn-tp-attributes {
     leaf rate {
       type identityref {
@@ -170,16 +167,15 @@ module org-openroadm-xponder {
           "ODTU type, part of the MSI (Multiplex Structure Identifier)";
       }
       leaf-list tpn-pool {
-        type uint8;
+        type uint16;
         description
-          "Tributary Port Number (0-based), part of the MSI";
+          "List of available Tributary Port Number (0-based), part of the MSI";
       }
     }
     leaf-list ts-pool {
-        type uint16;
+      type uint16;
       description
-        "Timeslots used by port";
+        "List of available Tributary Slots used by port";
     }
   }
-
 }