Skip to content

Commit

Permalink
optimize the duplicated code to method
Browse files Browse the repository at this point in the history
  • Loading branch information
yanpliu committed Jun 13, 2024
1 parent 81e8ee8 commit 16a0937
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 210 deletions.
48 changes: 48 additions & 0 deletions robottelo/utils/virtwho.py
Original file line number Diff line number Diff line change
Expand Up @@ -600,3 +600,51 @@ def vw_run_option(option):
runcmd('systemctl stop virt-who')
runcmd('pkill -9 virt-who')
runcmd(f'virt-who -{option}')


def hypervisor_guest_mapping_check_legacy_ui(
org_session, form_data_ui, default_location, hypervisor_name, guest_name
):
# Check virt-who config status
assert org_session.virtwho_configure.search(form_data_ui['name'])[0]['Status'] == 'ok'
# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in Legacy UI
org_session.location.select(default_location.name)
hypervisor_display_name = org_session.contenthost.search(hypervisor_name)[0]['Name']
hypervisorhost = org_session.contenthost.read_legacy_ui(hypervisor_display_name)
assert hypervisorhost['details']['subscription_status'] == 'Simple Content Access'
assert hypervisorhost['details']['virtual_guest'] == '1 Content Host'
# Check virtual guest subscription status and hypervisor host and virtual guest mapping in Legacy UI
virtualguest = org_session.contenthost.read_legacy_ui(guest_name)
assert virtualguest['details']['subscription_status'] == 'Simple Content Access'
assert virtualguest['details']['virtual_host'] == hypervisor_display_name


def hypervisor_guest_mapping_newcontent_ui(org_session, hypervisor_name, guest_name):
hypervisor_display_name = org_session.contenthost.search(hypervisor_name)[0]['Name']
hypervisorhost_new_overview = org_session.host_new.get_details(
hypervisor_display_name, 'overview'
)
assert hypervisorhost_new_overview['overview']['host_status']['status_success'] == '2'
# hypervisor host Check details
hypervisorhost_new_detais = org_session.host_new.get_details(hypervisor_display_name, 'details')
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties']['virtual_host']
== hypervisor_display_name
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
# Check guest overview
guest_new_overview = org_session.host_new.get_details(guest_name, 'overview')
assert guest_new_overview['overview']['host_status']['status_success'] == '2'
# Check guest details
virtualguest_new_detais = org_session.host_new.get_details(guest_name, 'details')
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties']['virtual_host']
== hypervisor_display_name
)
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
49 changes: 7 additions & 42 deletions tests/foreman/virtwho/ui/test_esx_sca.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
get_configure_id,
get_configure_option,
get_virtwho_status,
hypervisor_guest_mapping_check_legacy_ui,
hypervisor_guest_mapping_newcontent_ui,
restart_virtwho_service,
update_configure_option,
)
Expand Down Expand Up @@ -59,51 +61,14 @@ def test_positive_deploy_configure_by_id_script(
hypervisor_name, guest_name = deploy_type_ui
# Check virt-who config status
assert org_session.virtwho_configure.search(form_data_ui['name'])[0]['Status'] == 'ok'

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in Legacy UI
org_session.location.select(default_location.name)
hypervisor_display_name = org_session.contenthost.search(hypervisor_name)[0]['Name']
hypervisorhost = org_session.contenthost.read_legacy_ui(hypervisor_display_name)
assert hypervisorhost['details']['subscription_status'] == 'Simple Content Access'
assert hypervisorhost['details']['virtual_guest'] == '1 Content Host'
# Check virtual guest subscription status and hypervisor host and virtual guest mapping in Legacy UI
virtualguest = org_session.contenthost.read_legacy_ui(guest_name)
assert virtualguest['details']['subscription_status'] == 'Simple Content Access'
assert virtualguest['details']['virtual_host'] == hypervisor_display_name
hypervisor_guest_mapping_check_legacy_ui(
org_session, form_data_ui, default_location, hypervisor_name, guest_name
)

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in UI
hypervisorhost_new_overview = org_session.host_new.get_details(
hypervisor_display_name, 'overview'
)
assert hypervisorhost_new_overview['overview']['host_status']['status_success'] == '2'
# hypervisor host Check details
hypervisorhost_new_detais = org_session.host_new.get_details(
hypervisor_display_name, 'details'
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
# Check guest overview
guest_new_overview = org_session.host_new.get_details(guest_name, 'overview')
assert guest_new_overview['overview']['host_status']['status_success'] == '2'
# Check guest details
virtualguest_new_detais = org_session.host_new.get_details(guest_name, 'details')
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
hypervisor_guest_mapping_newcontent_ui(org_session, hypervisor_name, guest_name)

@pytest.mark.tier2
def test_positive_debug_option(
Expand Down
49 changes: 7 additions & 42 deletions tests/foreman/virtwho/ui/test_hyperv_sca.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
get_configure_file,
get_configure_id,
get_configure_option,
hypervisor_guest_mapping_check_legacy_ui,
hypervisor_guest_mapping_newcontent_ui,
)


Expand All @@ -44,51 +46,14 @@ def test_positive_deploy_configure_by_id_script(
hypervisor_name, guest_name = deploy_type_ui
# Check virt-who config status
assert org_session.virtwho_configure.search(form_data_ui['name'])[0]['Status'] == 'ok'

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in Legacy UI
org_session.location.select(default_location.name)
hypervisor_display_name = org_session.contenthost.search(hypervisor_name)[0]['Name']
hypervisorhost = org_session.contenthost.read_legacy_ui(hypervisor_display_name)
assert hypervisorhost['details']['subscription_status'] == 'Simple Content Access'
assert hypervisorhost['details']['virtual_guest'] == '1 Content Host'
# Check virtual guest subscription status and hypervisor host and virtual guest mapping in Legacy UI
virtualguest = org_session.contenthost.read_legacy_ui(guest_name)
assert virtualguest['details']['subscription_status'] == 'Simple Content Access'
assert virtualguest['details']['virtual_host'] == hypervisor_display_name
hypervisor_guest_mapping_check_legacy_ui(
org_session, form_data_ui, default_location, hypervisor_name, guest_name
)

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in UI
hypervisorhost_new_overview = org_session.host_new.get_details(
hypervisor_display_name, 'overview'
)
assert hypervisorhost_new_overview['overview']['host_status']['status_success'] == '2'
# hypervisor host Check details
hypervisorhost_new_detais = org_session.host_new.get_details(
hypervisor_display_name, 'details'
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
# Check guest overview
guest_new_overview = org_session.host_new.get_details(guest_name, 'overview')
assert guest_new_overview['overview']['host_status']['status_success'] == '2'
# Check guest details
virtualguest_new_detais = org_session.host_new.get_details(guest_name, 'details')
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
hypervisor_guest_mapping_newcontent_ui(org_session, hypervisor_name, guest_name)

@pytest.mark.tier2
def test_positive_hypervisor_id_option(
Expand Down
49 changes: 7 additions & 42 deletions tests/foreman/virtwho/ui/test_kubevirt_sca.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
get_configure_file,
get_configure_id,
get_configure_option,
hypervisor_guest_mapping_check_legacy_ui,
hypervisor_guest_mapping_newcontent_ui,
)


Expand All @@ -44,51 +46,14 @@ def test_positive_deploy_configure_by_id_script(
hypervisor_name, guest_name = deploy_type_ui
# Check virt-who config status
assert org_session.virtwho_configure.search(form_data_ui['name'])[0]['Status'] == 'ok'

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in Legacy UI
org_session.location.select(default_location.name)
hypervisor_display_name = org_session.contenthost.search(hypervisor_name)[0]['Name']
hypervisorhost = org_session.contenthost.read_legacy_ui(hypervisor_display_name)
assert hypervisorhost['details']['subscription_status'] == 'Simple Content Access'
assert hypervisorhost['details']['virtual_guest'] == '1 Content Host'
# Check virtual guest subscription status and hypervisor host and virtual guest mapping in Legacy UI
virtualguest = org_session.contenthost.read_legacy_ui(guest_name)
assert virtualguest['details']['subscription_status'] == 'Simple Content Access'
assert virtualguest['details']['virtual_host'] == hypervisor_display_name
hypervisor_guest_mapping_check_legacy_ui(
org_session, form_data_ui, default_location, hypervisor_name, guest_name
)

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in UI
hypervisorhost_new_overview = org_session.host_new.get_details(
hypervisor_display_name, 'overview'
)
assert hypervisorhost_new_overview['overview']['host_status']['status_success'] == '2'
# hypervisor host Check details
hypervisorhost_new_detais = org_session.host_new.get_details(
hypervisor_display_name, 'details'
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
# Check guest overview
guest_new_overview = org_session.host_new.get_details(guest_name, 'overview')
assert guest_new_overview['overview']['host_status']['status_success'] == '2'
# Check guest details
virtualguest_new_detais = org_session.host_new.get_details(guest_name, 'details')
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
hypervisor_guest_mapping_newcontent_ui(org_session, hypervisor_name, guest_name)

@pytest.mark.tier2
def test_positive_hypervisor_id_option(
Expand Down
49 changes: 7 additions & 42 deletions tests/foreman/virtwho/ui/test_libvirt_sca.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
get_configure_file,
get_configure_id,
get_configure_option,
hypervisor_guest_mapping_check_legacy_ui,
hypervisor_guest_mapping_newcontent_ui,
)


Expand All @@ -44,51 +46,14 @@ def test_positive_deploy_configure_by_id_script(
hypervisor_name, guest_name = deploy_type_ui
# Check virt-who config status
assert org_session.virtwho_configure.search(form_data_ui['name'])[0]['Status'] == 'ok'

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in Legacy UI
org_session.location.select(default_location.name)
hypervisor_display_name = org_session.contenthost.search(hypervisor_name)[0]['Name']
hypervisorhost = org_session.contenthost.read_legacy_ui(hypervisor_display_name)
assert hypervisorhost['details']['subscription_status'] == 'Simple Content Access'
assert hypervisorhost['details']['virtual_guest'] == '1 Content Host'
# Check virtual guest subscription status and hypervisor host and virtual guest mapping in Legacy UI
virtualguest = org_session.contenthost.read_legacy_ui(guest_name)
assert virtualguest['details']['subscription_status'] == 'Simple Content Access'
assert virtualguest['details']['virtual_host'] == hypervisor_display_name
hypervisor_guest_mapping_check_legacy_ui(
org_session, form_data_ui, default_location, hypervisor_name, guest_name
)

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in UI
hypervisorhost_new_overview = org_session.host_new.get_details(
hypervisor_display_name, 'overview'
)
assert hypervisorhost_new_overview['overview']['host_status']['status_success'] == '2'
# hypervisor host Check details
hypervisorhost_new_detais = org_session.host_new.get_details(
hypervisor_display_name, 'details'
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
# Check guest overview
guest_new_overview = org_session.host_new.get_details(guest_name, 'overview')
assert guest_new_overview['overview']['host_status']['status_success'] == '2'
# Check guest details
virtualguest_new_detais = org_session.host_new.get_details(guest_name, 'details')
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
hypervisor_guest_mapping_newcontent_ui(org_session, hypervisor_name, guest_name)

@pytest.mark.tier2
def test_positive_hypervisor_id_option(
Expand Down
49 changes: 7 additions & 42 deletions tests/foreman/virtwho/ui/test_nutanix_sca.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
get_configure_id,
get_configure_option,
get_hypervisor_ahv_mapping,
hypervisor_guest_mapping_check_legacy_ui,
hypervisor_guest_mapping_newcontent_ui,
)


Expand All @@ -48,51 +50,14 @@ def test_positive_deploy_configure_by_id_script(
hypervisor_name, guest_name = deploy_type_ui
# Check virt-who config status
assert org_session.virtwho_configure.search(form_data_ui['name'])[0]['Status'] == 'ok'

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in Legacy UI
org_session.location.select(default_location.name)
hypervisor_display_name = org_session.contenthost.search(hypervisor_name)[0]['Name']
hypervisorhost = org_session.contenthost.read_legacy_ui(hypervisor_display_name)
assert hypervisorhost['details']['subscription_status'] == 'Simple Content Access'
assert hypervisorhost['details']['virtual_guest'] == '1 Content Host'
# Check virtual guest subscription status and hypervisor host and virtual guest mapping in Legacy UI
virtualguest = org_session.contenthost.read_legacy_ui(guest_name)
assert virtualguest['details']['subscription_status'] == 'Simple Content Access'
assert virtualguest['details']['virtual_host'] == hypervisor_display_name
hypervisor_guest_mapping_check_legacy_ui(
org_session, form_data_ui, default_location, hypervisor_name, guest_name
)

# Check Hypervisor host subscription status and hypervisor host and virtual guest mapping in UI
hypervisorhost_new_overview = org_session.host_new.get_details(
hypervisor_display_name, 'overview'
)
assert hypervisorhost_new_overview['overview']['host_status']['status_success'] == '2'
# hypervisor host Check details
hypervisorhost_new_detais = org_session.host_new.get_details(
hypervisor_display_name, 'details'
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
hypervisorhost_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
# Check guest overview
guest_new_overview = org_session.host_new.get_details(guest_name, 'overview')
assert guest_new_overview['overview']['host_status']['status_success'] == '2'
# Check guest details
virtualguest_new_detais = org_session.host_new.get_details(guest_name, 'details')
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties'][
'virtual_host'
]
== hypervisor_display_name
)
assert (
virtualguest_new_detais['details']['system_properties']['sys_properties']['name']
== guest_name
)
hypervisor_guest_mapping_newcontent_ui(org_session, hypervisor_name, guest_name)

@pytest.mark.tier2
def test_positive_hypervisor_id_option(
Expand Down

0 comments on commit 16a0937

Please sign in to comment.