Config volume_device_name as vdc for fuel

JIRA: FUNCTEST-947

Change-Id: I69a83dc69eaa4379c630e201e837f29311c716b9
Signed-off-by: Linda Wang <wangwulin@huawei.com>

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 786a7c5..e50c61a 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -229,6 +229,7 @@ def update_tempest_conf_file(conf_file, rconfig):
 def configure_tempest_update_params(tempest_conf_file, network_name=None,
                                     image_id=None, flavor_id=None,
                                     compute_cnt=1):
+    # pylint: disable=too-many-branches
     """
     Add/update needed parameters into tempest.conf file
     """
@@ -236,6 +237,8 @@ def configure_tempest_update_params(tempest_conf_file, network_name=None,
     rconfig = ConfigParser.RawConfigParser()
     rconfig.read(tempest_conf_file)
     rconfig.set('compute', 'fixed_network_name', network_name)
+    if CI_INSTALLER_TYPE == 'fuel':
+        setattr(config.CONF, 'tempest_volume_device_name', 'vdc')
     rconfig.set('compute', 'volume_device_name',
                 getattr(config.CONF, 'tempest_volume_device_name'))