diff options
| author |   bryan <bryan.sullivan@att.com> | 2017-03-06 20:29:55 -0800 |
|---|---|---|
| committer | bryan <bryan.sullivan@att.com> | 2017-03-06 21:08:12 -0800 |
| commit | 33547549793608d1fef82d758abe4aecbc874f05 (patch) | |
| tree | bda7e190d1ac42e0245027ce28b927da341a1d33 /tests/blueprints/tosca-vnfd-hello-ves/start.sh | |
| parent | f6526c8dab68fb8c848ce8d99d390011e8d5f6b8 (diff) | |
Rebase on VES V3
JIRA: VES-1
Rebase monitor.py on latest collector.py
Rebase evel_demo.c on latest evel_demo.c
Update start.sh to align.
Change-Id: I11495c9f9b170de5598186f2c5781df0c04d7cba
Signed-off-by: bryan <bryan.sullivan@att.com>
Diffstat (limited to 'tests/blueprints/tosca-vnfd-hello-ves/start.sh')
| -rwxr-xr-x | tests/blueprints/tosca-vnfd-hello-ves/start.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/blueprints/tosca-vnfd-hello-ves/start.sh b/tests/blueprints/tosca-vnfd-hello-ves/start.sh index e5f8797..b7e74bc 100755 --- a/tests/blueprints/tosca-vnfd-hello-ves/start.sh +++ b/tests/blueprints/tosca-vnfd-hello-ves/start.sh @@ -166,6 +166,7 @@ setup_agent () { echo "$0: Update parameters and build agent demo" # This sed command will add a line after the search line + sed -i -- "s/api_port,/30000,/" evel-library/code/evel_demo/evel_demo.c sed -i -- "/api_secure,/{n;s/.*/ \"$username\",/}" evel-library/code/evel_demo/evel_demo.c sed -i -- "/\"$username\",/{n;s/.*/ \"$password\",/}" evel-library/code/evel_demo/evel_demo.c @@ -175,7 +176,8 @@ setup_agent () { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/ubuntu/evel-library/libs/x86_64 echo "$0: Start evel_demo agent" - nohup ../output/x86_64/evel_demo --id $vm_id --fqdn $collector_ip --port 30000 --username $username --password $password > /dev/null 2>&1 & + id=$(cut -d ',' -f 3 /mnt/openstack/latest/meta_data.json | cut -d '"' -f 4) + nohup ../output/x86_64/evel_demo --id $id --fqdn $collector_ip --port 30000 --username $username --password $password > /dev/null 2>&1 & echo "$0: Start collectd agent running in the VM" setup_collectd true @@ -204,7 +206,8 @@ setup_monitor () { sed -i -- "/vel_topic_name = /a vdu2_id = $vdu2_id" evel-test-collector/config/collector.conf sed -i -- "/vel_topic_name = /a vdu1_id = $vdu1_id" evel-test-collector/config/collector.conf -# python monitor.py --config evel-test-collector/config/collector.conf --section default + cp monitor.py evel-test-collector/code/collector/monitor.py +# python evel-test-collector/code/collector/monitor.py --config evel-test-collector/config/collector.conf --section default } type=$1 |