diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-10-06 15:40:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-06 15:40:58 +0000 |
| commit | 8c4aa3c9cca399a804ae0f8747855819aa471430 (patch) | |
| tree | 32efa5e04a3bbd9113ea5aab8f61c46e2a710977 | |
| parent | 9e36f4b0f04566c814e1b6ab49e50787b1454d38 (diff) | |
| parent | acb35acb2a413612484f1669ea7859e2a8d6c789 (diff) | |
Merge "Remove old tacker setup"
| -rwxr-xr-x | testcases/features/sfc/server_presetup_CI.bash | 7 | ||||
| -rwxr-xr-x | testcases/features/sfc/set-up-tacker.sh | 33 |
2 files changed, 3 insertions, 37 deletions
diff --git a/testcases/features/sfc/server_presetup_CI.bash b/testcases/features/sfc/server_presetup_CI.bash index f959ced5b..89f24587b 100755 --- a/testcases/features/sfc/server_presetup_CI.bash +++ b/testcases/features/sfc/server_presetup_CI.bash @@ -5,10 +5,9 @@ BASEDIR=`dirname $0` INSTALLER_IP=${INSTALLER_IP:-10.20.0.2} pushd $BASEDIR -ip=`sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'fuel node'|grep controller|awk '{print $10}' | head -1` +ip=$(sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'fuel node'|grep controller|awk '{print $10}' | head -1) echo $ip -sshpass -p r00tme scp $ssh_options set-up-tacker.sh ${INSTALLER_IP}:/root -sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'scp set-up-tacker.sh '"$ip"':/root' -sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'ssh root@'"$ip"' bash set-up-tacker.sh' + +shpass -p r00tme scp $ssh_options delete.sh ${INSTALLER_IP}:/root sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'scp '"$ip"':/root/tackerc .' sshpass -p r00tme scp $ssh_options ${INSTALLER_IP}:/root/tackerc $BASEDIR diff --git a/testcases/features/sfc/set-up-tacker.sh b/testcases/features/sfc/set-up-tacker.sh deleted file mode 100755 index 5fba00955..000000000 --- a/testcases/features/sfc/set-up-tacker.sh +++ /dev/null @@ -1,33 +0,0 @@ -apt-get install -y git-core -git clone https://gerrit.opnfv.org/gerrit/fuel fuel -pushd fuel -git checkout ad0dd57 -popd -mv fuel/prototypes/sfc_tacker/poc.tacker-up.sh . -bash poc.tacker-up.sh - -cat <<EOF > delete.sh -tacker sfc-classifier-delete red_http -tacker sfc-classifier-delete blue_ssh -tacker sfc-classifier-delete red_ssh -tacker sfc-classifier-delete blue_http -tacker sfc-delete red -tacker sfc-delete blue -tacker vnf-delete testVNF1 -tacker vnf-delete testVNF2 -tacker vnfd-delete test-vnfd1 -tacker vnfd-delete test-vnfd2 -#openstack stack delete sfc --y -heat stack-delete sfc --y -#openstack stack delete sfc_test1 --y -heat stack-delete sfc_test1 --y -#openstack stack delete sfc_test2 --y -heat stack-delete sfc_test2 --y -nova delete server -nova delete client -EOF - -chmod +x delete.sh - -source tackerc -openstack flavor create custom --ram 1500 --disk 10 --public |