Patch to make flavor configuration for tests more flexible.

Also fixed potential issues with downloading images from https locations

JIRA: SNAPS-254

Change-Id: Ib81569df499bbf0652c2025fc7de37af92525f7f
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

1 files changed, 27 insertions, 0 deletions

diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py
index 516d24d..b4101a6 100644
--- a/snaps/openstack/tests/openstack_tests.py
+++ b/snaps/openstack/tests/openstack_tests.py
@@ -16,6 +16,7 @@ import logging
 import re
 
 from snaps import file_utils
+from snaps.config.flavor import FlavorConfig
 from snaps.config.image import ImageConfig
 from snaps.config.network import NetworkConfig, SubnetConfig
 from snaps.config.router import RouterConfig
@@ -328,6 +329,32 @@ def get_pub_net_config(
                            netconf_override=netconf_override)
 
 
+def get_flavor_config(name, ram, disk, vcpus, ephemeral=None, swap=None,
+                      rxtx_factor=None, is_public=None, metadata=None):
+    if metadata:
+        if 'ram' in metadata:
+            ram = metadata['ram']
+        if 'disk' in metadata:
+            disk = metadata['disk']
+        if 'vcpus' in metadata:
+            vcpus = metadata['vcpus']
+        if 'ephemeral' in metadata:
+            ephemeral = metadata['ephemeral']
+        if 'swap' in metadata:
+            swap = metadata['swap']
+        if 'rxtx_factor' in metadata:
+            rxtx_factor = metadata['rxtx_factor']
+        if 'is_public' in metadata:
+            is_public = metadata['is_public']
+        if 'metadata' in metadata:
+            metadata = metadata['metadata']
+
+    return FlavorConfig(
+        name=name, ram=ram, disk=disk, vcpus=vcpus, ephemeral=ephemeral,
+        swap=swap, rxtx_factor=rxtx_factor, is_public=is_public,
+        metadata=metadata)
+
+
 class OSNetworkConfig:
     """
     Represents the settings required for the creation of a network in OpenStack