diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-06-15 13:14:45 +0200 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2020-06-15 14:09:30 +0000 |
| commit | 624c115033ce783619bf7e9b9ac6acc7a656d099 (patch) | |
| tree | a5eb20c0918736cfd018e50deca76c5e4ce49cb4 | |
| parent | 9ab2f40cb067f43b13098f16811d50c8693fcf1d (diff) | |
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>
| -rwxr-xr-x | test/mocks/mass-pnf-sim/MassPnfSim.py | 2 | ||||
| -rwxr-xr-x | test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/mocks/mass-pnf-sim/MassPnfSim.py b/test/mocks/mass-pnf-sim/MassPnfSim.py index 87673dd6b..4d2784d0c 100755 --- 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 9116fb80c..69bfc8635 100755 --- 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 |