Merge "Update YANG models for OpenFronthaul M-Plane."

[sim/o1-interface.git] / ntsimulator / deploy / o-ran-ru-fh / yang / o-ran-mplane-int.yang

diff --git a/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-mplane-int@2019-07-03.yang b/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-mplane-int.yang
similarity index 79%
rename from ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-mplane-int@2019-07-03.yang
rename to ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-mplane-int.yang
index 84452cd..7209e2e 100644 (file)
--- a/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-mplane-int@2019-07-03.yang
+++ b/ntsimulator/deploy/o-ran-ru-fh/yang/o-ran-mplane-int.yang
@@ -21,10 +21,10 @@ module o-ran-mplane-int {
     "www.o-ran.org";
 
   description
     "www.o-ran.org";
 
   description

-    "This module defines the YANG definitions for managng the O-RAN Radio Unit
+    "This module defines the YANG definitions for managing the O-RAN Radio Unit

      management plane interface.
 
      management plane interface.
 

-     Copyright 2019 the O-RAN Alliance.
+     Copyright 2021 the O-RAN Alliance.

 
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 
      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE


@@ -50,6 +50,34 @@ module o-ran-mplane-int {
      contributors may be used to endorse or promote products derived from
      this software without specific prior written permission.";
 
      contributors may be used to endorse or promote products derived from
      this software without specific prior written permission.";
 

+   revision "2021-12-01" {
+     description
+       "version 7.1.0
+
+          1) typographical corrections";
+
+     reference "ORAN-WG4.M.0-v07.00";
+   }
+
+  revision "2021-07-26" {
+    description
+      "version 7.0.0
+
+         1) new leaf for recommended scan interval  ";
+
+    reference "ORAN-WG4.M.0-v07.00";
+  }
+
+  revision "2021-03-22" {
+        description
+          "version 6.0.0
+
+          1) typographical corrections in descriptions.
+          2) new functionality to report TLS information ";
+
+        reference "ORAN-WG4.M.0-v06.00";
+  }
+

   revision "2019-07-03" {
        description
          "version 1.1.0
   revision "2019-07-03" {
        description
          "version 1.1.0


@@ -83,10 +111,11 @@ module o-ran-mplane-int {
   // Groupings
 
   grouping mplane-group {
   // Groupings
 
   grouping mplane-group {

+    description "mplane grouping";

     container searchable-mplane-access-vlans-info {
       description
     container searchable-mplane-access-vlans-info {
       description

-        "These parameters shall be stored by the equipment in reset persistant memory
-        to enable it to be re-used to optimize VALN discovery procerdures.";
+        "These parameters shall be stored by the equipment in reset persistent memory
+        to enable it to be re-used to optimize VLAN discovery procedures.";

       leaf-list searchable-access-vlans {
         type vlan-id;
         description
       leaf-list searchable-access-vlans {
         type vlan-id;
         description


@@ -109,6 +138,18 @@ module o-ran-mplane-int {
             in VLAN scan procedure";
         }
       }
             in VLAN scan procedure";
         }
       }

+      leaf scan-interval {
+          type uint16;
+          units seconds;
+          default 60;
+          description
+            "The O-RU should repeatedly search using untagged frames and previously configured
+            VLANs whenever it searches across the full range of VLAN IDs.The O-RU controller is
+            able to recommend the maximum interval between repeatedly scanning for M-Plane connectivity
+            on the untagged and configured VLANs using this timer schema node.
+
+            The O-RU shall store this schem-node in reset persistent memory.";
+      }

     }
 
     container m-plane-interfaces {
     }
 
     container m-plane-interfaces {


@@ -182,6 +223,19 @@ module o-ran-mplane-int {
           description "The configured SSH server port number";
         }
       }
           description "The configured SSH server port number";
         }
       }

+      container m-plane-tls-ports {
+        description "leafs for managing TLS ports";
+        leaf call-home-tls-port {
+          type inet:port-number;
+          default 4335;
+          description "The configured call home server port number";
+        }
+        leaf server-tls-port {
+          type inet:port-number;
+          default 6513;
+          description "The configured TLS server port number";
+        }
+      }

     }
     container configured-client-info {
       description
     }
     container configured-client-info {
       description


@@ -225,7 +279,7 @@ module o-ran-mplane-int {
   // Top Level Container
 
   container mplane-info {
   // Top Level Container
 
   container mplane-info {

-    description "top level container for management plane information";
+    description "top-level container for management plane information";

 
     uses mplane-group;
   }
 
     uses mplane-group;
   }