X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=sim%2Fo1-interface.git;a=blobdiff_plain;f=ntsimulator%2Fdeploy%2Fo-ran-ru-fh%2Fyang%2Fo-ran-usermgmt.yang;fp=ntsimulator%2Fdeploy%2Fo-ran-ru-fh%2Fyang%2Fo-ran-usermgmt%402020-12-10.yang;h=8d97db38db9a60b776af6783d89332aad81f82d9;hp=ed6f39a96d0faef25054255faf10884b9d168970;hb=f57d4764e3f681d216088f07088366a58f9adba3;hpb=7ff0c8ce9187702caa356c0c1f30064c65c1f512

diff --git a/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-usermgmt@2020-12-10.yang b/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-usermgmt.yang
similarity index 82%
rename from ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-usermgmt@2020-12-10.yang
rename to ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-usermgmt.yang
index ed6f39a..8d97db3 100644
--- a/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-usermgmt@2020-12-10.yang
+++ b/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-usermgmt.yang
@@ -9,6 +9,10 @@ module o-ran-usermgmt {
       "RFC 8341: Network Configuration Access Control Model";
   }
 
+  import o-ran-wg4-features {
+    prefix "feat";
+  }
+
   organization "O-RAN Alliance";
 
   contact
@@ -43,6 +47,25 @@ module o-ran-usermgmt {
     contributors may be used to endorse or promote products derived from
     this software without specific prior written permission.";
 
+  revision "2022-08-15" {
+    description
+      "version 10.0.0
+
+      1) introduced SHARED-ORU-MULTI-OPERATOR feature.";
+
+    reference "ORAN-WG4.M.0-v10.00";
+  }
+
+
+  revision "2021-12-01" {
+    description
+      "version 1.3.0
+
+      1) typographical corrections in descriptions";
+
+    reference "ORAN-WG4.M.0-v01.00";
+  }
+
   revision "2020-12-10" {
     description
       "version 1.2.0
@@ -91,6 +114,7 @@ module o-ran-usermgmt {
   }
 
   grouping user-list {
+    description "a user list grouping";
     list user {
       key "name";
       description
@@ -111,10 +135,11 @@ module o-ran-usermgmt {
             description "the user-name is for password based authentication";
           }
           enum CERTIFICATE {
-            description "the user-name is for certificate based authentciation";
+            description "the user-name is for certificate based authentication";
           }
         }
         default "PASSWORD";
+        description "the account type";
       }
 
       leaf password {
@@ -139,15 +164,24 @@ module o-ran-usermgmt {
            This validation statement is included in the YANG description and
            not in a MUST statement to preserve backwards compatibility.";
       }
+      leaf-list sro-id {
+        if-feature feat:SHARED-ORU-MULTI-OPERATOR;
+        type string;
+        description
+          "An optional list if Shared Resource Operator identities associated with the
+          user-account. Used to realize enhanced access privileges in a shared O-RU.
+          When an sro-id is configured in the O-RU, the O-RU shall
+          implement additional sro-id based NETCONF access control
+          as specified in O-RAN.WG4.MP.0-v10.00.
+          The O-RU does not further interpret the specific value of sro-id.";
+      }
     }
   }
 
   container users {
-    // checkAS
-    // must "user/enabled='true'" {
-    //   error-message "At least one account needs to be enabled.";
-    // }
-
+    must "user/enabled='true'" {
+      error-message "At least one account needs to be enabled.";
+    }
     //TAKE NOTE - any configuration with zero enabled users is invalid.
     //This will typically be the case when using a simulated NETCONF Server
     //and so this constraint should be removed when operating in those scenarios
@@ -160,6 +194,7 @@ module o-ran-usermgmt {
   }
 
   rpc chg-password {
+    description "the RPC used to change a password";
     nacm:default-deny-all;
     input {
       leaf currentPassword {
@@ -186,9 +221,11 @@ module o-ran-usermgmt {
         type enumeration {
           enum "Successful" {
             value 1;
+            description "change password operation is successful";
           }
           enum "Failed" {
             value 2;
+            description "change password operation failed";
           }
         }
         mandatory true;