From e0e3c606a009d151e8f4ba24f9d04a288bd403a7 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 9 Mar 2017 16:43:02 +0400 Subject: [PATCH] [tempest/defcore] Configure volume device name Actually attach_detach_volume must be skipped because the device name ain't reliable and that's using a hard-coded device name in config. This test should just get the device info after the attach and use that rather than the hard-coded config option in Tempest that ain't likely to work - the test should have been written more dynamically. However, set volume device name to "vdc" since "vdb" is used for config drive when force_config_drive=True is in action. Change-Id: Ic70de93a609df932c7749a94f71505e927df1b79 Signed-off-by: Michael Polenchuk (cherry picked from commit 3b006a6a3742325c0fe4ccc557b7a8e140f2cab2) --- functest/ci/config_functest.yaml | 1 + functest/opnfv_tests/openstack/tempest/conf_utils.py | 2 ++ functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index b358a3323..b3912b8a5 100755 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -112,6 +112,7 @@ tempest: router_name: tempest-router use_custom_images: False use_custom_flavors: False + volume_device_name: vdc rally: deployment_name: opnfv-rally diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 2c113367b..dc08aa25d 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -153,6 +153,8 @@ def configure_tempest_update_params(tempest_conf_file, 'compute', 'fixed_network_name', CONST.tempest_private_net_name) + config.set('compute', 'volume_device_name', + CONST.tempest_volume_device_name) if CONST.tempest_use_custom_images: if IMAGE_ID is not None: config.set('compute', 'image_ref', IMAGE_ID) diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt b/functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt index 1456db877..fbbee2ffc 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt @@ -1,7 +1,7 @@ # Set of DefCore tempest test cases not flagged and required. It only contains OpenStack core (no object storage) # The approved guidelines (2016.08) are valid for Kilo, Liberty, Mitaka and Newton releases of OpenStack # The list can be generated using the Rest API from RefStack project: -# https://refstack.openstack.org/api/v1/guidelines/2016.08/tests?target=compute&type=required&alias=true&flag=false +# https://refstack.openstack.org/api/v1/guidelines/2017.01/tests?target=compute&type=required&alias=true&flag=false tempest.api.compute.images.test_images_oneserver.ImagesOneServerTestJSON.test_create_delete_image[id-3731d080-d4c5-4872-b41a-64d0d0021314] tempest.api.compute.images.test_images_oneserver.ImagesOneServerTestJSON.test_create_image_specify_multibyte_character_image_name[id-3b7c6fe4-dfe7-477c-9243-b06359db51e6] tempest.api.compute.servers.test_create_server.ServersTestJSON.test_host_name_is_same_as_server_name[id-ac1ad47f-984b-4441-9274-c9079b7a0666] @@ -14,6 +14,7 @@ tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_list_s tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_list_servers_with_detail[id-585e934c-448e-43c4-acbf-d06a9b899997] tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_verify_created_server_vcpus[id-cbc0f52f-05aa-492b-bdc1-84b575ca294b] tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_verify_server_details[id-5de47127-9977-400a-936f-abcfbec1218f] +tempest.api.compute.servers.test_delete_server.DeleteServersTestJSON.test_delete_active_server[id-925fdfb4-5b13-47ea-ac8a-c36ae6fddb05] tempest.api.compute.servers.test_instance_actions.InstanceActionsTestJSON.test_get_instance_action[id-aacc71ca-1d70-4aa5-bbf6-0ff71470e43c] tempest.api.compute.servers.test_instance_actions.InstanceActionsTestJSON.test_list_instance_actions[id-77ca5cc5-9990-45e0-ab98-1de8fead201a] tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_detailed_filter_by_flavor[id-80c574cc-0925-44ba-8602-299028357dd9] @@ -245,4 +246,4 @@ tempest.api.volume.test_volumes_snapshots_negative.VolumesV2SnapshotNegativeTest tempest.api.volume.test_volumes_snapshots_negative.VolumesV2SnapshotNegativeTestJSON.test_create_snapshot_without_passing_volume_id[id-bb9da53e-d335-4309-9c15-7e76fd5e4d6d] tempest.api.volume.v2.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_details_pagination[id-e9138a2c-f67b-4796-8efa-635c196d01de] tempest.api.volume.v2.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_details_with_multiple_params[id-2a7064eb-b9c3-429b-b888-33928fc5edd3] -tempest.api.volume.v2.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_pagination[id-af55e775-8e4b-4feb-8719-215c43b0238c] \ No newline at end of file +tempest.api.volume.v2.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_pagination[id-af55e775-8e4b-4feb-8719-215c43b0238c] -- 2.16.6