Upgrade to OpenROADM 7.1.0 network models

[transportpce.git] / ordmodels / network / src / main / yang / org-openroadm-xponder@2020-05-29.yang

diff --git a/ordmodels/network/src/main/yang/org-openroadm-xponder@2018-11-30.yang b/ordmodels/network/src/main/yang/org-openroadm-xponder@2020-05-29.yang
similarity index 56%
rename from ordmodels/network/src/main/yang/org-openroadm-xponder@2018-11-30.yang
rename to ordmodels/network/src/main/yang/org-openroadm-xponder@2020-05-29.yang
index 124221e1dc0ec3d3a1a012c9c1826d7292129d1b..27341902e3da873b78aff80190a6c1ff6146be4f 100644 (file)
--- a/ordmodels/network/src/main/yang/org-openroadm-xponder@2018-11-30.yang
+++ b/ordmodels/network/src/main/yang/org-openroadm-xponder@2020-05-29.yang
@@ -5,23 +5,27 @@ module org-openroadm-xponder {
 
   import org-openroadm-network-types {
     prefix org-openroadm-network-types;
-    revision-date 2018-11-30;
+    revision-date 2020-05-29;
   }
   import org-openroadm-common-equipment-types {
     prefix org-openroadm-common-equipment-types;
-    revision-date 2018-11-30;
+    revision-date 2019-11-29;
   }
   import org-openroadm-common-state-types {
     prefix org-openroadm-common-state-types;
-    revision-date 2018-11-30;
+    revision-date 2019-11-29;
   }
   import org-openroadm-common-optical-channel-types {
     prefix org-openroadm-common-optical-channel-types;
-    revision-date 2018-11-30;
+    revision-date 2020-05-29;
   }
   import org-openroadm-otn-common-types {
     prefix org-openroadm-otn-common-types;
-    revision-date 2018-11-30;
+    revision-date 2020-03-27;
+  }
+  import org-openroadm-service-format {
+    prefix org-openroadm-service-format;
+    revision-date 2019-11-29;
   }
 
   organization
@@ -57,6 +61,30 @@ 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 2020-05-29 {
+    description
+      "Version 7.1.0";
+  }
+  revision 2020-03-27 {
+    description
+      "Version 7.0.0";
+  }
+  revision 2019-11-29 {
+    description
+      "Version 6.1.0";
+  }
+  revision 2019-09-27 {
+    description
+      "Version 6.0.0";
+  }
+  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";
@@ -114,7 +142,7 @@ module org-openroadm-xponder {
     }
     leaf rate {
       type identityref {
-        base org-openroadm-common-optical-channel-types:och-rate-identity;
+        base org-openroadm-common-optical-channel-types:optical-rate-identity;
       }
       description
         "rate";
@@ -139,9 +167,15 @@ module org-openroadm-xponder {
     }
     leaf tail-equipment {
       type string;
+      description
+        "Type of equipment connected to the tail
+         for example packet box";
     }
     leaf tail-equipment-id {
       type string;
+      description
+        "Identifier of equipment connected to the
+         tail for example client equipement ID";
     }
     leaf tail-clfi {
       type string;
@@ -178,4 +212,83 @@ module org-openroadm-xponder {
         "List of available Tributary Slots used by port";
     }
   }
+
+  grouping xpdr-mode-attributes {
+    container supported-operational-modes {
+      list operational-mode {
+        key "mode-id";
+        description
+          "list of supported operational modes";
+        leaf mode-id {
+          type string;
+          description
+            "Optical profile operational mode identifier";
+        }
+        leaf spectral-width {
+          type org-openroadm-common-optical-channel-types:frequency-GHz;
+          units "GHz";
+          description
+            "The required minimum signal spectral width of signal at -22 dbm.";
+        }
+      }
+    }
+    leaf operational-mode {
+      type string;
+      config true;
+      description
+        "The provisioned operational-mode of the equipment.";
+    }
+  }
+
+  grouping supported-client-services {
+    container supported-client-services {
+      list supported-client-service {
+        key "service-format";
+        description
+          "Supported Client Services";
+        leaf service-format {
+          type org-openroadm-service-format:service-format;
+          description
+            "Format of the requested service: Ethernet, OTU, etc.";
+        }
+        leaf-list service-rate {
+          type uint32;
+          description
+            "Rate of the requested service in GBps. Not used when service-format=other.";
+        }
+        leaf-list other-service-format-and-rate {
+          type string;
+          description
+            "Used when service-format is set to other in the bookend xponder use case.
+             The use of other-service-format-and-rate is not standardized in the Open ROADM MSA
+             and intended to allow the controller to support non-Open ROADM service formats.
+             This value encodes both the service format and the rate supported.
+             This field should not be specified when service format != other.";
+        }
+      }
+    }
+    uses provisioned-client-service;
+  }
+
+  grouping provisioned-client-service {
+    leaf service-format {
+      type org-openroadm-service-format:service-format;
+      description
+        "Format of the provisioned service: Ethernet, OTU, etc.";
+    }
+    leaf service-rate {
+      type uint32;
+      description
+        "Provisioned rate of the requested service in GBps. Not used when service-format=other.";
+    }
+    leaf other-service-format-and-rate {
+      type string;
+      description
+        "Used when service-format is set to other in the bookend xponder use case.
+         The use of other-service-format-and-rate is not standardized in the Open ROADM MSA
+         and intended to allow the controller to support non-Open ROADM service formats.
+         This value encodes the provisioned service format and the rate supported.
+         This field should not be specified when service format != other.";
+    }
+  }
 }