From a2454ab0d260494b0777171d0892fbb82a48b468 Mon Sep 17 00:00:00 2001 From: George Paraskevopoulos Date: Tue, 11 Oct 2016 12:54:09 +0300 Subject: Small fixes in sfc testcase Change-Id: Ib1c4fb64fdf72bcae99d05db3c3a41721c78ce27 Signed-off-by: George Paraskevopoulos --- testcases/features/sfc/server_presetup_CI.bash | 2 +- testcases/features/sfc/sfc.py | 2 +- testcases/features/sfc/sfc_colorado1.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'testcases/features/sfc') diff --git a/testcases/features/sfc/server_presetup_CI.bash b/testcases/features/sfc/server_presetup_CI.bash index 89f24587..240353f5 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 a97ebcea..478b5978 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 8ae4e6ba..5580d9ed 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" -- cgit 1.2.3-korg