diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2017-03-07 16:52:35 +0200 |
|---|---|---|
| committer | Cristina Pauna <cristina.pauna@enea.com> | 2017-03-08 10:13:56 +0200 |
| commit | bc437b2bc76839ae7872bdefe39e7e39b54b1194 (patch) | |
| tree | b8421fcb303e128081d9b4f7037025efefd48cd7 /snaps/test_suite_builder.py | |
| parent | ebf6b1653e731c757f56a26a67096fa8bed38557 (diff) | |
Adapt integration tests to use custom image config
This fix uses the possibility to pass custom imformation about the
image via image_metadata variable. In the integration tests it checks
for this info and creates a 3-part image if the kernel_url and
ramdisk_url are set. The fix also allows the default url to be overriden
as well as passing extra-properties. All the metadata info comes from
the app.
The part in functest where the custom config is set for creating a 3-part
image is https://gerrit.opnfv.org/gerrit/29987
Change-Id: Ib2ad823705dbea68d672514c7c89b150c9c6dc63
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Diffstat (limited to 'snaps/test_suite_builder.py')
| -rw-r--r-- | snaps/test_suite_builder.py | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py index 2800d04..bf4bcdb 100644 --- a/snaps/test_suite_builder.py +++ b/snaps/test_suite_builder.py @@ -161,28 +161,36 @@ def add_openstack_integration_tests(suite, source_filename, ext_net_name, proxy_ # Creator Object tests suite.addTest(OSIntegrationTestCase.parameterize(CreateSecurityGroupTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateImageSuccessTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateImageNegativeTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateMultiPartImageTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateKeypairsTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateNetworkSuccessTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateRouterSuccessTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateRouterNegativeTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) # VM Instances suite.addTest(OSIntegrationTestCase.parameterize(SimpleHealthCheck, source_filename, ext_net_name, @@ -191,33 +199,41 @@ def add_openstack_integration_tests(suite, source_filename, ext_net_name, proxy_ log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateInstanceSimpleTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateInstancePortManipulationTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(InstanceSecurityGroupTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateInstanceOnComputeHost, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateInstanceFromThreePartImage, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) if use_floating_ips: suite.addTest(OSIntegrationTestCase.parameterize(CreateInstanceSingleNetworkTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, ssh_proxy_cmd=ssh_proxy_cmd, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(CreateInstancePubPrivNetTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, ssh_proxy_cmd=ssh_proxy_cmd, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) suite.addTest(OSIntegrationTestCase.parameterize(AnsibleProvisioningTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, ssh_proxy_cmd=ssh_proxy_cmd, use_keystone=use_keystone, - flavor_metadata=flavor_metadata, log_level=log_level)) + flavor_metadata=flavor_metadata, image_metadata=image_metadata, + log_level=log_level)) def add_openstack_staging_tests(suite, source_filename, ext_net_name, proxy_settings=None, log_level=logging.INFO): |