From: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Date: Tue, 12 May 2020 14:52:13 +0000 (-0700)
Subject: Get and kill ROP_file_creator.sh childs as well
X-Git-Tag: 6.0.0-ONAP~52
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=19a4c45deb53685c176ae6dcd27d5ff0b6c129ca;p=integration.git

Get and kill ROP_file_creator.sh childs as well

Change-Id: I07393a0f62535563586278d2e8bc8fd6bd9380db
Issue-ID: INT-1577
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
---

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 3de96dafe..b1aa43749 100755
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh
@@ -141,8 +141,20 @@ function running_containers(){
 }
 
 function stop(){
-	get_pnfsim_ip
-    kill $(ps -ef | grep "[.]/ROP_file_creator.sh $1" | head -n 1 | awk '{print $2}')
+    get_pnfsim_ip
+
+    set +e # override global script setting
+    declare -a pids_to_kill
+    # get ROP_file_creator.sh instance pid
+    pids_to_kill[0]=$(pgrep -f "ROP_file_creator.sh ${1}$")
+    if [[ ! -z ${pids_to_kill[0]} ]];
+    then
+        # get ROP_file_creator.sh childs pids
+        pids_to_kill=(${pids_to_kill[@]} $(pgrep -P ${pids_to_kill[0]}))
+        kill ${pids_to_kill[@]}
+    else
+        echo "ROP_file_creator.sh already not running"
+    fi
 
     if [[ $(running_containers) ]]; then
         docker-compose -f $RUNNING_COMPOSE_CONFIG down
@@ -262,4 +274,4 @@ function timestamp(){
   date "+%Y-%m-%d_%T"
 }
 
-main $@
\ No newline at end of file
+main $@