From: Morgan Richomme <morgan.richomme@orange.com>
Date: Tue, 27 Sep 2016 10:02:15 +0000 (+0000)
Subject: Merge "Move sfc custom flavor creation"
X-Git-Tag: 0.2~1149
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0e7ef6e103809f9f13c2b533eb589c3ac9c3fe14;p=functest-xtesting.git

Merge "Move sfc custom flavor creation"
---

0e7ef6e103809f9f13c2b533eb589c3ac9c3fe14
diff --cc testcases/features/sfc/sfc.py
index 2eb56ac1,4ece7d0a..a97ebcea
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@@ -160,15 -160,13 +160,21 @@@ 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)
+ 
      # boot INSTANCE
      logger.info("Creating instance '%s'..." % INSTANCE_NAME)
      logger.debug(
diff --cc testcases/features/sfc/sfc_colorado1.py
index f40b8b50,5b04c32a..8ae4e6ba
--- a/testcases/features/sfc/sfc_colorado1.py
+++ b/testcases/features/sfc/sfc_colorado1.py
@@@ -159,15 -159,13 +159,21 @@@ 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):
          # boot INSTANCE