Refresh set of NR KPIs

[ric-app/mc.git] / mc-core / mc / queries / generate_runall.py

diff --git a/mc-core/mc/queries/generate_runall.py b/mc-core/mc/queries/generate_runall.py
index 2d55a30..667120b 100644 (file)
--- a/mc-core/mc/queries/generate_runall.py
+++ b/mc-core/mc/queries/generate_runall.py
@@ -63,18 +63,19 @@ set -m
 
 FIFO_DIR="/tmp/mcl/fifos"
 
-SIMULATOR_MODE=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH simulator_mode`
+SIMULATOR_MODE=`python /mc/extract_params.py ${XAPP_DESCRIPTOR_PATH}/config-file.json simulator_mode`
 
-DEBUG_MODE=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH debug_mode`
+DEBUG_MODE=`python /mc/extract_params.py ${XAPP_DESCRIPTOR_PATH}/config-file.json debug_mode`
 
-WINDOW=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH measurement_interval`
+WINDOW=`python /mc/extract_params.py ${XAPP_DESCRIPTOR_PATH}/config-file.json measurement_interval`
 
-# export DBAAS_SERVICE_HOST=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH __DBAAS_SERVICE_HOST__`
-# export DBAAS_SERVICE_PORT=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH __DBAAS_SERVICE_PORT__`
+RMR_PORT=`python /mc/extract_rmr_port.py ${XAPP_DESCRIPTOR_PATH}/config-file.json rmr-data-out`
+
+# export DBAAS_SERVICE_HOST=`python /mc/extract_params.py ${XAPP_DESCRIPTOR_PATH}/config-file.json __DBAAS_SERVICE_HOST__`
+# export DBAAS_SERVICE_PORT=`python /mc/extract_params.py ${XAPP_DESCRIPTOR_PATH}/config-file.json __DBAAS_SERVICE_PORT__`
 
 if [ "$SIMULATOR_MODE" = "true" ]
 then
-       mkdir -p $FIFO_DIR
        python /mc/data_gen/dc_gen.py &
        python /mc/data_gen/rrcx_gen.py &
 fi
@@ -84,7 +85,7 @@ then
        WINDOW="10000"
 fi
 
-VES_COLLECTOR=`python /mc/extract_params.py $XAPP_DESCRIPTOR_PATH ves_collector_address`
+VES_COLLECTOR=`python /mc/extract_params.py ${XAPP_DESCRIPTOR_PATH}/config-file.json ves_collector_address`
 
 VES_NAME=`echo $VES_COLLECTOR | awk 'BEGIN{FS=":"} {print $1}'`
 VES_PORT=`echo $VES_COLLECTOR | awk 'BEGIN{FS=":"} {print $2}'`
@@ -119,12 +120,17 @@ fi
 
 runall += """
 
+if [ "$RMR_PORT" != "" ]
+then
+    RMR_OPTION="-R $RMR_PORT"
+fi
+
 # invoke gsprintconsole_ves gsmcnib for all non-debug queries
 """
 
 for q in oqy:
        if "debug" not in q:
-               runall += " /mc/gs-lite/bin/gsprintconsole_ves -C $VES_IP:$VES_PORT -U /vescollector/eventListener/v7 -V 7 `cat gshub.log` default "+q+" window=$WINDOW &\n"
+               runall += " /mc/gs-lite/bin/gsprintconsole_ves -C $VES_IP:$VES_PORT -U /vescollector/eventListener/v7 -V 7 $RMR_OPTION `cat gshub.log` default "+q+" window=$WINDOW &\n"
                keys = nib[q]["keys"]
                if len(keys)>0:
                        keys_str = ",".join(keys)