From: George Paraskevopoulos <geopar@intracom-telecom.com>
Date: Tue, 11 Oct 2016 09:54:09 +0000 (+0300)
Subject: Small fixes in sfc testcase
X-Git-Tag: danube.1.RC1~374
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F22971%2F1;p=functest.git

Small fixes in sfc testcase

Change-Id: Ib1c4fb64fdf72bcae99d05db3c3a41721c78ce27
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
---

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"