Run the 3GPP measurements file generator in bootstrap phase

Change-Id: I310acb354003e678020935017d0778f75e7db07f
Issue-ID: INT-1623
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

diff --git a/test/mocks/mass-pnf-sim/MassPnfSim.py b/test/mocks/mass-pnf-sim/MassPnfSim.py
index 87673dd..4d2784d 100755 (executable)
--- a/test/mocks/mass-pnf-sim/MassPnfSim.py
+++ b/test/mocks/mass-pnf-sim/MassPnfSim.py
@@ -295,6 +295,8 @@ class MassPnfSim:
                                        FTPS_PASV_MIN = str(ftps_pasv_port_start),
                                        FTPS_PASV_MAX = str(ftps_pasv_port_end),
                                        IPFILESERVER = str(self.args.ipfileserver))
+            # Run the 3GPP measurements file generator
+            self._run_cmd(f'./ROP_file_creator.sh {i} &', f"{self.sim_dirname_pattern}{i}")
 
             ftps_pasv_port_start += ftps_pasv_port_num_of_ports + 1
             ftps_pasv_port_end += ftps_pasv_port_num_of_ports + 1

diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh
index 9116fb8..69bfc86 100755 (executable)
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh
@@ -51,7 +51,7 @@ function get_pnfsim_ip() {
 
        export IPPNFSIM=$(cat ./config/config.yml | grep ippnfsim | awk -F'[ ]' '{print $2}')
        echo "PNF-Sim IP: " $IPPNFSIM
-       
+
        export SIMULATOR_BASE=http://$IPPNFSIM:$SIMULATOR_PORT/simulator/
        export SIMULATOR_START_URL=$SIMULATOR_BASE/start
        export SIMULATOR_STOP_URL=$SIMULATOR_BASE/stop
@@ -60,8 +60,8 @@ function get_pnfsim_ip() {
 
 function compose(){
        #creating custom docker-compose based on IP arguments
-       #creting config.json by injecting the same IP
-       
+       #creting config.yml by injecting the same IP
+
        export IPGW=$1
        export IPSUBNET=$2
        export I=$3