Correct method of launching monitor getting list of port IDs

JIRA VES-1

Change-Id: Ie2cd0ed371c8061fd8564aa32103e9edfdaafdc5
Signed-off-by: bryan <bryan.sullivan@att.com>

diff --git a/tests/blueprints/tosca-vnfd-hello-ves/start.sh b/tests/blueprints/tosca-vnfd-hello-ves/start.sh
index 3222f72..971b314 100755 (executable)
--- a/tests/blueprints/tosca-vnfd-hello-ves/start.sh
+++ b/tests/blueprints/tosca-vnfd-hello-ves/start.sh
@@ -202,7 +202,7 @@ setup_monitor () {
   sed -i -- "/vel_topic_name = /a vdu1_id = $vdu1_id" evel-test-collector/config/collector.conf
 
   cp monitor.py evel-test-collector/code/collector/monitor.py
-  nohup python evel-test-collector/code/collector/monitor.py --config evel-test-collector/config/collector.conf --section default > /dev/null 2>&1 &
+  nohup python evel-test-collector/code/collector/monitor.py --config evel-test-collector/config/collector.conf --section default > /home/ubuntu/monitor.log
 }
 
 type=$1

diff --git a/tests/vHello_VES.sh b/tests/vHello_VES.sh
index e9e5eca..81badf4 100644 (file)
--- a/tests/vHello_VES.sh
+++ b/tests/vHello_VES.sh
@@ -253,7 +253,7 @@ start() {
   for vdu in $vdus; do
     echo "$0: $(date) Setting port security on $vdu"  
     SERVER_ID=$(openstack server list | awk "/$vdu/ { print \$2 }")
-    id=($(neutron port-list|grep -v "+"|grep -v name|awk '{print $2}'))
+    id=($(neutron port-list -F id -f value))
     for id in ${id[@]}; do
       if [[ $(neutron port-show $id|grep $SERVER_ID) ]]; then neutron port-update ${id} --port-security-enabled=True; fi
     done
@@ -310,7 +310,7 @@ start() {
   echo "$0: $(date) setup Monitor in VDU4 at ${vdu_ip[4]}"
   scp -i /opt/tacker/vHello -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no /opt/tacker/blueprints/tosca-vnfd-hello-ves/start.sh ubuntu@${vdu_ip[4]}:/home/ubuntu/start.sh
   scp -i /opt/tacker/vHello -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no /opt/tacker/blueprints/tosca-vnfd-hello-ves/monitor.py ubuntu@${vdu_ip[4]}:/home/ubuntu/monitor.py
-  ssh -i /opt/tacker/vHello -t -t -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@${vdu_ip[4]} "nohup bash /home/ubuntu/start.sh monitor ${vdu_id[1]} ${vdu_id[2]} ${vdu_id[3]} hello world > ~/monitor.log &"
+  ssh -i /opt/tacker/vHello -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@${vdu_ip[4]} "nohup bash /home/ubuntu/start.sh monitor ${vdu_id[1]} ${vdu_id[2]} ${vdu_id[3]} hello world > /dev/null 2>&1 &"
 
   echo "$0: $(date) Execute agent startup script in the VNF VMs"
   for i in $vnf_vdui; do
@@ -416,7 +416,8 @@ monitor () {
   echo "$0: $(date) Start the VES Monitor in VDU4 - Stop first if running"
   sudo ssh -t -t -i /opt/tacker/vHello -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$1 << 'EOF'
 sudo kill $(ps -ef | grep evel-test-collector | awk '{print $2}')
-python evel-test-collector/code/collector/monitor.py --config evel-test-collector/config/collector.conf --section default 
+nohup python evel-test-collector/code/collector/monitor.py --config evel-test-collector/config/collector.conf --section default > /home/ubuntu/monitor.log &
+tail -f monitor.log
 EOF
 }