Apply Den suggestions from code review

Co-authored-by: Den Shchedrivyi <dshchedr@redhat.com>

Author: chandramerla

tests/conftest.py

@@ -2773,11 +2773,8 @@ def cluster_modern_cpu_model_scope_class(
 
 
 @pytest.fixture(scope="function")
-def non_default_machine_type():
-    if is_x86_64():
-        return MachineTypesNames.pc_q35_rhel7_6
-    elif is_s390x():
-        return MachineTypesNames.s390_ccw_virtio
+def non_default_machine_type(is_s390x_cluster):
+    return MachineTypesNames.s390_ccw_virtio if is_s390x_cluster else MachineTypesNames.pc_q35_rhel7_6
     else:
         pytest.skip("Unsupported architecture for this test")
 

tests/virt/node/general/test_machinetype.py

@@ -112,10 +112,10 @@ def test_default_machine_type(machine_type_from_kubevirt_config, vm):
             marks=[pytest.mark.polarion("CNV-3311")],
         )
     ],
-    indirect=["vm_with_non_default_machine_type"],
+    indirect=True,
 )
 @pytest.mark.s390x
-def test_vm_machine_type(vm_with_non_default_machine_type, non_default_machine_type):
+def test_vm_machine_type(non_default_machine_type, vm_with_non_default_machine_type):
     validate_machine_type(vm=vm_with_non_default_machine_type, expected_machine_type=non_default_machine_type)