From acb35acb2a413612484f1669ea7859e2a8d6c789 Mon Sep 17 00:00:00 2001
From: George Paraskevopoulos <geopar@intracom-telecom.com>
Date: Wed, 5 Oct 2016 14:03:39 +0300
Subject: Remove old tacker setup

No need to install tacker here. We do it with fuel-plugin-tacker.

Change-Id: Ic912048b8a0f169b062ac14788d94757c81bf073
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
---
 testcases/features/sfc/server_presetup_CI.bash |  7 +++---
 testcases/features/sfc/set-up-tacker.sh        | 33 --------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100755 testcases/features/sfc/set-up-tacker.sh

(limited to 'testcases/features')

diff --git a/testcases/features/sfc/server_presetup_CI.bash b/testcases/features/sfc/server_presetup_CI.bash
index f959ced5..89f24587 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 5fba0095..00000000
--- 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
-- 
cgit 1.2.3-korg