diff --git a/tobiko/tests/faults/ha/test_cloud_recovery.py b/tobiko/tests/faults/ha/test_cloud_recovery.py index d28afbe91..f9c3bad72 100644 --- a/tobiko/tests/faults/ha/test_cloud_recovery.py +++ b/tobiko/tests/faults/ha/test_cloud_recovery.py @@ -125,6 +125,9 @@ class DisruptTripleoNodesTest(testtools.TestCase): def test_0vercloud_health_check(self): OvercloudHealthCheck.run_before(skip_mac_table_size_test=False) + def test_check_background_vm_ping(self): + nova.check_or_start_background_vm_ping() + def test_hard_reboot_controllers_recovery(self): OvercloudHealthCheck.run_before() cloud_disruptions.reset_all_controller_nodes() diff --git a/tobiko/tests/scenario/neutron/test_network.py b/tobiko/tests/scenario/neutron/test_network.py index 1c8b003aa..680907199 100644 --- a/tobiko/tests/scenario/neutron/test_network.py +++ b/tobiko/tests/scenario/neutron/test_network.py @@ -20,7 +20,6 @@ import testtools import tobiko from tobiko.openstack import neutron from tobiko.openstack import nova -from tobiko.tripleo import nova as tripleo_nova from tobiko.openstack import stacks from tobiko.shell import ping from tobiko.shell import sh @@ -59,14 +58,6 @@ class NetworkTest(testtools.TestCase): gateway['ha']) -class BackgroundPingVmTest(testtools.TestCase): - - def test_check_background_vm_ping(self): - """Test background ping to a vm a background process, - second tobiko run will check the ping results""" - tripleo_nova.check_or_start_background_vm_ping() - - @pytest.mark.migrate_server class SameHostNetworkTest(NetworkTest): diff --git a/tobiko/tripleo/nova.py b/tobiko/tripleo/nova.py index 7d79bac24..28d844744 100644 --- a/tobiko/tripleo/nova.py +++ b/tobiko/tripleo/nova.py @@ -229,7 +229,7 @@ def get_nova_server_floating_ip(): stacks.CirrosServerStackFixture).floating_ip_address -# Test is for D/S env +# Test is inteded for D/S env @tripleo.skip_if_missing_overcloud def check_or_start_background_vm_ping(): """Check if process exists, if so stop and check ping health