diff options
author | George Paraskevopoulos <geopar@intracom-telecom.com> | 2016-10-11 12:54:09 +0300 |
---|---|---|
committer | Jose Lausuch <jose.lausuch@ericsson.com> | 2016-10-11 11:15:02 +0000 |
commit | 1664ce9a60f3764e2f5b5273e8f6d6c6716f3879 (patch) | |
tree | 96c61bd7816ecf2fbda270611e5bb427e51bcacb | |
parent | 33cb0cdaeaf697ec394ab1be317cdb9c0e942b80 (diff) |
Small fixes in sfc testcase
Change-Id: Ib1c4fb64fdf72bcae99d05db3c3a41721c78ce27
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
(cherry picked from commit a2454ab0d260494b0777171d0892fbb82a48b468)
-rwxr-xr-x | testcases/features/sfc/server_presetup_CI.bash | 2 | ||||
-rwxr-xr-x | testcases/features/sfc/sfc.py | 2 | ||||
-rwxr-xr-x | testcases/features/sfc/sfc_colorado1.py | 2 |
3 files changed, 3 insertions, 3 deletions
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 4ece7d0ad..f96ee43b2 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 5b04c32a9..55778425c 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" |