upgrade models to OpenROADM service 5.1.0

[transportpce.git] / ordmodels / service / src / main / yang / org-openroadm-topology@2019-05-31.yang

diff --git a/ordmodels/service/src/main/yang/org-openroadm-topology@2016-10-14.yang b/ordmodels/service/src/main/yang/org-openroadm-topology@2019-05-31.yang
similarity index 62%
rename from ordmodels/service/src/main/yang/org-openroadm-topology@2016-10-14.yang
rename to ordmodels/service/src/main/yang/org-openroadm-topology@2019-05-31.yang
index ecce6aca41e56793399ebb9fe5d6cb62741bff2d..656af2d74d25915afacd8c69962683aac3c19f74 100644 (file)
--- a/ordmodels/service/src/main/yang/org-openroadm-topology@2016-10-14.yang
+++ b/ordmodels/service/src/main/yang/org-openroadm-topology@2019-05-31.yang
@@ -4,7 +4,11 @@ module org-openroadm-topology {
 
   import org-openroadm-resource {
     prefix org-openroadm-resource;
-    revision-date 2016-10-14;
+    revision-date 2019-05-31;
+  }
+  import org-openroadm-network-resource {
+    prefix org-openroadm-network-resource;
+    revision-date 2018-11-30;
   }
 
   organization
@@ -15,7 +19,7 @@ module org-openroadm-topology {
     "YANG definitions of topology.
 
       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:
@@ -40,6 +44,42 @@ module org-openroadm-topology {
       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
       POSSIBILITY OF SUCH DAMAGE";
 
+  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";
+  }
+  revision 2018-09-28 {
+    description
+      "Version 4.0.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";
+  }
+  revision 2017-07-28 {
+    description
+      "Version 2.0.1 - added revision-date to imports";
+  }
+  revision 2017-06-26 {
+    description
+      "Version 2.0";
+  }
   revision 2016-10-14 {
     description
       "Version 1.2";
@@ -50,23 +90,23 @@ module org-openroadm-topology {
       "Topology reports the individual hops along the service in the A to Z direction and Z to A directions.  This includes both ports internal to a device and those
        at its edge that are available for externally connections. It includes both physical and logical ports.
        Physical ports are ordered with the logical ports that run over them as follows:
-       a.\tOn ingress to a node/card, physical then logical
-       b.\tOn egress to a node/card, logical then physical";
+       a.\t On ingress to a node/card, physical then logical
+       b.\t On egress to a node/card, logical then physical";
     list aToZ {
       key "id";
       leaf id {
-        description
-          "Unigue identifier for this topology component within this service";
         type string;
+        description
+          "Unique identifier for this topology component within this service";
       }
       uses hop;
     }
     list zToA {
       key "id";
       leaf id {
-        description
-          "Unigue identifier for this topology component within this service";
         type string;
+        description
+          "Unique identifier for this topology component within this service";
       }
       uses hop;
     }
@@ -76,17 +116,44 @@ module org-openroadm-topology {
     leaf hop-type {
       type enumeration {
         enum "node-external" {
+          value 1;
           description
             "The given resource is on the edge of the node, and used in relationships to resources outside of the node.";
-          value 1;
         }
         enum "node-internal" {
+          value 2;
           description
             "The given resource is internally to the node";
-          value 2;
         }
       }
     }
-    uses org-openroadm-resource:resource;
+    uses org-openroadm-resource:resource {
+      augment "resource/resource/interface" {
+        uses org-openroadm-resource:resource-reporting;
+      }
+    }
+  }
+
+  grouping network-topology {
+    description
+      "network-topology defines the ordered a-to-z and z-to-a topology in terms of network model entities: tp-id and link-id";
+    list a-to-z {
+      key "id";
+      leaf id {
+        type string;
+        description
+          "Unique identifier for this network-topology component within this service";
+      }
+      uses org-openroadm-network-resource:network-resource;
+    }
+    list z-to-a {
+      key "id";
+      leaf id {
+        type string;
+        description
+          "Unigue identifier for this network-topology component within this service";
+      }
+      uses org-openroadm-network-resource:network-resource;
+    }
   }
 }