aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Paraskevopoulos <geopar@intracom-telecom.com>2016-09-23 16:40:13 +0300
committerGeorge Paraskevopoulos <geopar@intracom-telecom.com>2016-09-27 11:31:10 +0300
commit40f68e35389cf19d3fb200d1655ecb055c85d1eb (patch)
treeea4d27c5ad090cdcfa51c6a088418e3635a86ab6
parent1b7f3d721086d5d645bd968387a523f9df0c8c63 (diff)
Move sfc custom flavor creation
The custom flavor that is needed for the sfc test case is created in the tacker deployment phase. The result of this is that when we use alternative methods of deploying tacker (i.e. the tacker fuel plugin) the test fails. Changes: - Move the flavor creation inside the test case code - Add an optional public parameter in the [get_or_]create_flavor utility functions. Change-Id: Iea13f172076770dde3876b7e27edc9b7ca9b28db Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
-rwxr-xr-xtestcases/features/sfc/sfc.py6
-rwxr-xr-xtestcases/features/sfc/sfc_colorado1.py6
-rwxr-xr-xutils/openstack_utils.py10
3 files changed, 18 insertions, 4 deletions
diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index ec1720003..4ece7d0ad 100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@ -161,6 +161,12 @@ def main():
port_range_min=22,
port_range_max=22)
+ _, 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 --git a/testcases/features/sfc/sfc_colorado1.py b/testcases/features/sfc/sfc_colorado1.py
index 103d10b18..5b04c32a9 100755
--- a/testcases/features/sfc/sfc_colorado1.py
+++ b/testcases/features/sfc/sfc_colorado1.py
@@ -160,6 +160,12 @@ def main():
port_range_min=22,
port_range_max=22)
+ _, 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
diff --git a/utils/openstack_utils.py b/utils/openstack_utils.py
index da9bc5a1b..e0da7d97d 100755
--- a/utils/openstack_utils.py
+++ b/utils/openstack_utils.py
@@ -211,9 +211,10 @@ def get_flavor_id_by_ram_range(nova_client, min_ram, max_ram):
return id
-def create_flavor(nova_client, flavor_name, ram, disk, vcpus):
+def create_flavor(nova_client, flavor_name, ram, disk, vcpus, public=True):
try:
- flavor = nova_client.flavors.create(flavor_name, ram, vcpus, disk)
+ flavor = nova_client.flavors.create(
+ flavor_name, ram, vcpus, disk, is_public=public)
try:
extra_specs = ft_utils.get_functest_config(
'general.flavor_extra_specs')
@@ -229,7 +230,7 @@ def create_flavor(nova_client, flavor_name, ram, disk, vcpus):
return flavor.id
-def get_or_create_flavor(flavor_name, ram, disk, vcpus):
+def get_or_create_flavor(flavor_name, ram, disk, vcpus, public=True):
flavor_exists = False
nova_client = get_nova_client()
@@ -240,7 +241,8 @@ def get_or_create_flavor(flavor_name, ram, disk, vcpus):
else:
logger.info("Creating flavor '%s' with '%s' RAM, '%s' disk size, "
"'%s' vcpus..." % (flavor_name, ram, disk, vcpus))
- flavor_id = create_flavor(nova_client, flavor_name, ram, disk, vcpus)
+ flavor_id = create_flavor(
+ nova_client, flavor_name, ram, disk, vcpus, public=public)
if not flavor_id:
logger.error("Failed to create flavor '%s'..." % (flavor_name))
else: