openstack/deb-ceilometer
Code Issues Proposed changes

Use gnocchiclient for integration script

Browse Source 
Change-Id: I3f88c7ad41518f742ac21dd3ae8e48daa4b4377c
This commit is contained in:
Mehdi Abaakouk 2015-10-20 10:47:08 +02:00
parent 3a3093afa6
commit 78ccbc6592
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ceilometer/tests/integration/hooks/post_test_hook.sh
View File

@ -62,16 +62,15 @@ if [ $EXIT_CODE -ne 0 ] ; then
echo "* Nova instance list:" echo "* Nova instance list:"
openstack server list openstack server list
# TODO(sileht): replace by gnocchiclient when available
echo "* Gnocchi instance list:" echo "* Gnocchi instance list:"
curl -s -X GET -H 'Content-Type: application/json' -H "X-Auth-Token: $ADMIN_TOKEN" $GNOCCHI_SERVICE_URL/v1/resource/instance | python -m "json.tool" gnocchi resource list -t instance
for instance_id in $(openstack server list -f value -c ID); do for instance_id in $(openstack server list -f value -c ID); do
echo "* Nova instance detail:" echo "* Nova instance detail:"
openstack server show $instance_id openstack server show $instance_id
echo "* Gnocchi instance detail:"
gnocchi resource show -t instance $instance_id
echo "* Gnocchi measures for instance ${instance_id}:" echo "* Gnocchi measures for instance ${instance_id}:"
output=$(curl -s -X GET -H 'Content-Type: application/json' -H "X-Auth-Token: $ADMIN_TOKEN" $GNOCCHI_SERVICE_URL/v1/resource/instance/$instance_id/metric/cpu_util/measures) gnocchi measures show -r $instance_id cpu_util
echo $output | python -m "json.tool" || echo -e "\n$output"
done done
# Be sure to source Gnocchi settings before # Be sure to source Gnocchi settings before