openstack
/
fuel-qa
Code Issues Proposed changes

Add tests with changing of vSphere cluster configuration 

Change-Id: Iddad9ea9127ce46eab94d3b3f74d828f53aad8df
Closes-bug: #1612584
This commit is contained in:
ibumarskov 2016-08-23 14:23:29 +03:00 committed by Ilya Bumarskov
parent 83175d5290
commit 06cee3fd77
10 changed files with 214 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
system_test/actions/base.py
View File

@ -453,15 +453,17 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions,
for node in step_config:
if node['action'] == 'add':
self._add_node([node])
if node.get('vmware_vcenter'):
nova_computes = node['vmware_vcenter']['nova-compute']
dvs_settings = node['vmware_dvs']
self.add_vmware_nova_compute(nova_computes)
self.update_dvs_plugin_settings(dvs_settings)
elif node['action'] == 'delete':
self._del_node([node])
if 'compute-vmware' in node['roles']:
self.del_vmware_nova_compute()
elif node['action'] == 'reconfigure':
if node.get('vmware_vcenter'):
nova_computes = node['vmware_vcenter']['nova-compute']
self.add_vmware_nova_compute(nova_computes)
if node.get('vmware_dvs'):
dvs_settings = node['vmware_dvs']
self.update_dvs_plugin_settings(dvs_settings)
else:
logger.error("Unknown scale action: {}".format(node['action']))
self.scale_step += 1
@ -544,6 +546,9 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions,
comp_vmware_nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
self.cluster_id, ['compute-vmware'], role_status='pending_roles')
comp_vmware_nodes = [n for n in comp_vmware_nodes if
n['pending_addition']]
for instance in nova_computes:
cluster_name = instance['cluster']
srv_name = instance['srv_name']
@ -554,6 +559,9 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions,
else:
target_node = instance['target_node']
vcenter_data[:] = [n for n in vcenter_data if
cluster_name != n['vsphere_cluster']]
vcenter_data.append(
{"vsphere_cluster": cluster_name,
"service_name": srv_name,

1
system_test/tests/vcenter/test_vcenter_dvs.py
View File

@ -99,6 +99,7 @@ class ScaleWithVMware(ActionTest, BaseActions, VMwareActions):
'deploy_cluster',
'scale_node',
'deploy_changes',
'check_nova_conf',
'health_check_sanity_smoke_ha'
]

2
system_test/tests_templates/cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
View File

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

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

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

45
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_cluster_to_ctrl.yaml Normal file
View File

@ -0,0 +1,45 @@
---
template:
name: 1 controller, 1 cinder-vmware on Neutron/VLAN with DVS plugin
slaves: 2
cluster_template:
name: vcenter_add_cluster_to_ctrl
release: ubuntu
network:
!include cluster_configs/networks/neutron_vlan.yaml
settings:
components:
!include cluster_configs/settings/components/wo_components.yaml
storages:
!include cluster_configs/settings/storages/cinder_only.yaml
vmware_vcenter:
settings:
!include cluster_configs/settings/vmware/vcenter_main.yaml
nova-compute:
!include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml
glance:
enable: false
vmware_dvs:
!include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
nodes:
- roles:
- controller
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
- roles:
- cinder-vmware
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
scale_nodes:
- - action: reconfigure
vmware_vcenter:
nova-compute:
- cluster: Cluster2
srv_name: srv_cluster2
datastore: .*
target_node: controllers
vmware_dvs:
dvswitch_name: !os_env DVS_NAME, Cluster1:Cluster1;Cluster2:Cluster2
dvs_fw_driver: false

3
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_add_computevmware.yaml
View File

@ -39,6 +39,7 @@ template:
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
action: add
- action: reconfigure
vmware_vcenter:
nova-compute:
- cluster: Cluster2
@ -46,5 +47,5 @@ template:
datastore: .*
target_node: compute-vmware
vmware_dvs:
dvswitch_name: !os_env DVS_NAME, Cluster1:dvSwitch;Cluster2:dvSwitch
dvswitch_name: !os_env DVS_NAME, Cluster1:Cluster1;Cluster2:Cluster2
dvs_fw_driver: false

6
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_delete_computevmware.yaml
View File

@ -43,4 +43,8 @@ template:
- compute-vmware
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
action: delete
action: delete
- action: reconfigure
vmware_dvs:
dvswitch_name: !os_env DVS_NAME, Cluster1:Cluster1
dvs_fw_driver: false

52
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_compute_to_compute.yaml Normal file
View File

@ -0,0 +1,52 @@
---
template:
name: 1 controller, 1 compute-vmware on Neutron/VLAN with DVS plugin
slaves: 3
cluster_template:
name: vcenter_mv_cluster_compute_to_compute
release: ubuntu
network:
!include cluster_configs/networks/neutron_vlan.yaml
settings:
components:
!include cluster_configs/settings/components/wo_components.yaml
storages:
!include cluster_configs/settings/storages/cinder_only.yaml
vmware_vcenter:
settings:
!include cluster_configs/settings/vmware/vcenter_main.yaml
nova-compute:
!include cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml
glance:
enable: false
vmware_dvs:
!include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
nodes:
- roles:
- controller
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
- roles:
- compute-vmware
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
scale_nodes:
- - roles:
- compute-vmware
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
action: add
- roles:
- compute-vmware
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
action: delete
- action: reconfigure
vmware_vcenter:
nova-compute:
- cluster: Cluster1
srv_name: srv_cluster1
datastore: .*
target_node: compute-vmware

47
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_compute_to_ctrl.yaml Normal file
View File

@ -0,0 +1,47 @@
---
template:
name: 1 controller, 1 compute-vmware on Neutron/VLAN with DVS plugin
slaves: 2
cluster_template:
name: vcenter_mv_cluster_compute_to_ctrl
release: ubuntu
network:
!include cluster_configs/networks/neutron_vlan.yaml
settings:
components:
!include cluster_configs/settings/components/wo_components.yaml
storages:
!include cluster_configs/settings/storages/cinder_only.yaml
vmware_vcenter:
settings:
!include cluster_configs/settings/vmware/vcenter_main.yaml
nova-compute:
!include cluster_configs/settings/vmware/nova_compute/1cluster_comp-vmware.yaml
glance:
enable: false
vmware_dvs:
!include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
nodes:
- roles:
- controller
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
- roles:
- compute-vmware
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
scale_nodes:
- - roles:
- compute-vmware
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
action: delete
- action: reconfigure
vmware_vcenter:
nova-compute:
- cluster: Cluster1
srv_name: srv_cluster1
datastore: .*
target_node: controllers

47
system_test/tests_templates/tests_configs/vcenter_dvs/vcenter_mv_cluster_ctrl_to_compute.yaml Normal file
View File

@ -0,0 +1,47 @@
---
template:
name: 1 controller, 1 cinder-vmware, 1 compute-vmware on Neutron/VLAN with DVS plugin
slaves: 3
cluster_template:
name: vcenter_mv_cluster_ctrl_to_compute
release: ubuntu
network:
!include cluster_configs/networks/neutron_vlan.yaml
settings:
components:
!include cluster_configs/settings/components/wo_components.yaml
storages:
!include cluster_configs/settings/storages/cinder_only.yaml
vmware_vcenter:
settings:
!include cluster_configs/settings/vmware/vcenter_main.yaml
nova-compute:
!include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml
glance:
enable: false
vmware_dvs:
!include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
nodes:
- roles:
- controller
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
- roles:
- cinder-vmware
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
scale_nodes:
- - roles:
- compute-vmware
iface: !include cluster_configs/settings/vmware/vcenter_ifaces.yaml
count: 1
action: add
- action: reconfigure
vmware_vcenter:
nova-compute:
- cluster: Cluster1
srv_name: srv_cluster1
datastore: .*
target_node: compute-vmware