Merge pull request #46 from svachhaniatt/7.0.0

Release 7.0.0
OpenROADM · Apr 4, 2020 · 5a7cb7f · 5a7cb7f
2 parents 4eb477f + e85e1dc
commit 5a7cb7f
Show file tree

Hide file tree

Showing 76 changed files with 3,861 additions and 3,105 deletions.
diff --git a/model/Common/org-openroadm-alarm.yang b/model/Common/org-openroadm-alarm.yang
@@ -8,11 +8,11 @@ module org-openroadm-alarm {
   }
   import org-openroadm-resource {
     prefix org-openroadm-resource;
-    revision-date 2019-11-29;
+    revision-date 2020-03-27;
   }
   import org-openroadm-probable-cause {
     prefix org-openroadm-probable-cause;
-    revision-date 2019-11-29;
+    revision-date 2020-03-27;
   }
 
   organization
@@ -48,6 +48,10 @@ module org-openroadm-alarm {
      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.";
 
+  revision 2020-03-27 {
+    description
+      "Version 7.0.0";
+  }
   revision 2019-11-29 {
     description
       "Version 6.1.0";
@@ -169,6 +173,7 @@ module org-openroadm-alarm {
       "Notification sent on initial alarm creation, as well as any time the alarm changes state, including clear";
     uses alarm;
   }
+
   container active-alarm-list {
     config false;
     description

diff --git a/model/Common/org-openroadm-common-attributes.yang b/model/Common/org-openroadm-common-attributes.yang
@@ -4,7 +4,7 @@ module org-openroadm-common-attributes {
 
   import org-openroadm-otn-common-types {
     prefix org-openroadm-otn-common-types;
-    revision-date 2019-11-29;
+    revision-date 2020-03-27;
   }
 
   organization
@@ -40,6 +40,10 @@ module org-openroadm-common-attributes {
       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
       POSSIBILITY OF SUCH DAMAGE";
 
+  revision 2020-03-27 {
+    description
+      "Version 7.0.0";
+  }
   revision 2019-11-29 {
     description
       "Version 6.1.0";

diff --git a/model/Common/org-openroadm-common-link-types.yang b/model/Common/org-openroadm-common-link-types.yang
@@ -89,6 +89,7 @@ module org-openroadm-common-link-types {
     }
     description
       "Optical Control Mode: identifies specific algorithm related to power management and general optical control.";
-    reference "openroadm.org: Open ROADM MSA Specification.";
+    reference
+      "openroadm.org: Open ROADM MSA Specification.";
   }
 }
diff --git a/model/Common/org-openroadm-common-optical-channel-types.yang b/model/Common/org-openroadm-common-optical-channel-types.yang
@@ -35,6 +35,10 @@ module org-openroadm-common-optical-channel-types {
       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
       POSSIBILITY OF SUCH DAMAGE";
 
+  revision 2020-03-27 {
+    description
+      "Version 7.0.0";
+  }
   revision 2019-11-29 {
     description
       "Version 6.1.0";
@@ -66,7 +70,6 @@ module org-openroadm-common-optical-channel-types {
   }
 
   identity otsi-rate-identity {
-    status deprecated;
     description
       "A unique OTSi rate identification";
   }
@@ -100,14 +103,6 @@ module org-openroadm-common-optical-channel-types {
        G.709.1 FlexO-SR)";
   }
 
-  identity flexo-otsi-rate-identity {
-    description
-      "A unique rate identification. Applicable to specify OTSi rate. Also
-       applicable to FOIC rate when associated with FlexO processing
-       (G.709.3 FlexO-LR Table 11-2, G.709.1 FlexO-SR clause 9.2.2
-        Table 11-1, 12-1, 13-1) and G.Sup58.";
-  }
-
   identity foic1.2 {
     base foic-identity;
     description
@@ -150,58 +145,22 @@ module org-openroadm-common-optical-channel-types {
       "Applicable to the FlexO type defined in G.Sup58";
   }
 
-  identity R1T-flexo-otsi {
-    base flexo-otsi-rate-identity;
-    description
-      "Applicable instance for flexo/otsi rate identity";
-  }
-
-  identity R900G-flexo-otsi {
-    base flexo-otsi-rate-identity;
-    description
-      "Applicable instance for flexo/otsi rate identity";
-  }
-
-  identity R800G-flexo-otsi {
-    base flexo-otsi-rate-identity;
-    description
-      "Applicable instance for flexo/otsi rate identity";
-  }
-
-  identity R700G-flexo-otsi {
-    base flexo-otsi-rate-identity;
+  identity R400G-otsi {
+    base otsi-rate-identity;
     description
-      "Applicable instance for flexo/otsi rate identity";
-  }
-
-  identity R600G-flexo-otsi {
-    base flexo-otsi-rate-identity;
-    description
-      "Applicable instance for flexo/otsi rate identity";
-  }
-
-  identity R500G-flexo-otsi {
-    base flexo-otsi-rate-identity;
-    description
-      "Applicable instance for flexo/otsi rate identity";
-  }
-
-  identity R400G-flexo-otsi {
-    base flexo-otsi-rate-identity;
-    description
-      "Applicable instance for flexo/otsi rate identity";
+      "Applicable instance for otsi rate identity";
   }
 
-  identity R300G-flexo-otsi {
-    base flexo-otsi-rate-identity;
+  identity R300G-otsi {
+    base otsi-rate-identity;
     description
-      "Applicable instance for flexo/otsi rate identity";
+      "Applicable instance for otsi rate identity";
   }
 
-  identity R200G-flexo-otsi {
-    base flexo-otsi-rate-identity;
+  identity R200G-otsi {
+    base otsi-rate-identity;
     description
-      "Applicable instance for flexo/otsi rate identity";
+      "Applicable instance for otsi rate identity";
   }
 
   identity R200G {
@@ -210,10 +169,10 @@ module org-openroadm-common-optical-channel-types {
       "Identity for 200G Rate";
   }
 
-  identity R100G-flexo-otsi {
-    base flexo-otsi-rate-identity;
+  identity R100G-otsi {
+    base otsi-rate-identity;
     description
-      "Applicable instance for otsi/flexo rate identity";
+      "Applicable instance for otsi rate identity";
   }
 
   identity R100G {
@@ -223,13 +182,13 @@ module org-openroadm-common-optical-channel-types {
   }
 
   identity R56G-foic-otsi {
-    base flexo-otsi-rate-identity;
+    base otsi-rate-identity;
     description
       "Applicable instance for otsi rate identity";
   }
 
   identity R28G-foic-otsi {
-    base flexo-otsi-rate-identity;
+    base otsi-rate-identity;
     description
       "Applicable instance for otsi rate identity";
   }

diff --git a/model/Common/org-openroadm-common-types.yang b/model/Common/org-openroadm-common-types.yang
@@ -35,6 +35,10 @@ module org-openroadm-common-types {
       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
       POSSIBILITY OF SUCH DAMAGE";
 
+  revision 2020-03-27 {
+    description
+      "Version 7.0.0";
+  }
   revision 2019-11-29 {
     description
       "Version 6.1.0";
@@ -217,6 +221,11 @@ module org-openroadm-common-types {
         description
           "value for 6.1";
       }
+      enum 7.0 {
+        value 15;
+        description
+          "value for 7.0";
+      }
     }
     description
       "OpenROADM version enum type";
@@ -267,4 +276,30 @@ module org-openroadm-common-types {
                 Range 16 | 32 | 64 | 128 | 512 | 1024. Default: 16";
     }
   }
+
+  identity otn-protection-type {
+    description
+      "OTN base protection identity from which
+         specific protection types are derived.";
+  }
+
+  typedef tcm-direction-capability-type {
+    type enumeration {
+      enum up-tcm {
+        description
+          "Port supports up TCM termination, e.g., direction facing the switch fabric";
+      }
+      enum down-tcm {
+        description
+          "Port supports down TCM termination, e.g., direction facing out of the equipment ";
+      }
+      enum up-down-tcm {
+        description
+          "Port supports both up and down TCM terminations";
+      }
+    }
+    description
+      "TCM direction capability for the port";
+  }
+
 }
diff --git a/model/Common/org-openroadm-manifest-file.yang b/model/Common/org-openroadm-manifest-file.yang
@@ -49,6 +49,10 @@ module org-openroadm-manifest-file {
      Section 4.e of the Trust Legal Provisions and are provided without warranty as
      described in the Simplified BSD License.";
 
+  revision 2020-03-27 {
+    description
+      "Version 7.0.0";
+  }
   revision 2019-11-29 {
     description
       "Version 6.1.0";
@@ -68,7 +72,8 @@ module org-openroadm-manifest-file {
   revision 2017-09-29 {
     description
       "Version 2.1";
-    reference "This module serves as the manifest file reference.";
+    reference
+      "This module serves as the manifest file reference.";
   }
 
   identity manifest-commands {
@@ -112,6 +117,12 @@ module org-openroadm-manifest-file {
       "sw-activate sw-manifest-command";
   }
 
+  identity cancel-validation-timer {
+    base sw-manifest-commands;
+    description
+      "cancel-validation-timer sw-manifest-command";
+  }
+
   identity db-backup-manifest-commands {
     base manifest-commands;
     description
@@ -142,6 +153,12 @@ module org-openroadm-manifest-file {
       "db-activate db-restore-manifest-command";
   }
 
+  identity cancel-rollback-timer {
+    base db-restore-manifest-commands;
+    description
+      "cancel-rollback-timer db-restore-manifest-command";
+  }
+
   grouping base-manifest {
     description
       "base set of variables in all manifest files";
@@ -441,6 +458,17 @@ module org-openroadm-manifest-file {
     }
   }
 
+  grouping wait-time-command {
+    description
+      "Wait timer starting from the completion of sw-activate or db-activate before canceling the validation timer or rollback timer";
+    leaf wait-time {
+      type uint16;
+      mandatory true;
+      description
+        "See command for detailed description.";
+    }
+  }
+
   grouping sw-activate-command {
     description
       "sw-activate-command";
@@ -514,6 +542,32 @@ module org-openroadm-manifest-file {
     }
   }
 
+  grouping cancel-validation-timer-command {
+    description
+      "cancel-validation-timer-command";
+    container cancel-validation-timer {
+      when "../command = 'cancel-validation-timer'";
+      description
+        "Command to automatically cancel the validation timer after wait-time.
+         Accept will be set to True if this command is used.
+
+         format:  cancel-validation-timer wait-time [time-out]
+         where:
+
+           wait-time - wait timer starting from the completion of
+           sw-activate before canceling the validation timer.
+
+           timeout - see timeout-command grouping for basic details.
+
+         Expected notifications: sw-activate-notification
+           commit notification is expected.
+        ";
+      uses wait-time-command;
+      uses timeout-command;
+      uses is-async-command;
+    }
+  }
+
   grouping db-backup-command {
     description
       "db-backup-command";
@@ -582,6 +636,31 @@ module org-openroadm-manifest-file {
     }
   }
 
+  grouping cancel-rollback-timer-command {
+    description
+      "cancel-rollback-timer-command";
+    container cancel-rollback-timer {
+      when "../command = 'cancel-rollback-timer'";
+      description
+        "Command to automatically cancel the rollback timer after wait-time.
+         Accept will be set to True if this command is used.
+
+         format: cancel-rollback-timer wait-time [timeout]
+
+           wait-time - Wait timer starting from the completion of
+           db-activate before canceling the rollback timer.
+
+           timeout - see timeout-command grouping for basic details.
+
+         Expected notifications: db-activate-notification
+           commit notification is expected.
+        ";
+      uses wait-time-command;
+      uses timeout-command;
+      uses is-async-command;
+    }
+  }
+
   grouping db-activate-command {
     description
       "db-activate-command";
@@ -766,6 +845,7 @@ module org-openroadm-manifest-file {
           uses delete-file-command;
           uses sw-stage-command;
           uses sw-activate-command;
+          uses cancel-validation-timer-command;
         }
       }
     }
@@ -939,6 +1019,7 @@ module org-openroadm-manifest-file {
         uses delete-file-command;
         uses db-restore-command;
         uses db-activate-command;
+        uses cancel-rollback-timer-command;
       }
     }
   }