updated navigate_to_all_clusters method

Signed-off-by: Amrita Mahapatra <[email protected]>

ocs_ci/ocs/ui/base_ui.py

@@ -1120,12 +1120,16 @@ def navigate_to_all_clusters(**kwargs):
         timeout = 30
 
     local_clusters_dropdown = acm_page["local-cluster_dropdown"]
+    find_element = wait_for_element_to_be_visible(acm_page["click-local-cluster"], 60)
     try:
-        acm_dropdown = wait_for_element_to_be_visible(local_clusters_dropdown, timeout)
-        acm_dropdown.click()
-        all_clusters_item = wait_for_element_to_be_visible(
-            acm_page["all-clusters_dropdown_item"]
-        )
-        all_clusters_item.click()
+        if not not find_element:
+            acm_dropdown = wait_for_element_to_be_visible(
+                local_clusters_dropdown, timeout
+            )
+            acm_dropdown.click()
+            all_clusters_item = wait_for_element_to_be_visible(
+                acm_page["all-clusters_dropdown_item"]
+            )
+            all_clusters_item.click()
     except TimeoutException:
         wait_for_element_to_be_visible(acm_page["all-clusters_dropdown"])

ocs_ci/ocs/ui/validation_ui.py

@@ -17,6 +17,7 @@
 from ocs_ci.ocs import constants
 from ocs_ci.ocs.resources.storage_cluster import StorageCluster
 from ocs_ci.framework.logger_helper import log_step
+from ocs_ci.ocs.ui.base_ui import wait_for_element_to_be_visible
 
 
 logger = logging.getLogger(__name__)
@@ -678,9 +679,9 @@ def verify_storage_clients_page(self):
                 page_name="client_onboarding_token_page",
             )
             # Check default storage quota selected as 'Unlimited'
-            assert self.validation_loc[
-                "storage_quota_unlimited"
-            ].is_selected(), "Default value unlimited quota is not selected"
+            assert wait_for_element_to_be_visible(
+                self.validation_loc["storage_quota_unlimited"]
+            ).is_selected(), "Default value unlimited quota is not selected"
 
             # Take screenshot
             self.take_screenshot()

tests/functional/provider_client/test_onboarding_token_generation.py

@@ -1,5 +1,4 @@
 import logging
-import pytest
 
 from ocs_ci.ocs.resources import pod
 from ocs_ci.ocs import constants, ocp
@@ -29,20 +28,19 @@
 )
 from ocs_ci.ocs.ocp import OCP
 from ocs_ci.ocs.ui.validation_ui import ValidationUI
-from ocs_ci.ocs.ui.base_ui import login_ui, close_browser
 
 log = logging.getLogger(__name__)
 
 
-@pytest.fixture(scope="class")
-def setup_ui_class(request):
-    driver = login_ui()
+# @pytest.fixture(scope="class")
+# def setup_ui_class(request):
+#     driver = login_ui()
 
-    def finalizer():
-        close_browser()
+#     def finalizer():
+#         close_browser()
 
-    request.addfinalizer(finalizer)
-    return driver
+#     request.addfinalizer(finalizer)
+#     return driver
 
 
 @tier4c
@@ -52,10 +50,10 @@ def finalizer():
 @skipif_external_mode
 @runs_on_provider
 @skipif_managed_service
-@pytest.mark.usefixtures("setup_ui_class")
 class TestOnboardingTokenGeneration(ManageTest):
     def test_onboarding_token_generation_option_is_available_in_ui(
         self,
+        setup_ui,
     ):
         """
         Test to verify storage-->storage clients-->Generate client onboarding token
@@ -85,7 +83,7 @@ def test_onboarding_token_generation_option_is_available_in_ui(
     @skipif_ocp_version("<4.17")
     @hci_provider_required
     def test_onboarding_token_generation_with_limited_storage_quota_from_ui(
-        self, create_hypershift_clusters, destroy_hosted_cluster
+        self, setup_ui, create_hypershift_clusters, destroy_hosted_cluster
     ):
         """
         Test to verify onboarding token generation with limited storage quota from