openstack
/
fuel-qa
Code Issues Proposed changes

Decrement should_fail tests for nova services 

Now OSTF only considers nova services for online
(according to Nailgun) computes that are part of
the active cluster. It will skip deleted nodes,
and therefore there should be less failures.

Depends-On: I56765f6cf889b6afb9780b32857a164e2b62c340
Change-Id: Ie94eccf2608db1d3d800e017a9c91541461f81ee
Related-Bug: #1570847
(cherry picked from commit 73d421b70f)
This commit is contained in:
Matthew Mosesohn 2016-04-21 19:38:07 +03:00 committed by Vladimir Khlyunev
parent fd21d14664
commit d1438f50cd
18 changed files with 59 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fuelweb_test/tests/plugins/plugin_contrail/test_fuel_plugin_contrail.py
View File

@ -411,11 +411,10 @@ class ContrailPlugin(TestBasic):
self.fuel_web.run_ostf(
cluster_id=self.cluster_id,
should_fail=3,
should_fail=2,
failed_test_name=[('Check network connectivity '
'from instance via floating IP'),
'Launch instance with file injection',
'Check that required services are running']
'Launch instance with file injection']
)
logger.info(self._ostf_msg)
@ -614,11 +613,10 @@ class ContrailPlugin(TestBasic):
self.fuel_web.run_ostf(
cluster_id=self.cluster_id,
should_fail=3,
should_fail=2,
failed_test_name=[('Check network connectivity '
'from instance via floating IP'),
'Launch instance with file injection',
'Check that required services are running']
'Launch instance with file injection']
)
logger.info(self._ostf_msg)
@ -790,9 +788,8 @@ class ContrailPlugin(TestBasic):
self.fuel_web.run_ostf(
cluster_id=self.cluster_id,
should_fail=3,
should_fail=2,
failed_test_name=[('Check network connectivity '
'from instance via floating IP'),
'Launch instance with file injection',
'Check that required services are running']
'Launch instance with file injection']
)

2
fuelweb_test/tests/plugins/plugin_example/test_fuel_plugin_example_postdeploy.py
View File

@ -162,7 +162,7 @@ class ExamplePluginPostDeploy(TestBasic):
nodes_dict={node: ['controller'] for node in nodes},
pending_addition=False, pending_deletion=True
)
self.deploy_cluster_wait(check_services=False)
self.deploy_cluster_wait(check_services=True)
self.fuel_web.verify_network(cluster_id=self.cluster_id)

3
fuelweb_test/tests/test_cli.py
View File

@ -313,8 +313,7 @@ class CommandLineTest(test_cli_base.CommandLine):
self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(
cluster_id=cluster_id, test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
cluster_id=cluster_id, test_sets=['ha', 'smoke', 'sanity'])
@test(depends_on_groups=['cli_selected_nodes_deploy'],
groups=["cli_cluster_deletion"])

21
fuelweb_test/tests/test_environment_action.py
View File

@ -339,15 +339,12 @@ class ControllerReplacement(base_test_case.TestBasic):
self.fuel_web.update_nodes(
cluster_id, {'slave-01': ['controller']}, False, True)
# Disable check services here, according to nova-manage shows
# XXX for node that we remove
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(cluster_id,
test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
test_sets=['ha', 'smoke', 'sanity'])
self.env.make_snapshot("deploy_ha_neutron_tun_ctrl_replacement")
@ -400,15 +397,12 @@ class ControllerReplacement(base_test_case.TestBasic):
self.fuel_web.update_nodes(
cluster_id, {'slave-01': ['controller']}, False, True)
# Disable check services here, according to nova-manage shows
# XXX for node that we remove
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(cluster_id,
test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
test_sets=['ha', 'smoke', 'sanity'])
self.env.make_snapshot("deploy_ha_neutron_vlan_ctrl_replacement")
@ -460,14 +454,11 @@ class ControllerReplacement(base_test_case.TestBasic):
self.fuel_web.update_nodes(
cluster_id, {'slave-01': ['controller']}, False, True)
# Disable check services here, according to nova-manage shows
# XXX for node that we remove
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(cluster_id,
test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
test_sets=['ha', 'smoke', 'sanity'])
self.env.make_snapshot("deploy_ha_nova_ctrl_replacement")

7
fuelweb_test/tests/test_neutron_tun.py
View File

@ -214,8 +214,7 @@ class TestHaNeutronAddCompute(TestBasic):
self.fuel_web.verify_network(cluster_id)
self.fuel_web.run_ostf(
cluster_id=cluster_id,
test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
test_sets=['ha', 'smoke', 'sanity'])
@test(groups=["ha", "ha_neutron_tun_scale"])
@ -392,7 +391,7 @@ class TestHaNeutronScalability(TestBasic):
)
# Step 14. Deploy changes
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
nodes = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
cluster_id, ['controller'])
@ -416,6 +415,6 @@ class TestHaNeutronScalability(TestBasic):
# Step 16-17. Run OSTF and sync time
self.fuel_web.run_ostf(
cluster_id=cluster_id,
test_sets=['sanity', 'smoke', 'ha'], should_fail=1)
test_sets=['sanity', 'smoke', 'ha'])
self.env.sync_time()
self.env.make_snapshot("neutron_vlan_ha_scalability")

6
fuelweb_test/tests/tests_cli/test_cli_deploy.py
View File

@ -90,8 +90,7 @@ class CommandLineAcceptanceDeploymentTests(test_cli_base.CommandLine):
self.show_step(9)
self.fuel_web.run_ostf(
cluster_id=cluster_id, test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
cluster_id=cluster_id, test_sets=['ha', 'smoke', 'sanity'])
@test(depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["cli_deploy_tasks"])
@ -166,5 +165,4 @@ class CommandLineAcceptanceDeploymentTests(test_cli_base.CommandLine):
self.fuel_web.verify_network(cluster_id)
self.show_step(8)
self.fuel_web.run_ostf(
cluster_id=cluster_id, test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
cluster_id=cluster_id, test_sets=['ha', 'smoke', 'sanity'])

7
fuelweb_test/tests/tests_patching/test_patching.py
View File

@ -216,9 +216,8 @@ class PatchingTests(TestBasic):
self.fuel_web.deploy_cluster_wait(cluster_id,
check_services=False)
self.fuel_web.verify_network(cluster_id)
# sanity set isn't running due to LP1457515
self.fuel_web.run_ostf(cluster_id=cluster_id,
test_sets=['smoke', 'ha'])
test_sets=['sanity', 'smoke', 'ha'])
if "ceph-osd" in roles:
with self.fuel_web.get_ssh_for_node(
@ -376,9 +375,9 @@ class PatchingMasterTests(TestBasic):
self.fuel_web.deploy_cluster_wait(cluster_id,
check_services=False)
self.fuel_web.verify_network(cluster_id)
# sanity set isn't running due to LP1457515
self.fuel_web.run_ostf(cluster_id=cluster_id,
test_sets=['smoke', 'ha'])
test_sets=['sanity', 'smoke', 'ha'])
if "ceph-osd" in roles:
with self.fuel_web.get_ssh_for_node(

8
fuelweb_test/tests/tests_scale/test_scale_group_2.py
View File

@ -95,11 +95,11 @@ class HaScaleGroup2(TestBasic):
True, False
)
self.show_step(8)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(10)
self.fuel_web.verify_network(cluster_id)
self.show_step(9)
self.fuel_web.run_ostf(cluster_id=cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
self.env.make_snapshot("replace_primary_controller")
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
@ -159,11 +159,11 @@ class HaScaleGroup2(TestBasic):
False, True
)
self.show_step(5)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(7)
self.fuel_web.verify_network(cluster_id)
self.show_step(6)
self.fuel_web.run_ostf(cluster_id=cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
node = self.fuel_web.get_nailgun_node_by_devops_node(
self.env.d_env.get_node(name='slave-01'))

8
fuelweb_test/tests/tests_scale/test_scale_group_3.py
View File

@ -99,11 +99,11 @@ class HaScaleGroup3(TestBasic):
False, True
)
self.show_step(11)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(12)
self.fuel_web.verify_network(cluster_id)
self.show_step(13)
self.fuel_web.run_ostf(cluster_id=cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
self.show_step(14)
nodes = {'slave-04': ['compute']}
@ -112,11 +112,11 @@ class HaScaleGroup3(TestBasic):
False, True
)
self.show_step(15)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(16)
self.fuel_web.verify_network(cluster_id)
self.show_step(17)
self.fuel_web.run_ostf(cluster_id=cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
self.env.make_snapshot("add_delete_compute")
@test(depends_on=[SetupEnvironment.prepare_slaves_9],

16
fuelweb_test/tests/tests_scale/test_scale_group_5.py
View File

@ -126,13 +126,13 @@ class HaScaleGroup5(TestBasic):
)
self.show_step(8)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(9)
self.fuel_web.verify_network(cluster_id)
self.show_step(10)
self.fuel_web.run_ostf(cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id)
self.show_step(11)
with self.fuel_web.get_ssh_for_node('slave-07') as remote_ceph:
@ -146,13 +146,13 @@ class HaScaleGroup5(TestBasic):
pending_deletion=True
)
self.show_step(12)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(13)
self.fuel_web.verify_network(cluster_id)
self.show_step(14)
self.fuel_web.run_ostf(cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id)
self.env.make_snapshot('add_delete_compute_cinder_ceph')
@ -260,13 +260,13 @@ class HaScaleGroup5(TestBasic):
)
self.show_step(9)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(10)
self.fuel_web.verify_network(cluster_id)
self.show_step(11)
self.fuel_web.run_ostf(cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id)
self.show_step(12)
with self.fuel_web.get_ssh_for_node('slave-03') as remote_ceph:
@ -281,12 +281,12 @@ class HaScaleGroup5(TestBasic):
)
self.show_step(13)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(14)
self.fuel_web.verify_network(cluster_id)
self.show_step(15)
self.fuel_web.run_ostf(cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id)
self.env.make_snapshot('add_delete_controller_cinder_ceph')

6
fuelweb_test/tests/tests_separate_services/test_separate_db.py
View File

@ -208,10 +208,8 @@ class SeparateDbFailover(TestBasic):
controller)['online'], timeout=60 * 5)
self.fuel_web.assert_ha_services_ready(cluster_id, should_fail=1)
self.fuel_web.assert_os_services_ready(cluster_id, timeout=15 * 60,
should_fail=1)
self.fuel_web.run_ostf(
cluster_id=cluster_id, should_fail=1)
self.fuel_web.assert_os_services_ready(cluster_id, timeout=15 * 60)
self.fuel_web.run_ostf(cluster_id=cluster_id)
@test(depends_on=[SeparateDb.separate_db_service],
groups=["separate_db_service_add_delete_node"])

6
fuelweb_test/tests/tests_separate_services/test_separate_keystone.py
View File

@ -222,11 +222,9 @@ class SeparateKeystoneFailover(TestBasic):
controller)['online'], timeout=60 * 5)
self.fuel_web.assert_ha_services_ready(cluster_id, should_fail=1)
self.fuel_web.assert_os_services_ready(cluster_id, timeout=15 * 60,
should_fail=1)
self.fuel_web.assert_os_services_ready(cluster_id, timeout=15 * 60)
self.fuel_web.run_ostf(
cluster_id=cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
@test(depends_on=[SeparateKeystone.separate_keystone_service],
groups=["separate_keystone_service_add_delete_node"])

6
fuelweb_test/tests/tests_separate_services/test_separate_multiroles.py
View File

@ -214,8 +214,6 @@ class SeparateAllFailover(TestBasic):
controller)['online'], timeout=60 * 5)
self.fuel_web.assert_ha_services_ready(cluster_id, should_fail=1)
self.fuel_web.assert_os_services_ready(cluster_id, timeout=15 * 60,
should_fail=1)
self.fuel_web.assert_os_services_ready(cluster_id, timeout=15 * 60)
self.fuel_web.run_ostf(
cluster_id=cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)

8
fuelweb_test/tests/tests_separate_services/test_separate_rabbitmq.py
View File

@ -207,11 +207,9 @@ class SeparateRabbitFailover(TestBasic):
controller)['online'], timeout=60 * 5)
self.fuel_web.assert_ha_services_ready(cluster_id, should_fail=1)
self.fuel_web.assert_os_services_ready(cluster_id, timeout=15 * 60,
should_fail=1)
self.fuel_web.assert_os_services_ready(cluster_id, timeout=15 * 60)
self.fuel_web.run_ostf(
cluster_id=cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
@test(depends_on=[SeparateRabbit.separate_rabbit_service],
groups=["separate_rabbit_service_add_delete_node"])
@ -264,7 +262,7 @@ class SeparateRabbitFailover(TestBasic):
False, True)
nodes = [_node for _node in nailgun_node
if _node["pending_deletion"] is True]
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
self.fuel_web.deploy_cluster_wait(cluster_id)
wait(lambda: self.fuel_web.is_node_discovered(nodes[0]),
timeout=6 * 60)
self.fuel_web.verify_network(cluster_id)

12
fuelweb_test/tests/tests_strength/test_failover_base.py
View File

@ -185,7 +185,7 @@ class TestHaFailoverBase(TestBasic):
# Wait for HA services ready
self.fuel_web.assert_ha_services_ready(cluster_id, should_fail=1)
# Wait until OpenStack services are UP
self.fuel_web.assert_os_services_ready(cluster_id, should_fail=1)
self.fuel_web.assert_os_services_ready(cluster_id)
logger.info("Waiting 300 sec before MySQL Galera will up, "
"then run OSTF")
@ -197,11 +197,11 @@ class TestHaFailoverBase(TestBasic):
# STEP: Run OSTF
self.show_step([4, 8][num])
# should fail 2 according to haproxy backends marked as fail
# should fail 1 according to one haproxy backend marked as fail
self.fuel_web.run_ostf(
cluster_id=cluster_id,
test_sets=['ha', 'smoke', 'sanity'],
should_fail=2)
should_fail=1)
def ha_disconnect_controllers(self):
if not self.env.revert_snapshot(self.snapshot_name):
@ -1069,8 +1069,7 @@ class TestHaFailoverBase(TestBasic):
# Run sanity and smoke tests to see if cluster operable
self.fuel_web.run_ostf(cluster_id=cluster_id,
should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
n_ctrls = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
cluster_id, ['controller'])
@ -1462,8 +1461,7 @@ class TestHaFailoverBase(TestBasic):
# Run sanity and smoke tests to see if cluster operable
self.show_step(11)
self.fuel_web.run_ostf(cluster_id=cluster_id,
should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
# turn on destroyed node
self.show_step(12)

3
fuelweb_test/tests/tests_strength/test_huge_environments.py
View File

@ -146,8 +146,7 @@ class HugeEnvironments(base_test_case.TestBasic):
self.fuel_web.run_ostf(
cluster_id=cluster_id,
test_sets=['ha', 'smoke', 'sanity'],
should_fail=1)
test_sets=['ha', 'smoke', 'sanity'])
@test(groups=["huge_environments", "huge_ha_neutron", "huge_scale"])

4
fuelweb_test/tests/tests_strength/test_neutron_base.py
View File

@ -446,9 +446,7 @@ class TestNeutronFailoverBase(base_test_case.TestBasic):
self.fuel_web.run_ostf(
cluster_id=cluster_id,
test_sets=['sanity'],
should_fail=1,
failed_test_name=['Check that required services are running'])
test_sets=['sanity'])
self.fuel_web.run_ostf(
cluster_id=cluster_id,

13
fuelweb_test/tests/tests_strength/test_restart.py
View File

@ -137,8 +137,7 @@ class CephRestart(TestBasic):
self.fuel_web.delete_node(nailgun_node_id)
self.fuel_web.check_ceph_status(cluster_id)
self.fuel_web.run_ostf(cluster_id=cluster_id,
test_sets=['sanity', 'smoke', 'ha'],
should_fail=1)
test_sets=['sanity', 'smoke', 'ha'])
# Destroy and remove compute node
logger.info("Destroy and remove slave-05")
with self.fuel_web.get_ssh_for_node('slave-05') as remote_ceph:
@ -154,7 +153,7 @@ class CephRestart(TestBasic):
self.fuel_web.delete_node(nailgun_node_id)
self.fuel_web.check_ceph_status(cluster_id)
self.fuel_web.run_ostf(cluster_id=cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
# Cold restart
self.fuel_web.cold_restart_nodes(
@ -167,10 +166,8 @@ class CephRestart(TestBasic):
# Wait for HA services ready
self.fuel_web.assert_ha_services_ready(cluster_id)
# Wait until OpenStack services are UP, should fail 2 services
# because slave-05 (compute+ceph-osd) destroyed. We ignore
# expect fail a test - 'Check openstack services are running'
self.fuel_web.assert_os_services_ready(cluster_id, should_fail=1)
# Wait until OpenStack services are UP
self.fuel_web.assert_os_services_ready(cluster_id)
self.fuel_web.check_ceph_status(cluster_id)
@ -195,7 +192,7 @@ class CephRestart(TestBasic):
test_name=ostf_test_mapping.OSTF_TEST_MAPPING.get(
'Create volume and attach it to instance'))
self.fuel_web.run_ostf(cluster_id=cluster_id, should_fail=1)
self.fuel_web.run_ostf(cluster_id=cluster_id)
self.env.make_snapshot("ceph_ha_restart")