openstack
/
fuel-qa
Code Issues Proposed changes

Update vCenter tests for DVS plugin 3.0.0 

vCenter tests were updated for 9.0 release.

Change-Id: Ib3960a1169af83896b6bfccee78e9012fc40b870
This commit is contained in:
Ilya Bumarskov 2016-03-29 16:30:50 +03:00
parent e968e7f7ee
commit 3bd6269b32
23 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuelweb_test/models/fuel_web_client.py
View File

@ -2465,8 +2465,8 @@ class FuelWebClient(object):
for option, value in data.items(): for option, value in data.items():
path = option.split("/") path = option.split("/")
for p in path[:-1]: for p in path[:-1]:
plugin_data = plugin_data[p] plugin_settings = plugin_data[p]
plugin_data[path[-1]] = value plugin_settings[path[-1]] = value
self.client.update_cluster_attributes(cluster_id, attr) self.client.update_cluster_attributes(cluster_id, attr)
@staticmethod @staticmethod

9
system_test/actions/vcenter_actions.py
View File

@ -60,9 +60,14 @@ class VMwareActions(object):
self.plugin_name), self.plugin_name),
msg) msg)
options = {'vmware_dvs_net_maps/value': self.full_config[ options = {
'vmware_dvs_fw_driver/value': self.full_config[
'template']['cluster_template']['settings']['vmware_dvs'][ 'template']['cluster_template']['settings']['vmware_dvs'][
'dvswitch_name']} 'dvs_fw_driver'],
'vmware_dvs_net_maps/value': self.full_config[
'template']['cluster_template']['settings']['vmware_dvs'][
'dvswitch_name']
}
self.fuel_web.update_plugin_settings( self.fuel_web.update_plugin_settings(
self.cluster_id, self.plugin_name, self.plugin_version, options) self.cluster_id, self.plugin_name, self.plugin_version, options)

3
system_test/tests_templates/cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml Normal file
View File

@ -0,0 +1,3 @@
---
dvswitch_name: !os_env DVS_NAME, Cluster1:dvSwitch
dvs_fw_driver: false

3
system_test/tests_templates/cluster_configs/settings/vmware/dvs/dvs_main.yaml Normal file
View File

@ -0,0 +1,3 @@
---
dvswitch_name: !os_env DVS_NAME, Cluster1:dvSwitch;Cluster2:dvSwitch
dvs_fw_driver: false

2
system_test/tests_templates/cluster_configs/settings/vmware/dvs_main.yaml
View File

@ -1,2 +0,0 @@
---
dvswitch_name: !os_env DVS_NAME, dvSwitch

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_cindervmware.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_controller.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
!include cluster_configs/settings/vmware/vcenter_glance.yaml !include cluster_configs/settings/vmware/vcenter_glance.yaml
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ceilometer_and_computevmware.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ceph_and_computevmware.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_cindervmdk_and_computevmware.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_computevmware.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_cindervmware.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_controller.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
!include cluster_configs/settings/vmware/vcenter_glance.yaml !include cluster_configs/settings/vmware/vcenter_glance.yaml
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_bvt.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
!include cluster_configs/settings/vmware/vcenter_glance.yaml !include cluster_configs/settings/vmware/vcenter_glance.yaml
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_dvs_smoke.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_glance_backend_and_computevmware.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
!include cluster_configs/settings/vmware/vcenter_glance.yaml !include cluster_configs/settings/vmware/vcenter_glance.yaml
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_ceilometer.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_ceph.yaml
View File

@ -25,7 +25,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_cinder_and_ceph.yaml
View File

@ -25,7 +25,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_ha_multiple_clusters.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_ceilometer.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_cindervmdk_and_ceph.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller

2
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_multiroles_cindervmdk_and_cinder.yaml
View File

@ -20,7 +20,7 @@ template:
glance: glance:
enable: false enable: false
vmware_dvs: vmware_dvs:
!include cluster_configs/settings/vmware/dvs_main.yaml !include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes: nodes:
- roles: - roles:
- controller - controller