Make the maven image build an independent step

This improves testability as in CI the image build
is done by relevant CI runner from provided POM file
so building from script is redundant.

Updated doc in regard on how to build the image locally.

Change-Id: I7666bc638996c855fed139ee46fcc80379a02f3b
Issue-ID: INT-1577
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 1a6ae8a..97ebafc 100755 (executable)
--- a/test/mocks/mass-pnf-sim/MassPnfSim.py
+++ b/test/mocks/mass-pnf-sim/MassPnfSim.py
@@ -34,6 +34,8 @@ def get_parser():
 
     parser = argparse.ArgumentParser()
     subparsers = parser.add_subparsers(title='Subcommands', dest='subcommand')
+    # Build command parser
+    subparsers.add_parser('build', help='Build simulator image')
     # Bootstrap command parser
     parser_bootstrap = subparsers.add_parser('bootstrap', help='Bootstrap the system')
     parser_bootstrap.add_argument('--count', help='Instance count to bootstrap', type=int, metavar='INT', default=1)
@@ -152,6 +154,8 @@ class MassPnfSim():
 
             self.logger.info(f'Done setting up instance #{i}')
 
+    def build(self):
+        self.logger.info("Building simulator image")
         completed = subprocess.run('set -x; cd pnf-sim-lightweight; ./simulator.sh build ', shell=True)
         self.logger.info(f"Build docker image: {completed.stdout}")
 

diff --git a/test/mocks/mass-pnf-sim/README.md b/test/mocks/mass-pnf-sim/README.md
index 0e6ac03..fc829f5 100644 (file)
--- a/test/mocks/mass-pnf-sim/README.md
+++ b/test/mocks/mass-pnf-sim/README.md
@@ -15,7 +15,13 @@ The ipstart should align to a /28 Ip address range start (e.g. 10.11.0.16, 10.11
 
 For debug purposes, you can use your own IP address as VES collector, use "ip" command to determine it.
 
-Example:
+### Build simulator image
+
+```
+./mass-pnf-sim.py build
+```
+
+### Bootstrap simulator instances
 
 ```
 ./mass-pnf-sim.py bootstrap --count 2 --urlves http://10.148.95.??:10000/eventListener/v7 --ipfileserver 10.148.95.??? --typefileserver sftp --ipstart 10.11.0.16
@@ -74,5 +80,5 @@ python3 -m trace --trace --count -C . ./mass-pnf-sim.py .....
 ### Cleaning and recovery after incorrect configuration
 
 ```
-docker stop $(docker ps -aq); docker rm $(docker ps -aq)
+./clean.sh
 ```