diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2017-08-03 00:31:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-03 00:31:42 +0000 |
| commit | f708300052c2315994ba16793972ce0dfbfa237e (patch) | |
| tree | 748fa4de2743c2a757ce86fdcb845e5131dcffe2 | |
| parent | 769f00864e96941ab0a8ac6ac33d4582e01cc869 (diff) | |
| parent | 61e134112a356d298e0e370832ec676caf2e85ef (diff) | |
Merge "Find nova vs. vm mapping relation"
| -rwxr-xr-x | integration/storperf/openstack.sh | 7 | ||||
| -rwxr-xr-x | integration/storperf/start_job.sh | 4 | ||||
| -rwxr-xr-x | integration/storperf/storperf.sh | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/integration/storperf/openstack.sh b/integration/storperf/openstack.sh index 011aadb7..99701871 100755 --- a/integration/storperf/openstack.sh +++ b/integration/storperf/openstack.sh @@ -56,3 +56,10 @@ create_storperf_flavor() fi openstack flavor show storperf } + + +nova_vm_mapping() +{ + rm ./nova_vm.json + openstack server list --name storperf-agent -c ID -c Host --long -f json > nova_vm.json +}
\ No newline at end of file diff --git a/integration/storperf/start_job.sh b/integration/storperf/start_job.sh index 6ac95ec0..363072f6 100755 --- a/integration/storperf/start_job.sh +++ b/integration/storperf/start_job.sh @@ -30,6 +30,8 @@ if [[ -z $WORKSPACE ]];then WORKSPACE=`pwd` fi +source $WORKSPACE/openstack.sh + echo ========================================================================== echo "Start to create storperf stack" cat ${stack_json} 1>&2 @@ -39,6 +41,8 @@ curl -X POST --header 'Content-Type: application/json' \ --header 'Accept: application/json' -d @${stack_json} \ 'http://127.0.0.1:5000/api/v1.0/configurations' +nova_vm_mapping + echo echo ========================================================================== echo "Start to run storperf test" diff --git a/integration/storperf/storperf.sh b/integration/storperf/storperf.sh index 7a0253df..8120cb90 100755 --- a/integration/storperf/storperf.sh +++ b/integration/storperf/storperf.sh @@ -38,8 +38,8 @@ installer_ip=${installer_ip:-$INSTALLER_IP} stack_json=${stack_json:-"$WORKSPACE/default_stack.json"} job_json=${job_json:-"$WORKSPACE/default_job.json"} -source ./openstack.sh -source ./storperf_docker.sh +source $WORKSPACE/openstack.sh +source $WORKSPACE/storperf_docker.sh git clone --depth 1 https://gerrit.opnfv.org/gerrit/storperf $WORKSPACE/storperf git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng |