X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=sim%2Fo1-interface.git;a=blobdiff_plain;f=ntsimulator%2Fyang%2Fo-ran%2Fru-fh%2Fo-ran-operations.yang;h=0623202c4eeedf66480edf94b42bb0f4ff79e35a;hp=19cfdbc5274a5f91564abf6d9a457885195d8625;hb=226e12e7c9b504dc32fcf71f97483bb97195643d;hpb=b8166cdc5294cdee0c717085d659b4a8f0834313

diff --git a/ntsimulator/yang/o-ran/ru-fh/o-ran-operations.yang b/ntsimulator/yang/o-ran/ru-fh/o-ran-operations.yang
index 19cfdbc..0623202 100644
--- a/ntsimulator/yang/o-ran/ru-fh/o-ran-operations.yang
+++ b/ntsimulator/yang/o-ran/ru-fh/o-ran-operations.yang
@@ -51,32 +51,43 @@ module o-ran-operations {
     contributors may be used to endorse or promote products derived from
     this software without specific prior written permission.";
 
-  revision "2019-04-08" {
+  revision "2019-07-03" {
     description
-      "version 1.0.2
+      "version 2.0.0
 
-      1) added ru-instance-id ";
+      1) added timezone-name
+      2) added ru-instance-id
+      3) backward compatible changes to introduce groupings.";
 
     reference "ORAN-WG4.M.0-v01.00";
   }
 
-  revision "2019-03-07" {
+  revision "2019-02-04" {
     description
-      "version 1.0.1
+      "version 1.0.0
 
-      1) backward compatible changes to introduce groupings.";
+      1) imported model from xRAN
+      2) changed namespace and reference from xran to o-ran";
 
     reference "ORAN-WG4.M.0-v01.00";
   }
 
-  revision "2019-02-04" {
+
+  typedef timezone-name {
+    type string;
     description
-      "version 1.0.0
+      "A time zone name as used by the Time Zone Database,
+      sometimes referred to as the 'Olson Database'.
 
-      1) imported model from xRAN
-      2) changed namespace and reference from xran to o-ran";
+      The complete set of valid values is defined in
+      https://www.iana.org/time-zones.
 
-    reference "ORAN-WG4.M.0-v01.00";
+      The exact set of supported values is an
+      implementation-specific matter.";
+
+    reference
+      "RFC 6557: Procedures for Maintaining the Time Zone Database
+      IANA Time Zone Database https://www.iana.org/time-zones ";
   }
 
   typedef version {
@@ -100,9 +111,14 @@ module o-ran-operations {
 
       leaf ru-instance-id {
         type string;
+	// [ast] added extra concat, because only 3 params are accepted in NTS
+	// must "re-match(current(), concat(/hw:hardware/hw:component/hw:mfg-name,
+        //  '_', /hw:hardware/hw:component/hw:model-name, '_',
+        //  /hw:hardware/hw:component/hw:serial-num ))";
         must "re-match(current(), concat(concat(/hw:hardware/hw:component/hw:mfg-name,
           '_', /hw:hardware/hw:component/hw:model-name), '_',
           /hw:hardware/hw:component/hw:serial-num))";
+	// [ast] end fix
         description
           "a unique instance identifier that may be used to identify a
           particular hardware instance, e.g., when used performing hierarchical
@@ -205,6 +221,19 @@ module o-ran-operations {
       description
         "System date and time properties used by all working groups.";
 
+      leaf timezone-name {
+        type timezone-name;
+        description
+          "An optional TZ database name to use for the system,
+           such as 'Europe/Stockholm'
+
+           Time zone name is an informative leaf and is NOT used in the
+           managed element to convert local time zone.
+
+           The managed element may include time zone name in measurement or
+           fault data.";
+      }
+
       leaf timezone-utc-offset {
         type int16 {
           range "-720 .. 840";