summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-06-11 14:16:37 +0800
committerspisarski <s.pisarski@cablelabs.com>2017-06-11 14:16:37 +0800
commit0f407db1cc01d8d58e4e0b0f4ecafc69ef1a17a4 (patch)
treebacf05a90b9cc4376616a4416ec845ce0d126be7
parent95d35a166fc66944fb0fc6091f4b84568aef0e7d (diff)
Fixed problems found in Functest after implementing offline testing.
JIRA: FUNCTEST-809 Change-Id: I5e579b141eb513b0f9db36959014b8f945afe6a0 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
-rw-r--r--snaps/openstack/tests/create_stack_tests.py2
-rw-r--r--snaps/openstack/utils/tests/heat_utils_tests.py2
-rw-r--r--snaps/test_suite_builder.py3
3 files changed, 4 insertions, 3 deletions
diff --git a/snaps/openstack/tests/create_stack_tests.py b/snaps/openstack/tests/create_stack_tests.py
index bee1340..42d74d8 100644
--- a/snaps/openstack/tests/create_stack_tests.py
+++ b/snaps/openstack/tests/create_stack_tests.py
@@ -134,7 +134,7 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
self.image_creator = OpenStackImage(
self.os_creds, openstack_tests.cirros_image_settings(
- name=self.__class__.__name__ + '-' + str(self.guid) + '-image'))
+ name=self.__class__.__name__ + '-' + str(self.guid) + '-image', image_metadata=self.image_metadata))
self.image_creator.create()
# Create Flavor
diff --git a/snaps/openstack/utils/tests/heat_utils_tests.py b/snaps/openstack/utils/tests/heat_utils_tests.py
index 3d9fe84..95f83ce 100644
--- a/snaps/openstack/utils/tests/heat_utils_tests.py
+++ b/snaps/openstack/utils/tests/heat_utils_tests.py
@@ -76,7 +76,7 @@ class HeatUtilsCreateStackTests(OSComponentTestCase):
self.image_creator = OpenStackImage(
self.os_creds, openstack_tests.cirros_image_settings(
- name=self.__class__.__name__ + '-' + str(guid) + '-image'))
+ name=self.__class__.__name__ + '-' + str(guid) + '-image', image_metadata=self.image_metadata))
self.image_creator.create()
# Create Flavor
diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py
index 7e0c76a..e4f5685 100644
--- a/snaps/test_suite_builder.py
+++ b/snaps/test_suite_builder.py
@@ -143,7 +143,8 @@ def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True, im
suite.addTest(OSComponentTestCase.parameterize(
CreateFlavorTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
suite.addTest(OSComponentTestCase.parameterize(
- HeatUtilsCreateStackTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+ HeatUtilsCreateStackTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level,
+ image_metadata=image_metadata))
def add_openstack_integration_tests(suite, os_creds, ext_net_name, use_keystone=True, flavor_metadata=None,