Fix failover tests for vCenter

Change-Id: I467b1914a4b334a0370f14f9f578c367b752ee89
Related-bug: #1575742
This commit is contained in:
ekhomyakova 2016-05-24 18:59:18 +03:00
parent 7cfeedf68e
commit a339f77220
5 changed files with 23 additions and 13 deletions

View File

@ -839,3 +839,9 @@ class VMwareActions(object):
private_ips[vm[1]],
primary_ctrl_name),
'Ping between VMs failed')
@deferred_decorator([make_snapshot_if_step_fail])
@action
def wait_ha_services(self):
"""Wait for HA services."""
self.fuel_web.assert_ha_services_ready(self.cluster_id)

View File

@ -60,11 +60,12 @@ class HardResetPrimaryWithVMware(ActionTest, BaseActions, VMwareActions):
'deploy_cluster',
'create_instances',
'hard_reset_primary',
'wait_ha_services',
'network_check',
'check_up_vips',
'check_vm_connect',
'delete_instances',
'health_check_sanity_smoke_ha'
'health_check'
]
@ -110,14 +111,16 @@ class ShutdownPrimaryWithVMware(ActionTest, BaseActions, VMwareActions):
'deploy_cluster',
'create_instances',
'shutdown_primary',
'wait_ha_services',
'network_check',
'check_up_vips',
'check_vm_connect',
'delete_instances',
'ostf_with_services_fail',
'turn_on_primary',
'wait_ha_services',
'network_check',
'health_check_sanity_smoke_ha'
'health_check'
]
@ -160,11 +163,12 @@ class SafeRebootPrimaryWithVMware(ActionTest, BaseActions, VMwareActions):
'deploy_cluster',
'create_instances',
'safe_reboot_primary',
'wait_ha_services',
'network_check',
'check_up_vips',
'check_vm_connect',
'delete_instances',
'health_check_sanity_smoke_ha'
'health_check'
]
@ -184,13 +188,13 @@ class ShutdownCinderNodeWithVMware(ActionTest, BaseActions, VMwareActions):
7. Deploy the cluster
8. Create instances on KVM and vCenter
9. Run all OSTF tests
10. Shutdown one of CinderVMDK node
10. Shutdown one of CinderVMDK node (depends on yaml config)
11. Run vCenter OSTF tests
12. Power on CinderVMDK node and wait for it to load
12. Power on CinderVMDK node and wait for it to load (depends on yaml)
13. Run vCenter OSTF tests
14. Shutdown another CinderVMDK node
14. Shutdown another CinderVMDK node (depends on yaml config)
15. Run vCenter OSTF tests
16. Power on CinderVMDK node and wait for it to load
16. Power on CinderVMDK node and wait for it to load (depends on yaml)
17. Run all OSTF tests
Duration 3h 00min
@ -236,7 +240,7 @@ class RebootCinderNodeWithVMware(ActionTest, BaseActions, VMwareActions):
5. Add nodes (depends on yaml config)
6. Configure vmware settings (depends on yaml config)
7. Deploy the cluster
8. Reboot CinderVMware node.
8. Reboot CinderVMware node (depends on yaml config)
9. Check CinderVMware services.
Duration 3h 00min
@ -345,7 +349,7 @@ class DeployIDSWithVMware(ActionTest, BaseActions, VMwareActions):
8. Deploy the cluster
9. Run OSTF tests (should fail)
Duration 3h 00min
Duration 2h 00min
Snapshot vcenter_idatastore
"""

View File

@ -18,7 +18,7 @@ template:
nova-compute:
!include cluster_configs/settings/vmware/nova_compute/2clusters_ctrl.yaml
glance:
!include cluster_configs/settings/vmware/vcenter_glance.yaml
enable: false
vmware_dvs:
!include cluster_configs/settings/vmware/dvs/dvs_main.yaml
nodes:

View File

@ -18,7 +18,7 @@ template:
nova-compute:
!include cluster_configs/settings/vmware/nova_compute/1cluster_ctrl.yaml
glance:
enable: !include cluster_configs/settings/vmware/vcenter_glance.yaml
!include cluster_configs/settings/vmware/vcenter_glance.yaml
vmware_dvs:
!include cluster_configs/settings/vmware/dvs/dvs_1cluster.yaml
nodes:

View File

@ -18,11 +18,11 @@ template:
nova-compute:
- cluster: Cluster1
srv_name: srv_cluster1
datastore: datastore1
datastore: datastore.*
target_node: controllers
- cluster: Cluster2
srv_name: srv_cluster2
datastore: datastore1
datastore: datastore.*
target_node: compute-vmware
glance:
enable: false