From f17fc6dafd78453ed3b7a9c46130dbaac094c742 Mon Sep 17 00:00:00 2001
From: MaheshK1995 <mahesh.k.aithal95@gmail.com>
Date: Sat, 27 Jun 2020 17:24:19 +0530
Subject: [PATCH] VNF/PNF mode set using --vnf --pnf options

---
 .vscode/launch.json                      |  4 ++--
 common/config/config_load_configmodule.c | 12 ++++++++++++
 executables/nr-softmodem.c               |  2 --
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index f992e5cf76..44ca96f233 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -26,7 +26,7 @@
             "args": ["-E",
                     "-O ",
                     "/home/glab/NR_nfapi/openairinterface5g/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf",
-                    "2"],
+                    "--vnf"],
                 "stopAtEntry": false,
                 "cwd": "${workspaceFolder}",
                 "environment": [],
@@ -49,7 +49,7 @@
                 "args": ["-E",
                         "-O ",
                         "/home/glab/NR_nfapi/openairinterface5g/targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf",
-                        "1"],
+                        "--pnf"],
                     "stopAtEntry": false,
                     "cwd": "${workspaceFolder}",
                     "environment": [],
diff --git a/common/config/config_load_configmodule.c b/common/config/config_load_configmodule.c
index 61a3984347..1f85e9fee4 100644
--- a/common/config/config_load_configmodule.c
+++ b/common/config/config_load_configmodule.c
@@ -44,6 +44,7 @@
 #include "../utils/LOG/log.h"
 #define CONFIG_SHAREDLIBFORMAT "libparams_%s.so"
 
+extern uint8_t nfapi_mode;
 
 int load_config_sharedlib(configmodule_interface_t *cfgptr) {
   void *lib_handle;
@@ -212,6 +213,17 @@ configmodule_interface_t *load_configmodule(int argc,
     if ( (strcmp(argv[i]+1, "h") == 0) || (strstr(argv[i]+1, "help_") != NULL ) ) {
       tmpflags = CONFIG_HELP;
     }
+
+    if( strcmp(argv[i], "--vnf") == 0 ){
+      printf("\nVNF ENABLED\n");
+      nfapi_mode = 2;
+    }
+
+     if( strcmp(argv[i], "--pnf") == 0 ){
+      printf("\nPNF ENABLED\n");
+      nfapi_mode = 1;
+    }
+
   }
 
   /* look for the OAI_CONFIGMODULE environment variable */
diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index c08b4e76ef..bbde800501 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -794,8 +794,6 @@ int main( int argc, char **argv )
 {
   int ru_id, CC_id = 0;
 
-  nfapi_mode = (int) (argv[argc-1][0] - '0');
-
   start_background_system();
 
   ///static configuration for NR at the moment