Doc changes for F release O1 enhancements

Signed-off-by: Vidhu <vidhu.pandey@hcl.com>
Change-Id: Id512629b14abfbb0a930c237b335d95b39cf6650

diff --git a/docs/README b/docs/README
index 7a497ba..8b5056d 100644 (file)
--- a/docs/README
+++ b/docs/README
@@ -60,48 +60,13 @@ C. Pre-requisite for O1 Interface (Required only if run with O1 interface enable
    $cd l2/build/scripts
    $sudo ./load_yang.sh
 
-   h. Install additional 3GPP yang models.
-
-      Download following 3GPP REL17 YANG models
-      https://forge.3gpp.org/rep/sa5/MnS/tree/Rel17-draft/yang-models
-
-   $cd l2/build/yang
-
-   _3gpp-common-top.yang
-   _3gpp-5g-common-yang-types.yang
-   _3gpp-common-yang-types.yang
-   _3gpp-common-managed-element.yang
-   _3gpp-common-measurements.yang
-   _3gpp-common-subscription-control.yang
-   _3gpp-common-fm.yang
-   _3gpp-common-trace.yang
-   _3gpp-common-managed-function.yang
-   _3gpp-nr-nrm-gnbdufunction.yang
-   _3gpp-nr-nrm-nrcelldu.yang
-   _3gpp-nr-nrm-rrmpolicy.yang
-
-   Note :There are some corrections required in _3gpp-common-trace.yang and _3gpp-common-trace.yang yang model. Please follow these steps.
-
-   $cd l2/build/yang
-   $sed -i -e 's/"IMMEDIATE_MDT"/"IMMEDIATE_MDT_ONLY"/g' _3gpp-common-trace.yang
-   $sed -i -e 's/"TRACE"/"TRACE_ONLY"/g' _3gpp-common-trace.yang
-
-   Install all the downloaded yang models.
-
-   $cd l2/build/yang
-   $sysrepoctl -i      _3gpp-common-yang-types.yang
-   $sysrepoctl -i      _3gpp-common-top.yang
-   $sysrepoctl -i      _3gpp-common-measurements.yang
-   $sysrepoctl -i      _3gpp-common-trace.yang
-   $sysrepoctl -i      _3gpp-common-managed-function.yang
-   $sysrepoctl -i      _3gpp-common-subscription-control.yang
-   $sysrepoctl -i      _3gpp-common-fm.yang
-   $sysrepoctl -i      _3gpp-common-managed-element.yang
-   $sysrepoctl -i      _3gpp-5g-common-yang-types.yang
-   $sysrepoctl -i      _3gpp-nr-nrm-rrmpolicy.yang
-   $sysrepoctl -i      _3gpp-nr-nrm-gnbdufunction.yang
-   $sysrepoctl -i      _3gpp-nr-nrm-nrcelldu.yang
-
+   h. To enable Standard Defined VES format:
+      
+      cd l2/src/o1/ves
+      
+      Enable the Macro "StdDef" in file VesUtils.h
+      
+      #define StdDef
 
 3. Start Netopeer2-server:
    $cd l2/build/scripts

diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst
index f7d6c60..b2353bc 100644 (file)
--- a/docs/installation-guide.rst
+++ b/docs/installation-guide.rst
@@ -159,50 +159,12 @@ Setting up Netconf server (Only if O1 interface enabled)
       | $cd <O-DU High Directory>/l2/build/scripts
       | $sudo ./load_yang.sh
 
-    - Install additional 3GPP YANG models.
-
-      | $cd <O-DU High Directory>/l2/build/yang
-
-      | Download following 3GPP REL17 YANG models
-      | https://forge.3gpp.org/rep/sa5/MnS/tree/Rel17-draft/yang-models
-
-      | _3gpp-common-top.yang
-      | _3gpp-5g-common-yang-types.yang
-      | _3gpp-common-yang-types.yang
-      | _3gpp-common-managed-element.yang
-      | _3gpp-common-measurements.yang
-      | _3gpp-common-subscription-control.yang
-      | _3gpp-common-fm.yang
-      | _3gpp-common-trace.yang
-      | _3gpp-common-managed-function.yang
-      | _3gpp-nr-nrm-gnbdufunction.yang
-      | _3gpp-nr-nrm-nrcelldu.yang
-      | _3gpp-nr-nrm-rrmpolicy.yang
-
-      | Note : There are some corrections required in _3gpp-common-trace.yang and _3gpp-common-trace.yang yang model. Please follow these steps.
-
-      - Ubuntu :
+    - To enable Standard Defined VES format:      
       
-      | sed -i -e 's/"IMMEDIATE_MDT"/"IMMEDIATE_MDT_ONLY"/g' _3gpp-common-trace.yang
-      | sed -i -e 's/"TRACE"/"TRACE_ONLY"/g' _3gpp-common-trace.yang
-
-   - Install all the downloaded yang models.
-
-       - Ubuntu :
-
-       | cd <O-DU High Directory>/l2/build/yang
-       | sysrepoctl -i      _3gpp-common-yang-types.yang
-       | sysrepoctl -i      _3gpp-common-top.yang
-       | sysrepoctl -i      _3gpp-common-measurements.yang
-       | sysrepoctl -i      _3gpp-common-trace.yang
-       | sysrepoctl -i      _3gpp-common-managed-function.yang
-       | sysrepoctl -i      _3gpp-common-subscription-control.yang
-       | sysrepoctl -i      _3gpp-common-fm.yang
-       | sysrepoctl -i      _3gpp-common-managed-element.yang
-       | sysrepoctl -i      _3gpp-5g-common-yang-types.yang
-       | sysrepoctl -i      _3gpp-nr-nrm-rrmpolicy.yang
-       | sysrepoctl -i      _3gpp-nr-nrm-gnbdufunction.yang
-       | sysrepoctl -i      _3gpp-nr-nrm-nrcelldu.yang
+      | cd l2/src/o1/ves
+            
+      | Enable the Macro "StdDef" in file VesUtils.h      
+      | #define StdDef
 
 - Start Netopeer2-server:
 

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index e5234b7..71f8331 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -50,6 +50,11 @@ This release contains the following:
  - Upgrade to E2AP version 2.0.
  - Support for IDLE Mode Paging.
 
+ - O1 Module
+
+      - Alarm notification for cell down. 
+      - Added support for standard defined VES format in alarm notification and PM messages.
+
 e-release
 ^^^^^^^^^^
 This release contains the following:
@@ -284,6 +289,9 @@ F-release
 | https://jira.o-ran-sc.org/browse/ODUHIGH-406  | Support for Idle Mode Paging                  | 
 |                                               |                                               |
 +-----------------------------------------------+-----------------------------------------------+
+| https://jira.o-ran-sc.org/browse/ODUHIGH-429  | O1 Enhancements                               | 
+|                                               |                                               |
++-----------------------------------------------+-----------------------------------------------+
 
 e-release
 ^^^^^^^^^^

diff --git a/src/o1/ves/VesUtils.hpp b/src/o1/ves/VesUtils.hpp
index d48b2c8..89f9689 100644 (file)
--- a/src/o1/ves/VesUtils.hpp
+++ b/src/o1/ves/VesUtils.hpp
@@ -24,7 +24,7 @@
 #include <iostream>
 #include "GlobalDefs.hpp"
 
-//#define StdDef 1 
+//#define StdDef
 //config file path
 #define NETCONF_CONFIG "config/netconfConfig.json"
 #define OAM_VES_CONFIG "config/oamVesConfig.json"