From 08d234170898e95096277e22b4dbbf82f576c915 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Mon, 15 Jun 2020 13:35:59 +0200 Subject: 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 --- test/mocks/mass-pnf-sim/MassPnfSim.py | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'test') 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', -- cgit 1.2.3-korg