From 304411cf3508764cfdcaa03c96ce7acc5f3308e0 Mon Sep 17 00:00:00 2001
From: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
Date: Fri, 12 May 2023 17:52:51 +0300
Subject: [PATCH] Fix YANG feature installation.

Issue-ID: SIM-112
Change-Id: I6b50575d46dc0e6dcc5ea8a43cf863ecaf99f6de
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
---
 ntsimulator/deploy/o-ran-ru-fh/config.json |  8 ++++++--
 ntsimulator/ntsim-ng/core/container.c      |  6 +++---
 ntsimulator/ntsim-ng/core/context.c        | 10 ++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ntsimulator/deploy/o-ran-ru-fh/config.json b/ntsimulator/deploy/o-ran-ru-fh/config.json
index 4d614cf..b007097 100644
--- a/ntsimulator/deploy/o-ran-ru-fh/config.json
+++ b/ntsimulator/deploy/o-ran-ru-fh/config.json
@@ -1,7 +1,11 @@
 {
     "container-rules": {
-        "excluded-modules": [],
-        "excluded-features": ["o-ran-wg4-features:SUPERVISION-WITH-SESSION-ID"]
+        "excluded-modules": [
+            "o-ran-antenna-calibration"
+        ],
+        "excluded-features": [
+            "o-ran-wg4-features:SUPERVISION-WITH-SESSION-ID"
+        ]
     },
 
     "supervisor-rules": {
diff --git a/ntsimulator/ntsim-ng/core/container.c b/ntsimulator/ntsim-ng/core/container.c
index a3e7b11..b2f92d2 100644
--- a/ntsimulator/ntsim-ng/core/container.c
+++ b/ntsimulator/ntsim-ng/core/container.c
@@ -247,7 +247,7 @@ static bool container_rules_is_excluded_module(const char *module) {
             return true;
         }
     }
-    
+
     return false;
 }
 
@@ -259,6 +259,6 @@ static bool container_rules_is_excluded_feature(const char *feature) {
             return true;
         }
     }
-    
+
     return false;
-}
\ No newline at end of file
+}
diff --git a/ntsimulator/ntsim-ng/core/context.c b/ntsimulator/ntsim-ng/core/context.c
index be30e9c..b7aab97 100644
--- a/ntsimulator/ntsim-ng/core/context.c
+++ b/ntsimulator/ntsim-ng/core/context.c
@@ -71,7 +71,7 @@ int context_init(const struct ly_ctx *ly_ctx) {
         }
         log_add(2, "\n");
         log_add_verbose(2, "  implemented: %d\n", module->implemented);
-        
+
         if(module->implemented) {
             log_add_verbose(2, "  IDENT count: %d\n", module->ident_size);
             if(module->ident_size) {
@@ -138,7 +138,7 @@ void context_free(void) {
     for(int i = 0; i < features_size; i++) {
         free(features[i].name);
     }
-    free(features);   
+    free(features);
     log_add(2, "done\n");
 }
 
@@ -216,7 +216,7 @@ bool context_feature_enable(const char *feature) {
         i++;
     }
     mod[j] = 0;
-    
+
     i++;
     j = 0;
     while(i < strlen(feature)) {
@@ -230,7 +230,9 @@ bool context_feature_enable(const char *feature) {
     if((rc = sr_enable_module_feature(session_connection, mod, feat)) != SR_ERR_OK) {
         return false;
     }
-    
+
+    context_apply_changes();
+
     return true;
 }
 
-- 
2.16.6