Remove rhv markers.

cfme/tests/automate/test_common_methods.py

@@ -41,7 +41,6 @@ def generate_retirement_date(delta=None):
     return gen_date
 
 
-@pytest.mark.rhv3
 @pytest.mark.tier(3)
 @pytest.mark.parametrize('create_vm', ['small_template'], indirect=True)
 def test_vm_retire_extend(appliance, request, create_vm, soft_assert):

cfme/tests/candu/test_utilization_metrics.py

@@ -122,7 +122,6 @@ def query_metric_db(appliance, provider, metric, vm_name=None, host_name=None):
         metrics_tbl.id.in_(provs.subquery()))
 
 
-@pytest.mark.rhv2
 @pytest.mark.meta(automates=[1671580, 1722937])
 @pytest.mark.meta(
     blockers=[BZ(1744845, forced_streams=['5.10'],
@@ -152,7 +151,6 @@ def test_raw_metric_vm_cpu(metrics_collection, appliance, provider):
             break
 
 
-@pytest.mark.rhv2
 @pytest.mark.meta(automates=[1671580, 1722937])
 @pytest.mark.meta(
     blockers=[BZ(1724415, forced_streams=['5.10', '5.11'],
@@ -183,7 +181,6 @@ def test_raw_metric_vm_memory(metrics_collection, appliance, provider):
             break
 
 
-@pytest.mark.rhv2
 @pytest.mark.meta(automates=[1671580, 1722937])
 @pytest.mark.meta(
     blockers=[BZ(1744845, forced_streams=['5.10'],
@@ -206,7 +203,6 @@ def test_raw_metric_vm_network(metrics_collection, appliance, provider):
             break
 
 
-@pytest.mark.rhv2
 @pytest.mark.provider(
     [VMwareProvider, RHEVMProvider, OpenStackProvider, AzureProvider, GCEProvider],
     required_fields=[(['cap_and_util', 'capandu_vm'], 'cu-24x7')],
@@ -235,7 +231,6 @@ def test_raw_metric_vm_disk(metrics_collection, appliance, provider):
             break
 
 
-@pytest.mark.rhv2
 @pytest.mark.provider(
     [VMwareProvider, RHEVMProvider],
     required_fields=[(['cap_and_util', 'capandu_vm'], 'cu-24x7')],
@@ -258,7 +253,6 @@ def test_raw_metric_host_cpu(metrics_collection, appliance, provider):
             break
 
 
-@pytest.mark.rhv2
 @pytest.mark.provider(
     [VMwareProvider, RHEVMProvider],
     required_fields=[(['cap_and_util', 'capandu_vm'], 'cu-24x7')],
@@ -282,7 +276,6 @@ def test_raw_metric_host_memory(metrics_collection, appliance, provider):
             break
 
 
-@pytest.mark.rhv2
 @pytest.mark.provider(
     [VMwareProvider, RHEVMProvider],
     required_fields=[(['cap_and_util', 'capandu_vm'], 'cu-24x7')],
@@ -305,7 +298,6 @@ def test_raw_metric_host_network(metrics_collection, appliance, provider):
             break
 
 
-@pytest.mark.rhv2
 @pytest.mark.provider(
     [VMwareProvider, RHEVMProvider],
     required_fields=[(['cap_and_util', 'capandu_vm'], 'cu-24x7')],

cfme/tests/cloud_infra_common/test_cloud_init_provisioning.py

@@ -57,7 +57,6 @@ def vm_name():
     return random_vm_name('ci')
 
 
-@pytest.mark.rhv2
 @pytest.mark.tier(3)
 @test_requirements.provision
 def test_provision_cloud_init(appliance, request, setup_provider, provider, provisioning,
@@ -121,7 +120,6 @@ def test_provision_cloud_init(appliance, request, setup_provider, provider, prov
         wait_for(ssh_client.uptime, num_sec=200, handle_exception=True)
 
 
-@pytest.mark.rhv3
 @test_requirements.provision
 @pytest.mark.provider([RHEVMProvider])
 def test_provision_cloud_init_payload(appliance, request, setup_provider, provider, provisioning,

cfme/tests/cloud_infra_common/test_cockpit_server.py

@@ -13,7 +13,6 @@
 pytestmark = [test_requirements.cockpit]
 
 
-@pytest.mark.rhv3
 @pytest.mark.provider(
     gen_func=providers,
     filters=[

cfme/tests/cloud_infra_common/test_custom_attributes_rest.py

@@ -15,7 +15,6 @@
     pytest.mark.tier(2),
     pytest.mark.provider([CloudProvider, InfraProvider], scope='module'),
     test_requirements.rest,
-    pytest.mark.rhv3
 ]
 
 COLLECTIONS = ['providers', 'vms', 'instances', 'services']
@@ -127,7 +126,6 @@ class TestCustomAttributesRESTAPI:
     @pytest.mark.uncollectif(lambda provider, collection_name:
                              _uncollect(provider, collection_name),
                              reason=GENERIC_UNCOLLECT)
-    @pytest.mark.rhv2
     @pytest.mark.parametrize("collection_name", COLLECTIONS)
     def test_add(self, request, collection_name, get_resource):
         """Test adding custom attributes to resource using REST API.

cfme/tests/cloud_infra_common/test_discovery_and_support.py

@@ -10,7 +10,6 @@
 from cfme.utils.wait import TimedOutError
 
 
-@pytest.mark.rhv2
 @pytest.mark.tier(2)
 @test_requirements.power
 @pytest.mark.provider(

cfme/tests/cloud_infra_common/test_events.py

@@ -37,7 +37,6 @@ def vm_crud(provider, setup_provider_modscope, small_template_modscope):
     vm.cleanup_on_provider()
 
 
-@pytest.mark.rhv2
 def test_vm_create(request, appliance, vm_crud, provider, register_event):
     """ Test whether vm_create_complete event is emitted.
 

cfme/tests/cloud_infra_common/test_html5_vm_console.py

@@ -35,7 +35,6 @@ def test_html5_console_ports_present(appliance, setup_provider, provider):
     assert edit_view.vnc_end_port.is_displayed
 
 
-@pytest.mark.rhv1
 @test_requirements.html5
 @pytest.mark.provider([CloudProvider, InfraProvider], required_flags=['html5_console'])
 @pytest.mark.parametrize('create_vm', ['console_template'], indirect=True)

cfme/tests/cloud_infra_common/test_power_control_rest.py

@@ -56,7 +56,6 @@ def verify_action_result(rest_api, assert_success=True):
     return success, message
 
 
-@pytest.mark.rhv2
 @pytest.mark.parametrize('create_vm', ['small_template'], indirect=True)
 def test_stop_vm_rest(appliance, create_vm, ensure_vm_running, soft_assert, from_detail):
     """Test stop of vm
@@ -94,7 +93,6 @@ def test_stop_vm_rest(appliance, create_vm, ensure_vm_running, soft_assert, from
     soft_assert(not verify_vm_power_state(vm, create_vm.STATE_ON), "vm still running")
 
 
-@pytest.mark.rhv2
 @pytest.mark.parametrize('create_vm', ['small_template'], indirect=True)
 def test_start_vm_rest(appliance, create_vm, ensure_vm_stopped, soft_assert, from_detail):
     """Test start vm
@@ -132,7 +130,6 @@ def test_start_vm_rest(appliance, create_vm, ensure_vm_stopped, soft_assert, fro
     soft_assert(verify_vm_power_state(vm, create_vm.STATE_ON), "vm not running")
 
 
-@pytest.mark.rhv2
 @pytest.mark.parametrize('create_vm', ['small_template'], indirect=True)
 def test_suspend_vm_rest(appliance, create_vm, ensure_vm_running, soft_assert, from_detail):
     """Test suspend vm

cfme/tests/cloud_infra_common/test_provisioning.py

@@ -169,7 +169,6 @@ def check_subjects():
              message='Some expected subjects not found in the received emails subjects.')
 
 
-@pytest.mark.rhv2
 @pytest.mark.meta(automates=[1472844, 1676910])
 @pytest.mark.parametrize("action", ["edit", "approve", "deny"])
 def test_provision_approval(appliance, provider, vm_name, smtp_test, request,

cfme/tests/cloud_infra_common/test_relationships.py

@@ -131,7 +131,6 @@ def host(appliance, provider):
 
 
 @test_requirements.relationships
-@pytest.mark.rhv3
 @pytest.mark.parametrize("relationship,view", HOST_RELATIONSHIPS,
     ids=[rel[0] for rel in HOST_RELATIONSHIPS])
 @pytest.mark.provider([InfraProvider], selector=ONE_PER_TYPE)
@@ -155,7 +154,6 @@ def test_host_relationships(appliance, provider, setup_provider, host, relations
 
 
 @test_requirements.relationships
-@pytest.mark.rhv3
 @pytest.mark.parametrize("relationship,view", INFRA_PROVIDER_RELATIONSHIPS,
     ids=[rel[0] for rel in INFRA_PROVIDER_RELATIONSHIPS])
 @pytest.mark.provider([InfraProvider], selector=ONE_PER_TYPE)
@@ -281,7 +279,6 @@ def test_tagvis_cloud_provider_children(prov_child_visibility, setup_provider, r
 
 
 @test_requirements.relationships
-@pytest.mark.rhv1
 @pytest.mark.provider([CloudProvider, InfraProvider])
 @pytest.mark.tier(1)
 @pytest.mark.meta(
@@ -315,7 +312,6 @@ def test_provider_refresh_relationship(provider, setup_provider):
 
 
 @test_requirements.relationships
-@pytest.mark.rhv2
 @pytest.mark.provider([InfraProvider])
 def test_host_refresh_relationships(provider, setup_provider):
     """ Test that host refresh doesn't fail
@@ -339,7 +335,6 @@ def test_host_refresh_relationships(provider, setup_provider):
     provider.wait_for_relationship_refresh()
 
 
-@pytest.mark.rhv3
 @pytest.mark.provider([InfraProvider])
 @pytest.mark.meta(automates=[BZ(1732349)])
 def test_template_refresh_relationships(appliance, provider, setup_provider):

cfme/tests/cloud_infra_common/test_rest_providers.py

@@ -46,7 +46,6 @@ def provider_rest(request, appliance, provider):
     return provider_rest
 
 
-@pytest.mark.rhv1
 def test_query_provider_attributes(provider, provider_rest, soft_assert):
     """Tests access to attributes of /api/providers.
 
@@ -70,7 +69,6 @@ def test_query_provider_attributes(provider, provider_rest, soft_assert):
             failure.type, failure.name, failure.response.status_code, failure.error))
 
 
-@pytest.mark.rhv3
 def test_provider_options(appliance):
     """Tests that provider settings are present in OPTIONS listing.
 
@@ -87,7 +85,6 @@ def test_provider_options(appliance):
     assert 'provider_settings' in options['data']
 
 
-@pytest.mark.rhv3
 def test_create_provider(provider_rest):
     """Tests creating provider using REST API.
 
@@ -103,7 +100,6 @@ def test_create_provider(provider_rest):
     assert "ManageIQ::Providers::" in provider_rest.type
 
 
-@pytest.mark.rhv1
 def test_provider_refresh(provider_rest, appliance):
     """Test checking that refresh invoked from the REST API works.
 
@@ -140,7 +136,6 @@ def _refresh_success():
         assert task.status.lower() == "ok", f"Task failed with status '{task.status}'"
 
 
-@pytest.mark.rhv3
 def test_provider_edit(request, provider_rest, appliance):
     """Test editing a provider using REST API.
 
@@ -162,7 +157,6 @@ def test_provider_edit(request, provider_rest, appliance):
     assert provider_rest.name == new_name == edited.name
 
 
-@pytest.mark.rhv3
 @pytest.mark.parametrize("method", ["post", "delete"], ids=["POST", "DELETE"])
 def test_provider_delete_from_detail(provider_rest, method):
     """Tests deletion of the provider from detail using REST API.
@@ -183,7 +177,6 @@ def test_provider_delete_from_detail(provider_rest, method):
     delete_resources_from_detail([provider_rest], method=method, num_sec=50)
 
 
-@pytest.mark.rhv3
 def test_provider_delete_from_collection(provider_rest):
     """Tests deletion of the provider from collection using REST API.
 

cfme/tests/cloud_infra_common/test_retirement.py

@@ -122,7 +122,6 @@ def generate_retirement_date(delta=9):
     return gen_date
 
 
-@pytest.mark.rhv1
 @pytest.mark.meta(automates=[1518926, 1565128])
 def test_retirement_now(create_vm):
     """Test on-demand retirement of a VM/Instance.
@@ -154,7 +153,6 @@ def test_retirement_now(create_vm):
     verify_retirement_date(create_vm, expected_date=expected_date)
 
 
-@pytest.mark.rhv1
 @pytest.mark.parametrize('create_vms',
                          [{'template_type': 'small_template', 'num_vms': 2}],
                          ids=['small_template-two_vms'],
@@ -230,7 +228,6 @@ def test_retirement_now_ec2_instance_backed(create_vm, tagged, appliance):
     verify_retirement_date(create_vm, expected_date=expected_date)
 
 
-@pytest.mark.rhv3
 @pytest.mark.parametrize('warn', warnings, ids=[warning.id for warning in warnings])
 def test_set_retirement_date(create_vm, warn):
     """Tests setting retirement date and verifies configured date is reflected in UI
@@ -254,7 +251,6 @@ def test_set_retirement_date(create_vm, warn):
     verify_retirement_date(create_vm, expected_date=expected_date)
 
 
-@pytest.mark.rhv3
 @pytest.mark.parametrize('warn', warnings, ids=[warning.id for warning in warnings])
 @pytest.mark.parametrize('create_vms',
                          [{'template_type': 'small_template', 'num_vms': 2}],
@@ -320,7 +316,6 @@ def test_set_retirement_offset(create_vm, warn):
     verify_retirement_date(create_vm, expected_date=expected_date)
 
 
-@pytest.mark.rhv3
 @pytest.mark.parametrize('warn', warnings, ids=[warning.id for warning in warnings])
 @pytest.mark.parametrize('create_vms',
                          [{'template_type': 'small_template', 'num_vms': 2}],
@@ -362,7 +357,6 @@ def test_set_retirement_offset_multiple(create_vms, provider, warn):
         verify_retirement_date(vm, expected_date=expected_date)
 
 
-@pytest.mark.rhv3
 def test_unset_retirement_date(create_vm):
     """Tests cancelling a scheduled retirement by removing the set date
 
@@ -393,7 +387,6 @@ def test_unset_retirement_date(create_vm):
     verify_retirement_date(create_vm, expected_date='Never')
 
 
-@pytest.mark.rhv3
 @pytest.mark.tier(2)
 @pytest.mark.parametrize('remove_date', [True, False], ids=['remove_date', 'set_future_date'])
 def test_resume_retired_instance(create_vm, provider, remove_date):