summaryrefslogtreecommitdiffstats
path: root/testcases/features/sfc
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2016-10-20 10:09:35 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-20 10:09:35 +0000
commit63deb33d8eb488f5c797d3b30ccd562334d062ec (patch)
tree10872dad2307eff4e59a0d8f59057c6c31bc2899 /testcases/features/sfc
parentebf0e33608eeae7591f7ce941d5c88e3973eeeb8 (diff)
parente6186ca89dbbd230f655e827624e36eafcb150ac (diff)
Merge "Spawn instances in nova availability zone" into stable/colorado
Diffstat (limited to 'testcases/features/sfc')
-rwxr-xr-xtestcases/features/sfc/sfc.py6
-rwxr-xr-xtestcases/features/sfc/sfc_colorado1.py13
2 files changed, 12 insertions, 7 deletions
diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index f96ee43b2..8905b5607 100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@ -175,7 +175,8 @@ def main():
instance = os_utils.create_instance_and_wait_for_active(FLAVOR,
image_id,
network_id,
- INSTANCE_NAME)
+ INSTANCE_NAME,
+ av_zone='nova')
if instance is None:
logger.error("Error while booting instance.")
@@ -215,7 +216,8 @@ def main():
instance_2 = os_utils.create_instance_and_wait_for_active(FLAVOR,
image_id,
network_id,
- INSTANCE_NAME_2)
+ INSTANCE_NAME_2,
+ av_zone='nova')
if instance_2 is None:
logger.error("Error while booting instance.")
diff --git a/testcases/features/sfc/sfc_colorado1.py b/testcases/features/sfc/sfc_colorado1.py
index 55778425c..28b8c35dd 100755
--- a/testcases/features/sfc/sfc_colorado1.py
+++ b/testcases/features/sfc/sfc_colorado1.py
@@ -173,10 +173,12 @@ def main():
logger.debug(
"Configuration:\n name=%s \n flavor=%s \n image=%s \n "
"network=%s \n" % (INSTANCE_NAME, FLAVOR, image_id, network_id))
- instance = os_utils.create_instance_and_wait_for_active(FLAVOR,
- image_id,
- network_id,
- INSTANCE_NAME)
+ instance = os_utils.create_instance_and_wait_for_active(
+ FLAVOR,
+ image_id,
+ network_id,
+ INSTANCE_NAME,
+ av_zone='nova')
if instance is None:
logger.error("Error while booting instance.")
@@ -222,7 +224,8 @@ def main():
FLAVOR,
image_id,
network_id,
- INSTANCE_NAME_2)
+ INSTANCE_NAME_2,
+ av_zone='nova')
if instance_2 is None:
logger.error("Error while booting instance.")