openstack/python-aodhclient
Code Issues Proposed changes

Use overtest to run Gnocchi in tests

Browse Source 
Change-Id: If8195f2e4b0c88260998588242dcff081f566beb
This commit is contained in:
Julien Danjou 2016-03-14 18:03:43 +01:00
parent 03e7a45e5e
commit 0fd1874f56
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
setup-tests.sh
View File

@ -18,9 +18,8 @@ clean_exit () {
} }
AODH_DATA=`mktemp -d /tmp/aodh-data-XXXXX` AODH_DATA=`mktemp -d /tmp/aodh-data-XXXXX`
GNOCCHI_DATA=`mktemp -d /tmp/gnocchi-data-XXXXX`
MYSQL_DATA=`mktemp -d /tmp/aodh-mysql-XXXXX` MYSQL_DATA=`mktemp -d /tmp/aodh-mysql-XXXXX`
trap "clean_exit \"$AODH_DATA\" \"$GNOCCHI_DATA\" \"$MYSQL_DATA\"" EXIT trap "clean_exit \"$AODH_DATA\" \"$MYSQL_DATA\"" EXIT
mysqld --initialize-insecure --datadir=${MYSQL_DATA} || true mysqld --initialize-insecure --datadir=${MYSQL_DATA} || true
mkfifo ${MYSQL_DATA}/out mkfifo ${MYSQL_DATA}/out
@ -29,8 +28,7 @@ mysqld --no-defaults --datadir=${MYSQL_DATA} --pid-file=${MYSQL_DATA}/mysql.pid
# Wait for MySQL to start listening to connections # Wait for MySQL to start listening to connections
wait_for_line "mysqld: ready for connections." ${MYSQL_DATA}/out wait_for_line "mysqld: ready for connections." ${MYSQL_DATA}/out
export AODH_TEST_STORAGE_URL="mysql+pymysql://root@localhost/test?unix_socket=${MYSQL_DATA}/mysql.socket&charset=utf8" export AODH_TEST_STORAGE_URL="mysql+pymysql://root@localhost/test?unix_socket=${MYSQL_DATA}/mysql.socket&charset=utf8"
export GNOCCHI_TEST_INDEXER_URL="mysql+pymysql://root@localhost/gnocchi?unix_socket=${MYSQL_DATA}/mysql.socket&charset=utf8" mysql --no-defaults -S ${MYSQL_DATA}/mysql.socket -e 'CREATE DATABASE test;'
mysql --no-defaults -S ${MYSQL_DATA}/mysql.socket -e 'CREATE DATABASE test; CREATE DATABASE gnocchi;'
@ -100,31 +98,10 @@ aodh-api --config-file ${AODH_DATA}/aodh.conf &> ${AODH_DATA}/out &
wait_for_line "Running on http://0.0.0.0:8042/" ${AODH_DATA}/out wait_for_line "Running on http://0.0.0.0:8042/" ${AODH_DATA}/out
export AODH_ENDPOINT=http://localhost:8042/ export AODH_ENDPOINT=http://localhost:8042/
source $(which overtest) gnocchi
mkfifo ${GNOCCHI_DATA}/out
cat > ${GNOCCHI_DATA}/gnocchi.conf <<EOF
[oslo_policy]
policy_file = ${VIRTUAL_ENV}/etc/gnocchi/policy.json
[api]
paste_config = ${VIRTUAL_ENV}/etc/gnocchi/api-paste.ini
[storage]
metric_processing_delay = 1
file_basepath = ${GNOCCHI_DATA}
driver = file
coordination_url = file://${GNOCCHI_DATA}
[indexer]
url = $GNOCCHI_TEST_INDEXER_URL
EOF
gnocchi-upgrade --config-file ${GNOCCHI_DATA}/gnocchi.conf
gnocchi-metricd --config-file ${GNOCCHI_DATA}/gnocchi.conf &>/dev/null &
gnocchi-api --config-file ${GNOCCHI_DATA}/gnocchi.conf &> ${GNOCCHI_DATA}/out &
# Wait for Gnocchi to start
wait_for_line "Running on http://0.0.0.0:8041/" ${GNOCCHI_DATA}/out
export GNOCCHI_ENDPOINT=http://localhost:8041/
# gnocchi alarms validate existence # gnocchi alarms validate existence
curl -X POST -H 'Content-Type:application/json' ${GNOCCHI_ENDPOINT}v1/resource/instance --data '{ curl -X POST -H 'Content-Type:application/json' ${OVERTEST_GNOCCHI_HTTP_URL}/v1/resource/instance --data '{
"display_name": "myvm", "display_name": "myvm",
"flavor_id": "2", "host": "blah", "flavor_id": "2", "host": "blah",
"id": "6868DA77-FA82-4E67-ABA9-270C5AE8CBCA", "id": "6868DA77-FA82-4E67-ABA9-270C5AE8CBCA",

3
test-requirements.txt
View File

@ -15,6 +15,7 @@ testrepository>=0.0.18
testscenarios>=0.4 testscenarios>=0.4
testtools>=1.4.0 testtools>=1.4.0
http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql] http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]
http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz#egg=gnocchi[mysql,file] http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz#egg=gnocchi[postgresql,file]
# FIXME(sileht): should be in aodh ? # FIXME(sileht): should be in aodh ?
keystonemiddleware keystonemiddleware
overtest>=0.12