Spawn instances in nova availability zone

Change-Id: I9dc3a00b3c96cf23916388a52efd610e4649dfff
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
(cherry picked from commit bc72396bf41892ad31f0680da80c6ef347a0ba6b)

diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index f96ee43..8905b56 100755 (executable)
--- 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 5577842..28b8c35 100755 (executable)
--- 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.")