diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2017-03-02 14:53:17 +0000 |
|---|---|---|
| committer | Cristina Pauna <cristina.pauna@enea.com> | 2017-03-06 20:20:43 +0200 |
| commit | ebf6b1653e731c757f56a26a67096fa8bed38557 (patch) | |
| tree | c1b41b7a8e2dc714bb322f2742dd5339d140a659 /snaps/test_suite_builder.py | |
| parent | 06e3b9ca9abd8bc3d96707bbb2de0c460a196f2f (diff) | |
Adapt simple health check to use 3-part image
This fix adds the possibility to pass custom imformation about the
image via image_metadata variable. In SimpleHealthcheck 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/#/c/29851/
JIRA: ARMBAND-222
Change-Id: I11435d8bab4cf097b4079b6984741869f83aee2b
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 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py index 1768921..2800d04 100644 --- a/snaps/test_suite_builder.py +++ b/snaps/test_suite_builder.py @@ -134,8 +134,8 @@ def add_openstack_api_tests(suite, source_filename, ext_net_name, http_proxy_str def add_openstack_integration_tests(suite, source_filename, ext_net_name, proxy_settings=None, ssh_proxy_cmd=None, - use_keystone=True, flavor_metadata=None, use_floating_ips=True, - log_level=logging.INFO): + use_keystone=True, flavor_metadata=None, image_metadata=None, + use_floating_ips=True, log_level=logging.INFO): """ Adds tests written to exercise all long-running OpenStack integration tests meaning they will be creating VM instances and potentially performing some SSH functions through floating IPs @@ -146,6 +146,9 @@ def add_openstack_integration_tests(suite, source_filename, ext_net_name, proxy_ :param ssh_proxy_cmd: the command your environment requires for creating ssh connections through a proxy :param use_keystone: when True, tests requiring direct access to Keystone are added as these need to be running on a host that has access to the cloud's private network + :param image_metadata: dict() object containing metadata for creating an image with custom config: + (i.e. {'hw_video_model' : 'vga'}). It can be used to override the default url and + create 3-part images by passing kerner_url and ramdisk_url info :param flavor_metadata: dict() object containing the metadata required by your flavor based on your configuration: (i.e. {'hw:mem_page_size': 'large'}) :param use_floating_ips: when true, all tests requiring Floating IPs will be added to the suite @@ -184,7 +187,8 @@ def add_openstack_integration_tests(suite, source_filename, ext_net_name, proxy_ # VM Instances suite.addTest(OSIntegrationTestCase.parameterize(SimpleHealthCheck, 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(CreateInstanceSimpleTests, source_filename, ext_net_name, http_proxy_str=proxy_settings, use_keystone=use_keystone, flavor_metadata=flavor_metadata, log_level=log_level)) |