aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtestcases/features/sfc/compute_presetup_CI.bash5
-rwxr-xr-xtestcases/features/sfc/server_presetup_CI.bash2
-rwxr-xr-xtestcases/features/sfc/sfc.py2
-rwxr-xr-xtestcases/features/sfc/sfc_colorado1.py2
4 files changed, 8 insertions, 3 deletions
diff --git a/testcases/features/sfc/compute_presetup_CI.bash b/testcases/features/sfc/compute_presetup_CI.bash
index 57d3d8278..c776c2f8c 100755
--- a/testcases/features/sfc/compute_presetup_CI.bash
+++ b/testcases/features/sfc/compute_presetup_CI.bash
@@ -17,5 +17,10 @@ sshpass -p r00tme scp $ssh_options correct_classifier.bash ${INSTALLER_IP}:/root
sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'scp correct_classifier.bash '"$ip"':/root'
sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'ssh root@'"$ip"' ifconfig br-int up'
+output=$(sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'ssh root@'"$ip"' ip route | \
+cut -d" " -f1 | grep 11.0.0.0' ; exit 0)
+
+if [ -z "$output" ]; then
sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'ssh root@'"$ip"' ip route add 11.0.0.0/24 \
dev br-int'
+fi
diff --git a/testcases/features/sfc/server_presetup_CI.bash b/testcases/features/sfc/server_presetup_CI.bash
index 89f24587b..240353f5b 100755
--- a/testcases/features/sfc/server_presetup_CI.bash
+++ b/testcases/features/sfc/server_presetup_CI.bash
@@ -8,6 +8,6 @@ pushd $BASEDIR
ip=$(sshpass -p r00tme ssh $ssh_options root@${INSTALLER_IP} 'fuel node'|grep controller|awk '{print $10}' | head -1)
echo $ip
-shpass -p r00tme scp $ssh_options delete.sh ${INSTALLER_IP}:/root
+sshpass -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/sfc.py b/testcases/features/sfc/sfc.py
index a97ebcea6..478b59782 100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@ -27,7 +27,7 @@ HOME = os.environ['HOME'] + "/"
VM_BOOT_TIMEOUT = 180
INSTANCE_NAME = "client"
-FLAVOR = "m1.small"
+FLAVOR = "custom"
IMAGE_NAME = "sf_nsh_colorado"
IMAGE_FILENAME = "sf_nsh_colorado.qcow2"
IMAGE_FORMAT = "qcow2"
diff --git a/testcases/features/sfc/sfc_colorado1.py b/testcases/features/sfc/sfc_colorado1.py
index 8ae4e6bac..5580d9ed5 100755
--- a/testcases/features/sfc/sfc_colorado1.py
+++ b/testcases/features/sfc/sfc_colorado1.py
@@ -26,7 +26,7 @@ HOME = os.environ['HOME'] + "/"
VM_BOOT_TIMEOUT = 180
INSTANCE_NAME = "client"
-FLAVOR = "m1.small"
+FLAVOR = "custom"
IMAGE_NAME = "sf_nsh_colorado"
IMAGE_FILENAME = "sf_nsh_colorado.qcow2"
IMAGE_FORMAT = "qcow2"