[1LP][RFR] Fix HTTP 503 everywhere

cfme/containers/provider/openshift.py

@@ -374,7 +374,7 @@ def _copy_certificate():
             # restarting evemserverd to apply the new SSL certificate
             self.appliance.evmserverd.restart()
             self.appliance.evmserverd.wait_for_running()
-            self.appliance.wait_for_web_ui()
+            self.appliance.wait_for_miq_ready()
 
     def get_system_id(self):
         mgmt_systems_tbl = self.appliance.db.client['ext_management_systems']

cfme/fixtures/appliance.py

@@ -68,7 +68,7 @@ def sprout_appliances(
             # Web UI not available on unconfigured appliances
             if preconfigured:
                 logger.info("Appliance update finished on temp appliance, waiting for UI ...")
-                app.wait_for_web_ui()
+                app.wait_for_miq_ready()
             logger.info("Appliance update finished on temp appliance...")
 
     try:

cfme/fixtures/appliance_update.py

@@ -28,5 +28,5 @@ def pytest_sessionstart(session):
     urls = session.config.getoption("update_urls")
     store.current_appliance.update_rhel(*urls, reboot=True)
     store.write_line("Appliance update finished, waiting for UI ...")
-    store.current_appliance.wait_for_web_ui()
+    store.current_appliance.wait_for_miq_ready()
     store.write_line("Appliance update finished ...")

cfme/fixtures/authentication.py

@@ -141,7 +141,7 @@ def configure_auth(temp_appliance_preconfig_long, auth_mode, auth_provider, user
     # return to original auth config
     temp_appliance_preconfig_long.server.authentication.auth_settings = original_config
     temp_appliance_preconfig_long.evmserverd.restart()
-    temp_appliance_preconfig_long.wait_for_web_ui()
+    temp_appliance_preconfig_long.wait_for_miq_ready()
     # after waiting for web ui to reappear we are greeted with an API logout message
     # and stuck on the login screen without the login widgets having loaded
     sleep(30)

cfme/fixtures/candu.py

@@ -89,4 +89,4 @@ def candu_db_restore(temp_appliance_extended_db):
     app.db.fix_auth_key()
     app.db.fix_auth_dbyml()
     app.evmserverd.start()
-    app.wait_for_web_ui()
+    app.wait_for_miq_ready()

cfme/fixtures/cli.py

@@ -346,7 +346,7 @@ def ext_appliances_with_providers(multiple_preupdate_appliances, app_creds_modsc
     app_ip = appl1.hostname
     # configure appliances
     appl1.configure(region=0)
-    appl1.wait_for_web_ui()
+    appl1.wait_for_miq_ready()
     appl2.appliance_console_cli.configure_appliance_external_join(
         app_ip,
         app_creds_modscope["username"],
@@ -356,7 +356,7 @@ def ext_appliances_with_providers(multiple_preupdate_appliances, app_creds_modsc
         app_creds_modscope["sshlogin"],
         app_creds_modscope["sshpass"],
     )
-    appl2.wait_for_web_ui()
+    appl2.wait_for_miq_ready()
     # Add infra/cloud providers and create db backup
     provider_app_crud(VMwareProvider, appl1).setup()
     provider_app_crud(OpenStackProvider, appl1).setup()

cfme/fixtures/multi_region.py

@@ -33,7 +33,7 @@ def setup_global_appliance(multi_region_cluster, app_creds_modscope):
                       dbdisk=global_app.unpartitioned_disks[0])
     global_app.appliance_console_cli.configure_appliance_internal(**app_params)
     global_app.evmserverd.wait_for_running()
-    global_app.wait_for_web_ui()
+    global_app.wait_for_miq_ready()
 
 
 @pytest.fixture(scope='module')
@@ -52,7 +52,7 @@ def setup_remote_appliances(multi_region_cluster, setup_global_appliance, app_cr
                           sshpass=app_creds_modscope['sshpass'])
         app.appliance_console_cli.configure_appliance_internal_fetch_key(**app_params)
         app.evmserverd.wait_for_running()
-        app.wait_for_web_ui()
+        app.wait_for_miq_ready()
         app.set_pglogical_replication(replication_type=':remote')
 
 

cfme/fixtures/ui_coverage.py

@@ -145,7 +145,7 @@ def install(self):
         self._install_simplecov()
         self._install_coverage_hook()
         self.ipapp.evmserverd.restart()
-        self.ipapp.wait_for_web_ui()
+        self.ipapp.wait_for_miq_ready()
 
     def collect(self):
         self.print_message('collecting reports')

cfme/fixtures/v2v_fixtures.py

@@ -40,8 +40,7 @@ def set_skip_event_history_flag(appliance):
             {'ems': {'ems_openstack': {'event_handling': {'event_skip_history': True}}}})
         appliance.evmserverd.restart()
         appliance.evmserverd.wait_for_running()
-        appliance.wait_for_web_ui()
-        appliance.wait_for_api_available()
+        appliance.wait_for_miq_ready()
 
 
 def _start_event_workers_for_osp(appliance, provider):

cfme/scripting/appliance.py

@@ -83,7 +83,7 @@ def upgrade_appliance(appliance_ip, cfme_only, update_to):
     print('Starting EVM')
     app.evmserverd.start()
     print('Waiting for webui')
-    app.wait_for_web_ui()
+    app.wait_for_miq_ready()
     print('Appliance upgrade completed')
 
 
@@ -131,7 +131,7 @@ def backup_migrate(appliance_ip, db_url, keys_url, backup):
     print('Starting EVM')
     app.evmserverd.start()
     print('Waiting for webui')
-    app.wait_for_web_ui()
+    app.wait_for_miq_ready()
     print('Appliance upgrade completed')
 
 

cfme/scripting/setup_env.py

@@ -67,13 +67,13 @@ def setup_distributed_env(cfme_version, provider_type, provider, lease, desc):
         TimedCommand(pwd, 360), '')
     apps[0].appliance_console.run_commands(command_set0)
     apps[0].evmserverd.wait_for_running()
-    apps[0].wait_for_web_ui()
+    apps[0].wait_for_miq_ready()
     print(f"VMDB appliance provisioned and configured {ip0}")
     command_set1 = ('ap', '', opt, '2', ip0, '', pwd, '', '3') + port + ('', '',
         pwd, TimedCommand(pwd, 360), '')
     apps[1].appliance_console.run_commands(command_set1)
     apps[1].evmserverd.wait_for_running()
-    apps[1].wait_for_web_ui()
+    apps[1].wait_for_miq_ready()
     print(f"Non-VMDB appliance provisioned and configured {ip1}")
     print(f"Appliance pool lease time is {lease}")
 
@@ -108,7 +108,7 @@ def setup_ha_env(cfme_version, provider_type, provider, lease, desc):
         TimedCommand(pwd, 360), '')
     apps[1].appliance_console.run_commands(command_set1)
     apps[1].evmserverd.wait_for_running()
-    apps[1].wait_for_web_ui()
+    apps[1].wait_for_miq_ready()
     print(f"Non-VMDB appliance provisioned and region created {ip1}")
 
     command_set2 = ('ap', '', '8', '1', '1', '', '', pwd, pwd, ip0, 'y', '')
@@ -178,15 +178,15 @@ def setup_replication_env(cfme_version, provider_type, provider, lease, sprout_p
         TimedCommand(pwd, 360), '')
     apps[0].appliance_console.run_commands(command_set0)
     apps[0].evmserverd.wait_for_running()
-    apps[0].wait_for_web_ui()
+    apps[0].wait_for_miq_ready()
     print(f"Done: Global @ {ip0}")
 
     print("Remote Appliance Configuration")
     command_set1 = ('ap', '', opt, '2', ip0, '', pwd, '', '1', 'y', '1', 'n', '1', pwd,
         TimedCommand(pwd, 360), '')
     apps[1].appliance_console.run_commands(command_set1)
     apps[1].evmserverd.wait_for_running()
-    apps[1].wait_for_web_ui()
+    apps[1].wait_for_miq_ready()
     print(f"Done: Remote @ {ip1}")
 
     if remote_worker:
@@ -195,7 +195,7 @@ def setup_replication_env(cfme_version, provider_type, provider, lease, sprout_p
         command_set2 = ['ap', '', opt, '2', ip1, '', pwd, '', '3', ip1, '', '', '', pwd, pwd]
         apps[2].appliance_console.run_commands(command_set2)
         apps[2].evmserverd.wait_for_running()
-        apps[2].wait_for_web_ui()
+        apps[2].wait_for_miq_ready()
         print(f"Done: Remote Worker @ {ip2}")
 
     print("Configuring Replication")
@@ -270,7 +270,7 @@ def setup_multiregion_env(cfme_version, provider_type, provider, lease, sprout_p
                       dbdisk=global_app.unpartitioned_disks[0])
     global_app.appliance_console_cli.configure_appliance_internal(**app_params)
     global_app.evmserverd.wait_for_running()
-    global_app.wait_for_web_ui()
+    global_app.wait_for_miq_ready()
 
     print(f"Done: Global @ {gip}")
 
@@ -289,7 +289,7 @@ def setup_multiregion_env(cfme_version, provider_type, provider, lease, sprout_p
 
         app.appliance_console_cli.configure_appliance_internal_fetch_key(**app_params)
         app.evmserverd.wait_for_running()
-        app.wait_for_web_ui()
+        app.wait_for_miq_ready()
         print(f"Done: Remote @ {app.hostname}, region: {region_n}")
 
         print("Configuring Replication")

cfme/test_framework/appliance_police.py

@@ -54,7 +54,7 @@ def appliance_police(appliance):
             # and (sadly) the only fix is a rude restart
             appliance.restart_evm_rude()
             try:
-                appliance.wait_for_web_ui(900)
+                appliance.wait_for_miq_ready()
                 store.write_line('EVM was frozen and had to be restarted.', purple=True)
                 return
             except TimedOutError:

cfme/tests/automate/custom_button/test_custom_menu.py

@@ -36,7 +36,7 @@ def update_adv_setting_and_wait(appliance, data):
     """
     appliance.update_advanced_settings(data)
     appliance.evmserverd.restart()
-    appliance.wait_for_web_ui()
+    appliance.wait_for_miq_ready()
 
 
 @pytest.mark.tier(1)

cfme/tests/cli/test_appliance_cli.py

@@ -96,7 +96,7 @@ def test_appliance_console_cli_internal_fetch_key(app_creds, unconfigured_applia
         unconfigured_appliance.unpartitioned_disks[0], fetch_key_ip, app_creds['sshlogin'],
         app_creds['sshpass'])
     unconfigured_appliance.evmserverd.wait_for_running()
-    unconfigured_appliance.wait_for_web_ui()
+    unconfigured_appliance.wait_for_miq_ready()
 
 
 @pytest.mark.tier(2)
@@ -114,7 +114,7 @@ def test_appliance_console_cli_external_join(app_creds, appliance,
         appliance_ip, app_creds['username'], app_creds['password'], 'vmdb_production', appliance_ip,
         app_creds['sshlogin'], app_creds['sshpass'])
     temp_appliance_unconfig_funcscope.evmserverd.wait_for_running()
-    temp_appliance_unconfig_funcscope.wait_for_web_ui()
+    temp_appliance_unconfig_funcscope.wait_for_miq_ready()
 
 
 @pytest.mark.rhel_testing
@@ -133,7 +133,7 @@ def test_appliance_console_cli_external_create(app_creds, dedicated_db_appliance
         hostname, app_creds['username'], app_creds['password'], 'vmdb_production', hostname,
         app_creds['sshlogin'], app_creds['sshpass'])
     unconfigured_appliance_secondary.evmserverd.wait_for_running()
-    unconfigured_appliance_secondary.wait_for_web_ui()
+    unconfigured_appliance_secondary.wait_for_miq_ready()
 
 
 @pytest.mark.parametrize('auth_type', ['sso_enabled', 'saml_enabled', 'local_login_disabled'],
@@ -259,7 +259,7 @@ def test_appliance_console_cli_ha_crud(unconfigured_appliances, app_creds):
         app0_ip, app_creds['username'], app_creds['password'], 'vmdb_production', app0_ip,
         app_creds['sshlogin'], app_creds['sshpass'])
     apps[2].evmserverd.wait_for_running()
-    apps[2].wait_for_web_ui()
+    apps[2].wait_for_miq_ready()
     # Configure primary node
     apps[0].appliance_console_cli.configure_appliance_dedicated_ha_primary(
         app_creds['username'], app_creds['password'], 'primary', app0_ip, '1', 'vmdb_production'
@@ -283,4 +283,4 @@ def test_appliance_console_cli_ha_crud(unconfigured_appliances, app_creds):
         assert result.success, f"Failed to stop APPLIANCE_PG_SERVICE: {result.output}"
 
     apps[2].evmserverd.wait_for_running()
-    apps[2].wait_for_web_ui()
+    apps[2].wait_for_miq_ready()

cfme/tests/cli/test_appliance_console.py

@@ -210,7 +210,7 @@ def test_appliance_console_internal_db(app_creds, unconfigured_appliance):
                    TimedCommand(pwd, 360), RETURN)
     unconfigured_appliance.appliance_console.run_commands(command_set, timeout=20)
     unconfigured_appliance.evmserverd.wait_for_running()
-    unconfigured_appliance.wait_for_web_ui()
+    unconfigured_appliance.wait_for_miq_ready()
 
 
 @pytest.mark.tier(2)
@@ -236,7 +236,7 @@ def test_appliance_console_internal_db_reset(temp_appliance_preconfig_funcscope)
     temp_appliance_preconfig_funcscope.appliance_console.run_commands(command_set)
     temp_appliance_preconfig_funcscope.ssh_client.run_command('systemctl start evmserverd')
     temp_appliance_preconfig_funcscope.evmserverd.wait_for_running()
-    temp_appliance_preconfig_funcscope.wait_for_web_ui()
+    temp_appliance_preconfig_funcscope.wait_for_miq_ready()
 
 
 @pytest.mark.tier(2)
@@ -327,7 +327,7 @@ def test_appliance_console_ha_crud(unconfigured_appliances, app_creds):
                    RETURN, RETURN, RETURN, pwd, TimedCommand(pwd, 360), RETURN)
     apps[2].appliance_console.run_commands(command_set)
     apps[2].evmserverd.wait_for_running()
-    apps[2].wait_for_web_ui()
+    apps[2].wait_for_miq_ready()
     # Configure primary replication node
     command_set = ('ap', RETURN, '8', '1', '1', RETURN, RETURN, pwd, pwd, app0_ip, 'y',
                    TimedCommand('y', 60), RETURN)
@@ -352,7 +352,7 @@ def test_appliance_console_ha_crud(unconfigured_appliances, app_creds):
         assert result.success, f"Failed to stop APPLIANCE_PG_SERVICE: {result.output}"
 
     apps[2].evmserverd.wait_for_running()
-    apps[2].wait_for_web_ui()
+    apps[2].wait_for_miq_ready()
 
 
 @pytest.mark.tier(2)
@@ -389,7 +389,7 @@ def test_appliance_console_external_db(temp_appliance_unconfig_funcscope, app_cr
 
     temp_appliance_unconfig_funcscope.appliance_console.run_commands(command_set, timeout=20)
     temp_appliance_unconfig_funcscope.evmserverd.wait_for_running()
-    temp_appliance_unconfig_funcscope.wait_for_web_ui()
+    temp_appliance_unconfig_funcscope.wait_for_miq_ready()
 
 
 @pytest.mark.tier(2)
@@ -423,7 +423,7 @@ def test_appliance_console_external_db_create(
                    RETURN, RETURN, RETURN, pwd, TimedCommand(pwd, 300), RETURN)
     unconfigured_appliance_secondary.appliance_console.run_commands(command_set)
     unconfigured_appliance_secondary.evmserverd.wait_for_running(timeout=900)
-    unconfigured_appliance_secondary.wait_for_web_ui()
+    unconfigured_appliance_secondary.wait_for_miq_ready()
 
 
 @pytest.mark.tier(2)
@@ -620,7 +620,7 @@ def test_appliance_console_dhcp(unconfigured_appliance, soft_assert):
     """
     command_set = ('ap', RETURN, '1', '1', 'y', TimedCommand('y', 90), RETURN, RETURN)
     unconfigured_appliance.appliance_console.run_commands(command_set)
-    unconfigured_appliance.reboot(wait_for_web_ui=False)
+    unconfigured_appliance.reboot(wait_for_miq_ready=False)
 
     soft_assert(unconfigured_appliance.ssh_client.run_command(
         r"ip a show dev eth0 | grep 'inet\s.*dynamic'").success)
@@ -653,7 +653,7 @@ def test_appliance_console_static_ipv4(unconfigured_appliance, soft_assert):
     """
     command_set = ('ap', RETURN, '1', '2', RETURN, RETURN, RETURN, RETURN, RETURN, RETURN, 'y')
     unconfigured_appliance.appliance_console.run_commands(command_set, timeout=90)
-    unconfigured_appliance.reboot(wait_for_web_ui=False)
+    unconfigured_appliance.reboot(wait_for_miq_ready=False)
 
     soft_assert(unconfigured_appliance.ssh_client.run_command(
         "ip -4 a show dev eth0 | grep 'inet .*scope global eth0'"))
@@ -684,7 +684,7 @@ def test_appliance_console_static_ipv6(unconfigured_appliance, soft_assert):
     """
     command_set = ('ap', RETURN, '1', '3', '1::1', RETURN, '1::f', RETURN, RETURN, RETURN, 'y', '')
     unconfigured_appliance.appliance_console.run_commands(command_set, timeout=90)
-    unconfigured_appliance.reboot(wait_for_web_ui=False)
+    unconfigured_appliance.reboot(wait_for_miq_ready=False)
 
     soft_assert(unconfigured_appliance.ssh_client.run_command(
         "ip -6 a show dev eth0 | grep 'inet6 1::1.*scope global'"))
@@ -785,7 +785,7 @@ def test_appliance_console_restart(temp_appliance_preconfig_funcscope):
         fail_condition=True
     )
 
-    appliance.wait_for_web_ui()
+    appliance.wait_for_miq_ready()
     navigate_to(appliance.server, "LoggedIn")
 
 
@@ -886,7 +886,7 @@ def test_appliance_console_evm_start(request, temp_appliance_preconfig_funcscope
     start_evm_command = ("ap", RETURN, app_con_menu["start_evm"], "Y", RETURN,
                          RETURN, app_con_menu["quit"])
     appliance.appliance_console.run_commands(start_evm_command, timeout=30)
-    appliance.wait_for_web_ui()
+    appliance.wait_for_miq_ready()
     logged_in_page = appliance.server.login()
     request.addfinalizer(appliance.server.logout)
     assert logged_in_page.is_displayed, "UI is not working after starting the EVM service."
@@ -1242,7 +1242,7 @@ def test_appliance_console_vmdb_httpd(temp_appliance_preconfig_funcscope):
     # Starting the EVM service
     command_set = ("ap", RETURN, app_con_menu["start_evm"], TimedCommand("Y", 120))
     appliance.appliance_console.run_commands(command_set, timeout=30)
-    appliance.wait_for_web_ui()
+    appliance.wait_for_miq_ready()
 
 
 @pytest.mark.tier(2)