Small fixes in sfc testcase

[functest.git] / testcases / features / sfc / sfc_colorado1.py

diff --git a/testcases/features/sfc/sfc_colorado1.py b/testcases/features/sfc/sfc_colorado1.py
index dc13436..5580d9e 100755 (executable)
--- 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"
@@ -159,6 +159,20 @@ def main():
                                       'egress', 'tcp',
                                       port_range_min=22,
                                       port_range_max=22)
+        os_utils.create_secgroup_rule(neutron_client, sg['id'],
+                                      'ingress', 'tcp',
+                                      port_range_min=80,
+                                      port_range_max=80)
+        os_utils.create_secgroup_rule(neutron_client, sg['id'],
+                                      'egress', 'tcp',
+                                      port_range_min=80,
+                                      port_range_max=80)
+
+    _, custom_flv_id = os_utils.get_or_create_flavor(
+        'custom', 1500, 10, 1, public=True)
+    if not custom_flv_id:
+        logger.error("Failed to create custom flavor")
+        sys.exit(1)
 
     iterator = 0
     while(iterator < 6):
@@ -174,6 +188,7 @@ def main():
 
         if instance is None:
             logger.error("Error while booting instance.")
+            iterator += 1
             continue
         # Retrieve IP of INSTANCE
         instance_ip = instance.networks.get(NET_NAME)[0]
@@ -191,6 +206,7 @@ def main():
 
         if floatip_client is None:
             logger.error("Cannot create floating IP.")
+            iterator += 1
             continue
         logger.info("Floating IP created: '%s'" % floatip_client)
 
@@ -200,6 +216,7 @@ def main():
                                         instance.id,
                                         floatip_client):
             logger.error("Cannot associate floating IP to VM.")
+            iterator += 1
             continue
 
     # STARTING SECOND VM (server) ###
@@ -217,6 +234,7 @@ def main():
 
         if instance_2 is None:
             logger.error("Error while booting instance.")
+            iterator += 1
             continue
         # Retrieve IP of INSTANCE
         instance_ip_2 = instance_2.networks.get(NET_NAME)[0]
@@ -234,6 +252,7 @@ def main():
 
         if floatip_server is None:
             logger.error("Cannot create floating IP.")
+            iterator += 1
             continue
         logger.info("Floating IP created: '%s'" % floatip_server)
 
@@ -244,6 +263,7 @@ def main():
                                         instance_2.id,
                                         floatip_server):
             logger.error("Cannot associate floating IP to VM.")
+            iterator += 1
             continue
 
         # CREATION OF THE 2 SF ####
@@ -309,6 +329,7 @@ def main():
 
         if not all(check):
             logger.error("Cannot establish SSH connection to the SFs")
+            iterator += 1
             continue
 
         logger.info("SSH connectivity to the SFs established")