diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-06-15 13:35:59 +0200 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2020-06-15 14:09:30 +0000 |
| commit | 08d234170898e95096277e22b4dbbf82f576c915 (patch) | |
| tree | 1a92da9767f712c1b7947b7eaa4ace2da59b96cb /test | |
| parent | 624c115033ce783619bf7e9b9ac6acc7a656d099 (diff) | |
Drop shell wrapper for docker compose operations
Docker-compose configuration is already natively supported
within MassPnfSim module.
Change-Id: I26995126d8a26437821f0f8b254ff82752041b55
Issue-ID: INT-1623
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/mocks/mass-pnf-sim/MassPnfSim.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/test/mocks/mass-pnf-sim/MassPnfSim.py b/test/mocks/mass-pnf-sim/MassPnfSim.py index 4d2784d0c..43e389420 100755 --- a/test/mocks/mass-pnf-sim/MassPnfSim.py +++ b/test/mocks/mass-pnf-sim/MassPnfSim.py @@ -258,26 +258,7 @@ class MassPnfSim: self.logger.info(f'\tCreating {self.sim_dirname_pattern}{i}') copytree('pnf-sim-lightweight', f'{self.sim_dirname_pattern}{i}') - - composercmd = " ".join([ - "./simulator.sh compose", - ip['gw'], - ip['subnet'], - str(i), - self.args.urlves, - ip['PnfSim'], - str(self.args.ipfileserver), - self.args.typefileserver, - str(PortSftp), - str(PortFtps), - ip['ftps'], - ip['sftp'], - str(ftps_pasv_port_start), - str(ftps_pasv_port_end) - ]) - self.logger.debug(f"Script cmdline: {composercmd}") self.logger.info(f"\tCreating instance #{i} configuration ") - self._run_cmd(composercmd, f"{self.sim_dirname_pattern}{i}") self._generate_pnf_sim_config(i, PortSftp, PortFtps, ip['PnfSim']) # generate docker-compose for the simulator instance self._generate_config_file(self.sim_compose_template, 'docker-compose.yml', |