red-hat-storage · amr1ta · Jun 12, 2024 · Jun 13, 2024 · Jun 13, 2024 · Jun 14, 2024
@@ -828,7 +828,7 @@ def storage_client_exists(self):
         )
 
     @kubeconfig_exists_decorator
-    def create_storage_client(self):
+    def create_storage_client(self, onboarding_token=None):
         """
         Create storage client
 
@@ -843,7 +843,7 @@ def create_storage_client(self):
             return True
 
         @retry((CommandFailed, TimeoutError), tries=3, delay=30, backoff=1)
-        def _apply_storage_client_cr():
+        def _apply_storage_client_cr(onboarding_key=onboarding_token):
             """
             Internal function to apply storage client CR
             Returns:
@@ -856,7 +856,8 @@ def _apply_storage_client_cr():
                 "storageProviderEndpoint"
             ] = self.get_provider_address()
 
-            onboarding_key = self.get_onboarding_key()
+            if not onboarding_key:
+                onboarding_key = self.get_onboarding_key()
 
             if not len(onboarding_key):
                 return False
@@ -948,7 +949,7 @@ def get_onboarding_key(self):
             logger.error("ticketgen.sh failed to generate Onboarding token")
         return token
 
-    def get_onboarding_key_ui(self):
+    def get_onboarding_key_ui(self, storage_quota=None):
         """
         Get onboarding key from UI
 
@@ -958,7 +959,9 @@ def get_onboarding_key_ui(self):
         from ocs_ci.ocs.ui.page_objects.page_navigator import PageNavigator
 
         storage_clients = PageNavigator().nav_to_storageclients_page()
-        onboarding_key = storage_clients.generate_client_onboarding_ticket()
+        onboarding_key = storage_clients.generate_client_onboarding_ticket_ui(
+            storage_quota=storage_quota
+        )
 
         return onboarding_key
 
@@ -1144,6 +1147,8 @@ def create_subscription(self):
         )
         if "latest" in hosted_odf_version:
             hosted_odf_version = hosted_odf_version.split("-")[-1]
+        elif len(hosted_odf_version) > 4:
+            hosted_odf_version = hosted_odf_version[:4]
 
         subscription_data["spec"]["channel"] = f"stable-{str(hosted_odf_version)}"
 

@@ -130,8 +130,8 @@ def odf_installation_on_client(
 
     def create_storage_client(
         self,
-        storage_provider_endpoint=None,
-        onboarding_token=None,
+        storage_provider_endpoint,
+        onboarding_token,
     ):
         """
         This method creates storage clients
@@ -144,7 +144,9 @@ def create_storage_client(
 
         # Pull storage-client yaml data
         log.info("Pulling storageclient CR data from yaml")
-        storage_client_data = templating.load_yaml(constants.STORAGE_CLIENT_YAML)
+        storage_client_data = templating.load_yaml(
+            constants.PROVIDER_MODE_STORAGE_CLIENT
+        )
         resource_name = storage_client_data["metadata"]["name"]
         log.info(f"the resource name: {resource_name}")
 
@@ -164,7 +166,7 @@ def create_storage_client(
             ] = storage_provider_endpoint
 
             # Set onboarding token
-            log.info("Updating storage provider endpoint details: %s", onboarding_token)
+            log.info("Updating storage client onboarding token: %s", onboarding_token)
             storage_client_data["spec"]["onboardingTicket"] = onboarding_token
             storage_client_data_yaml = tempfile.NamedTemporaryFile(
                 mode="w+", prefix="storage_client", delete=False
@@ -475,7 +477,7 @@ def create_native_storage_client(
         from ocs_ci.ocs.ui.page_objects.page_navigator import PageNavigator
 
         storage_clients = PageNavigator().nav_to_storageclients_page()
-        onboarding_token = storage_clients.generate_client_onboarding_ticket()
+        onboarding_token = storage_clients.generate_client_onboarding_ticket_ui()
 
         # Create ODF subscription for storage-client
         self.odf_installation_on_client()

@@ -147,7 +147,9 @@ def __init__(self):
             locators, self.ocp_version, "add_capacity"
         )
         self.topology_loc = self.deep_get(locators, self.ocp_version, "topology")
-        self.storage_clients_loc = self.deep_get(locators, self.ocp_version, "storage")
+        self.storage_clients_loc = self.deep_get(
+            locators, self.ocp_version, "storage_clients"
+        )
         self.alerting_loc = self.deep_get(locators, self.ocp_version, "alerting")
 
     def __repr__(self):
@@ -988,6 +990,8 @@ def login_ui(console_url=None, username=None, password=None):
     )
 
     if hci_platform_conf:
+        logger.info("Adding some sleep time so the page loads successfuly")
+        time.sleep(60)
         dashboard_url = console_url + "/dashboards"
         # proceed to local-cluster page if not already there. The rule is always to start from the local-cluster page
         # when the hci platform is confirmed and proceed to the client if needed from within the test
@@ -1083,7 +1087,7 @@ def navigate_to_local_cluster(**kwargs):
     if "timeout" in kwargs:
         timeout = kwargs["timeout"]
     else:
-        timeout = 30
+        timeout = 60
 
     all_clusters_dropdown = acm_page_loc["all-clusters_dropdown"]
     try:
@@ -1116,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"])
@@ -1,6 +1,8 @@
 import logging
 
 from ocs_ci.ocs.ui.base_ui import take_screenshot, copy_dom, BaseUI
+from ocs_ci.utility import version
+from ocs_ci.ocs.ui.validation_ui import ValidationUI
 
 logger = logging.getLogger(__name__)
 
@@ -12,15 +14,34 @@ class StorageClients(BaseUI):
 
     def __init__(self):
         super().__init__()
+        self.ocs_version = version.get_semantic_ocs_version_from_config()
 
-    def generate_client_onboarding_ticket(self):
+    def generate_client_onboarding_ticket_ui(self, storage_quota=None):
         """
         Generate a client onboarding ticket
 
         Returns:
             str: onboarding_key
         """
+        logger.info("Generating onboarding token from ui")
         self.do_click(self.storage_clients_loc["generate_client_onboarding_ticket"])
+        ValidationUI().verify_storage_clients_page()
+        if storage_quota and self.ocs_version >= version.VERSION_4_17:
+            self.do_click(
+                self.validation_loc["storage_quota_custom"],
+                enable_screenshot=True,
+            )
+            self.do_clear(self.validation_loc["allocate_quota_value"])
+            self.do_send_keys(
+                locator=self.validation_loc["allocate_quota_value"], text=storage_quota
+            )
+            self.do_click(
+                self.validation_loc["quota_unit_dropdown"], enable_screenshot=True
+            )
+            self.do_click(
+                self.storage_clients_loc["generate_token"], enable_screenshot=True
+            )
+
         onboarding_key = self.get_element_text(
             self.storage_clients_loc["onboarding_key"]
         )

@@ -5,6 +5,7 @@
 import warnings
 
 import pandas as pd
+from selenium.common.exceptions import TimeoutException
 from ocs_ci.framework import config
 from ocs_ci.framework.logger_helper import log_step
 from ocs_ci.ocs.cluster import (
@@ -21,7 +22,7 @@
 from ocs_ci.ocs.resources.storage_cluster import StorageCluster
 from ocs_ci.utility import version
 from ocs_ci.utility.utils import TimeoutSampler
-from selenium.common.exceptions import TimeoutException
+from ocs_ci.ocs.ui.base_ui import wait_for_element_to_be_visible
 
 logger = logging.getLogger(__name__)
 
@@ -656,20 +657,37 @@ def verify_storage_clients_page(self):
         """
         Verify storage clients page in UI
 
-        Returns:
-        StorageClients: Storage Clients page object
-
         """
         self.refresh_web_console()
-        storage_client_obj = self.nav_to_storageclients_page()
+        self.nav_to_storageclients_page()
         strings_storage_clients_tab = ["Storage clients", "Name"]
         self.verify_page_contain_strings(
             strings_on_page=strings_storage_clients_tab, page_name="storage clients"
         )
         self.do_click(
-            self.validation_loc["generate_client_onboarding_token_button"],
+            self.storage_clients_loc["generate_client_onboarding_ticket"],
             enable_screenshot=True,
         )
+        # Starting from ODF 4.17 custom storage amount select option is available
+        if self.ocs_version_semantic >= version.VERSION_4_17:
+            select_storage_quota_window = [
+                "Add storage capacity for the client cluster to consume from the provider cluster."
+                "Storage quota: Unlimited",
+                "Unlimited",
+                "Custom",
+            ]
+            self.verify_page_contain_strings(
+                strings_on_page=select_storage_quota_window,
+                page_name="client_onboarding_token_page",
+            )
+            # Check default storage quota selected as 'Unlimited'
+            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()
+
         strings_object_service_tab = [
             "Client onboarding token",
             "How to use this token",
@@ -678,7 +696,6 @@ def verify_storage_clients_page(self):
             strings_on_page=strings_object_service_tab,
             page_name="client_onboarding_token_page",
         )
-        return storage_client_obj
 
     def calculate_est_days_and_average_manually(self):
         """

@@ -661,14 +661,19 @@
 
 storage_clients = {
     "generate_client_onboarding_ticket": (
-        "//button[normalize-space()='Generate client onboarding token']",
+        "//button[text()='Generate client onboarding token']",
         By.XPATH,
     ),
-    "client_onboarding_token": (
+    "onboarding_key": (
         "//div[@class='odf-onboarding-modal__text-area']",
         By.XPATH,
     ),
+    "copy_to_clipboard": ("//button[text()='Copy to clipboard']", By.XPATH),
     "close_token_modal": ("//button[@aria-label='Close']", By.XPATH),
+    "generate_token": (
+        "//button[text()='Generate token']",
+        By.XPATH,
+    ),
 }
 
 page_nav = {
@@ -731,6 +736,13 @@
     "storageclients_page": ("Storage Clients", By.LINK_TEXT),
 }
 
+page_nav_4_17 = {
+    "storage_quota_selection_page_for_onboarding_client": (
+        "Object Storage",
+        By.LINK_TEXT,
+    ),
+}
+
 acm_page_nav = {
     "Home": ("//button[text()='Home']", By.XPATH),
     "Welcome_page": ("Welcome", By.LINK_TEXT),
@@ -1765,12 +1777,16 @@
         "/ancestor::div[2]//div[@class='ceph-raw-card-legend__text']",
         By.XPATH,
     ),
-    "generate_client_onboarding_token_button": (
-        "//button[text()='Generate client onboarding token']",
+}
+
+validation_4_17 = {
+    "storage_quota_unlimited": ("storage-quota-unlimited", By.ID),
+    "storage_quota_custom": ("storage-quota-custom", By.ID),
+    "allocate_quota_value": (
+        "//input[@type='number']",
         By.XPATH,
     ),
-    "copy to clipboard": ("//button[text()='Copy to clipboard']", By.XPATH),
-    "onboarding_token": ("//*[@class='odf-onboarding-modal__text-area']", By.XPATH),
+    "quota_unit_dropdown": ("pf-dropdown-toggle-id-2", By.ID),
 }
 
 validation_4_17 = {
@@ -1983,7 +1999,7 @@
 locators = {
     "4.18": {
         "login": {**login, **login_4_11, **login_4_14},
-        "page": {**page_nav, **page_nav_4_10, **page_nav_4_14},
+        "page": {**page_nav, **page_nav_4_10, **page_nav_4_14, **page_nav_4_17},
         "generic": generic_locators,
         "add_capacity": {**add_capacity, **add_capacity_4_11, **add_capacity_4_12},
         "deployment": {
@@ -2032,10 +2048,11 @@
         "topology": topology,
         "mcg_stores": mcg_stores,
         "alerting": alerting,
+        "storage_clients": storage_clients,
     },
     "4.17": {
         "login": {**login, **login_4_11, **login_4_14},
-        "page": {**page_nav, **page_nav_4_10, **page_nav_4_14},
+        "page": {**page_nav, **page_nav_4_10, **page_nav_4_14, **page_nav_4_17},
         "generic": generic_locators,
         "add_capacity": {**add_capacity, **add_capacity_4_11, **add_capacity_4_12},
         "deployment": {
@@ -2084,6 +2101,7 @@
         "topology": topology,
         "mcg_stores": mcg_stores,
         "alerting": alerting,
+        "storage_clients": storage_clients,
     },
     "4.16": {
         "login": {**login, **login_4_11, **login_4_14},
@@ -2134,6 +2152,7 @@
         "topology": topology,
         "mcg_stores": mcg_stores,
         "alerting": alerting,
+        "storage_clients": storage_clients,
     },
     "4.15": {
         "login": {**login, **login_4_11, **login_4_14},

@@ -53,7 +53,9 @@
     get_submariner_operator_version,
     get_volsync_operator_version,
 )
-
+from ocs_ci.ocs.exceptions import (
+    ResourceNotFoundError,
+)
 
 log = logging.getLogger(__name__)
 
@@ -1809,6 +1811,7 @@ def collect_pod_container_rpm_package(dir_name):
     """
     # Import pod here to avoid circular dependency issue
     from ocs_ci.ocs.resources import pod
+    from ocs_ci.ocs.resources.pod import wait_for_pods_to_be_running
 
     timestamp = time.time()
     cluster_namespace = ocsci_config.ENV_DATA["cluster_namespace"]
@@ -1826,6 +1829,13 @@ def collect_pod_container_rpm_package(dir_name):
     ocp_obj = OCP(namespace=cluster_namespace)
     for pod_obj in pods:
         pod_object = pod_obj.get()
+        # avoid resource not found error when pod got respinned inbetween
+        retry(ResourceNotFoundError, tries=2, delay=2, backoff=2)(
+            wait_for_pods_to_be_running
+        )(
+            pods=pod.get_all_pods(namespace=cluster_namespace),
+            raise_pod_not_found_error=True,
+        )
         pod_containers = pod_object.get("spec").get("containers")
         ocp_pod_obj = OCP(kind=constants.POD, namespace=cluster_namespace)
         pod_status = ocp_pod_obj.get_resource_status(pod_obj.name)