Drop shell wrapper for docker compose operations 56/109156/2
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>
Mon, 15 Jun 2020 11:35:59 +0000 (13:35 +0200)
committerMorgan Richomme <morgan.richomme@orange.com>
Mon, 15 Jun 2020 14:09:30 +0000 (14:09 +0000)
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>
test/mocks/mass-pnf-sim/MassPnfSim.py

index 4d2784d..43e3894 100755 (executable)
@@ -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',