Align O-DU hello-world.yang

Align the O-DU hello-world.yang model to the latest version.

Issue-ID: SIM-66
Change-Id: I14768904aa6b5b3a616b36ee8fb8c44562c052e6
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>

diff --git a/ntsimulator/deploy/o-ran-du/data/o-ran-sc-du-hello-world-operational.xml b/ntsimulator/deploy/o-ran-du/data/o-ran-sc-du-hello-world-operational.xml
index e832268..a383dba 100644 (file)
--- a/ntsimulator/deploy/o-ran-du/data/o-ran-sc-du-hello-world-operational.xml
+++ b/ntsimulator/deploy/o-ran-du/data/o-ran-sc-du-hello-world-operational.xml
@@ -1,14 +1,20 @@
 <network-function xmlns="urn:o-ran-sc:yang:o-ran-sc-du-hello-world">
     <du-to-ru-connection>
       <name>O-RU-1</name>
+      <administrative-state>LOCKED</administrative-state>
+      <operational-state>ENABLED</operational-state>
       <status>connected</status>
     </du-to-ru-connection>
     <du-to-ru-connection>
       <name>O-RU-2</name>
+      <administrative-state>UNLOCKED</administrative-state>
+      <operational-state>ENABLED</operational-state>
       <status>disconnected</status>
     </du-to-ru-connection>
     <du-to-ru-connection>
       <name>O-RU-3</name>
+      <administrative-state>LOCKED</administrative-state>
+      <operational-state>DISABLED</operational-state>
       <status>unable-to-connect</status>
     </du-to-ru-connection>
   </network-function>
\ No newline at end of file

diff --git a/ntsimulator/deploy/o-ran-du/data/o-ran-sc-du-hello-world-running.xml b/ntsimulator/deploy/o-ran-du/data/o-ran-sc-du-hello-world-running.xml
index 756ba3b..e0ed1fd 100644 (file)
--- a/ntsimulator/deploy/o-ran-du/data/o-ran-sc-du-hello-world-running.xml
+++ b/ntsimulator/deploy/o-ran-du/data/o-ran-sc-du-hello-world-running.xml
@@ -1,11 +1,14 @@
 <network-function xmlns="urn:o-ran-sc:yang:o-ran-sc-du-hello-world">
     <du-to-ru-connection>
       <name>O-RU-1</name>
+      <administrative-state>LOCKED</administrative-state>
     </du-to-ru-connection>
     <du-to-ru-connection>
       <name>O-RU-2</name>
+      <administrative-state>UNLOCKED</administrative-state>
     </du-to-ru-connection>
     <du-to-ru-connection>
       <name>O-RU-3</name>
+      <administrative-state>LOCKED</administrative-state>
     </du-to-ru-connection>
   </network-function>
\ No newline at end of file

diff --git a/ntsimulator/deploy/o-ran-du/yang/o-ran-sc-du-hello-world.yang b/ntsimulator/deploy/o-ran-du/yang/o-ran-sc-du-hello-world.yang
index 77115f5..1106717 100644 (file)
--- a/ntsimulator/deploy/o-ran-du/yang/o-ran-sc-du-hello-world.yang
+++ b/ntsimulator/deploy/o-ran-du/yang/o-ran-sc-du-hello-world.yang
@@ -28,6 +28,12 @@ module o-ran-sc-du-hello-world {
      See the License for the specific language governing permissions and
      limitations under the License.";
 
+  revision 2021-04-08 {
+    description
+      "Updates based on the RSAC call 2021-04-08.";
+    reference
+      "https://wiki.o-ran-sc.org/pages/viewpage.action?pageId=20878423";
+  }
   revision 2021-03-06 {
     description
       "initial revision";
@@ -90,10 +96,77 @@ module o-ran-sc-du-hello-world {
       description
         "It is proposed to use the network unique identifier of the remote
          network function.
-         Note: After discussion the string was not restricted by a 'length' 
+         Note: After discussion the string was not restricted by a 'length'
          statement of a 'pattern' statement. Please avoid leading and ending
          spaces and consecutive spaces and any character outside of UTF-8-";
     }
+    leaf operational-state {
+      type enumeration {
+        enum DISABLED {
+          description
+            "The resource is not functional.";
+        }
+        enum ENABLED {
+          description
+            "The resource is functional.";
+        }
+      }
+      config false;
+      description
+        "Operational state of a connection. Indicates
+         whether the resource is functional (ENABLED) or not (DISABLED).";
+      reference
+        "3GPP TS 28.625 and ITU-T X.731";
+    }
+    leaf administrative-state {
+      type enumeration {
+        enum LOCKED {
+          description
+            "LOCKED refers to a situation which is NOT considered as
+             ‘normal operation'. Therefore, the O-DU will shut down the
+             connection to the related O-RU, when the value is set to LOCKED.";
+        }
+        enum UNLOCKED {
+          description
+            "UNLOCKED refers to a situation which is considered as
+             'normal operation'. Therefore, the O-DU will establish the
+             connection to the related O-RU, when the value is set to UNLOCKED.";
+        }
+        enum SHUTTING_DOWN {
+          description
+            "This value should not be used. At least the system
+             behavior is not defined.";
+        }
+      }
+      default "LOCKED";
+      description
+        "Administrative state of a connection.";
+      reference
+        "3GPP TS 28.625 and ITU-T X.731";
+    }
+    leaf cell-state {
+      type enumeration {
+        enum IDLE {
+          description
+            "Indicates whether the O-RU is not in use.";
+        }
+        enum INACTIVE {
+          description
+            "Indicates whether the O-RU is in use but not
+             configured to carry traffic.";
+        }
+        enum ACTIVE {
+          description
+            "Indicates whether the O-RU is in use and
+             configured to carry traffic.";
+        }
+      }
+      config false;
+      description
+        "Cell state of the O-RU instance.";
+      reference
+        "3GPP TS 28.625";
+    }
     leaf status {
       type connection-status;
       default "disconnected";
@@ -165,6 +238,7 @@ module o-ran-sc-du-hello-world {
   // Remote procedure calls - actions on root level
 
   rpc connect {
+    status deprecated;
     description
       "An action to establish the connection to a remote network function.";
     input {
@@ -182,6 +256,7 @@ module o-ran-sc-du-hello-world {
   }
 
   rpc disconnect {
+    status deprecated;
     description
       "An action to destroy the connection to a remote network function.";
     input {