Bug fixes in o-ran-sc-du-hello-world yang

- require-instance false for 'performance-metrics'
- 'job-tag' must not be a string of a fixed size
- string pattern with '^' and '$' is not required
- new revision is required.

IssueID: OAM-237
Change-Id: I97cacd27f71ce9608aad9f0cfd0c55f03745354f
Signed-off-by: demx8as6 <martin.skorupski@highstreet-technologies.com>

diff --git a/data-model/yang/working/o-ran-sc/o-ran-du/o-ran-sc-du-hello-world.yang b/data-model/yang/working/o-ran-sc/o-ran-du/o-ran-sc-du-hello-world.yang
index e0ba2af..74351c8 100644 (file)
--- a/data-model/yang/working/o-ran-sc/o-ran-du/o-ran-sc-du-hello-world.yang
+++ b/data-model/yang/working/o-ran-sc/o-ran-du/o-ran-sc-du-hello-world.yang
@@ -49,10 +49,16 @@ module o-ran-sc-du-hello-world {
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.";
-  reference 
+  reference
     "3GPP TS 28.541 5G Network Resource Model (NRM)
      OPNFV VES - https://wiki.opnfv.org/display/ves";
 
+  revision 2021-11-23 {
+    description
+      "Bug fixes.";
+    reference
+      "https://jira.o-ran-sc.org/browse/OAM-237";
+  }
   revision 2021-10-29 {
     description
       "Performance management added.";
@@ -278,7 +284,7 @@ module o-ran-sc-du-hello-world {
 
   typedef mobile-country-code-type {
     type string {
-      pattern '^[02-79][0-9][0-9]$';
+      pattern '[02-79][0-9][0-9]';
     }
     description
       "The mobile country code consists of three decimal digits,
@@ -290,7 +296,7 @@ module o-ran-sc-du-hello-world {
 
   typedef mobile-network-code-type {
     type string {
-      pattern '^[0-9]{2,3}$';
+      pattern '[0-9]{2,3}';
     }
     description
       "The mobile network code consists of two or three
@@ -760,14 +766,16 @@ module o-ran-sc-du-hello-world {
       "An abstract object class representing a performance-measurement-job";
     leaf job-tag {
       type string {
-        length "255";
+        length "1..255";
       }
       description
         "A job group identifier to combine several performance-measurement-jobs
          to one logical job.";
     }
     leaf-list performance-metrics {
-      type instance-identifier;
+      type instance-identifier {
+        require-instance false;
+      }
       min-elements 1;
       description
         "Performance metrics (or performance measurement counter values)
@@ -821,18 +829,18 @@ module o-ran-sc-du-hello-world {
   }
 
   grouping performance-monitoring-point-grp {
-    description 
+    description
       "An abstract object class providing monitoring and control functions for
-       performance measurements. Such grouping should be used by the monitoring 
+       performance measurements. Such grouping should be used by the monitoring
        object.";
     list supported-measurements {
-      config false;
       key "performance-measurement-type";
+      config false;
       uses supported-measurement-grp;
       description
-        "A list of performance measurements object providing the 
+        "A list of performance measurements object providing the
          measurement-types (counters) and its potential subcounters. The values
-         ar provided by the combination of the event subscription and 
+         ar provided by the combination of the event subscription and
          performance-measurement-job concepts.";
     }
   }
@@ -1162,8 +1170,9 @@ module o-ran-sc-du-hello-world {
       "An action to establish the connection to a remote network function.";
     input {
       leaf remote-network-function {
-        type o-ru-reference;
+        type o-ru-reference;        
         mandatory true;
+        status obsolete;
         description
           "An reference to a remote network function - an O-RU - to which
            a connection should be established.";
@@ -1180,8 +1189,9 @@ module o-ran-sc-du-hello-world {
       "An action to destroy the connection to a remote network function.";
     input {
       leaf remote-network-function {
-        type o-ru-reference;
+        type o-ru-reference;        
         mandatory true;
+        status obsolete;
         description
           "An reference to a remote network function - an O-RU - to which
            the connection should be destroyed.";