From fc31871986e2de70d22544053d6666b2c351c09e Mon Sep 17 00:00:00 2001 From: Elena Bondarenko Date: Tue, 9 Apr 2024 17:04:08 +0200 Subject: [PATCH 1/6] Fix console plugin locator Signed-off-by: Elena Bondarenko --- ocs_ci/ocs/ui/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ocs_ci/ocs/ui/views.py b/ocs_ci/ocs/ui/views.py index b389d6a4616..9e6207bcab4 100644 --- a/ocs_ci/ocs/ui/views.py +++ b/ocs_ci/ocs/ui/views.py @@ -1374,7 +1374,8 @@ ), "storagesystems": (".pf-c-breadcrumb__link", By.CSS_SELECTOR), "console_plugin_option": ( - ".pf-c-button.pf-m-link.pf-m-inline[data-test='edit-console-plugin']", + ".pf-c-button.pf-m-link.pf-m-inline[data-test='edit-console-plugin'], " + "button[data-test='edit-console-plugin']", By.CSS_SELECTOR, ), "save_console_plugin_settings": ("#confirm-action", By.CSS_SELECTOR), From d2fe823e25f16f049e2e7c4fa0d0c5529caaee74 Mon Sep 17 00:00:00 2001 From: Elena Bondarenko Date: Tue, 9 Apr 2024 17:50:09 +0200 Subject: [PATCH 2/6] Adjust other locators Signed-off-by: Elena Bondarenko --- ocs_ci/ocs/ui/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ocs_ci/ocs/ui/views.py b/ocs_ci/ocs/ui/views.py index 9e6207bcab4..291452c7180 100644 --- a/ocs_ci/ocs/ui/views.py +++ b/ocs_ci/ocs/ui/views.py @@ -1410,7 +1410,8 @@ "system-capacity": ("//h2[normalize-space()='System Capacity']", By.XPATH), "ocs-storagecluster": ("//a[normalize-space()='ocs-storagecluster']", By.XPATH), "storagesystem-status-card": ( - ".pf-c-button.pf-m-link.pf-m-inline.co-dashboard-card__button-link.co-status-card__popup", + ".pf-c-button.pf-m-link.pf-m-inline.co-dashboard-card__button-link.co-status-card__popup, " + "button[data-test='health-popover-link']", By.CSS_SELECTOR, ), "block-and-file-health-message": ("div[class='text-muted']", By.CSS_SELECTOR), @@ -1431,7 +1432,7 @@ By.CSS_SELECTOR, ), "storagecluster-blockpool-details-compress-status": ( - "article[data-test-id='compression-details-card'] dd[class='co-overview-details-card__item-value']", + "[data-test-id='compression-details-card'] dd[class='co-overview-details-card__item-value']", By.CSS_SELECTOR, ), "performance-card": ( @@ -1482,7 +1483,7 @@ ), "performance-card": ("//div[contains(text(),'Performance')]", By.XPATH), "storagesystem-status-card": ( - ".pf-c-button.pf-m-link.pf-m-inline.co-status-card__popup", + ".pf-c-button.pf-m-link.pf-m-inline.co-status-card__popup, button[data-test='health-popover-link']", By.CSS_SELECTOR, ), "storage-system-health-card-hyperlink": ( From ed9bcd19155ebb613f26d417b89bec70830e0437 Mon Sep 17 00:00:00 2001 From: Elena Bondarenko Date: Tue, 9 Apr 2024 18:32:00 +0200 Subject: [PATCH 3/6] Update storagesystem locator Signed-off-by: Elena Bondarenko --- ocs_ci/ocs/ui/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocs_ci/ocs/ui/views.py b/ocs_ci/ocs/ui/views.py index 291452c7180..28aef36603e 100644 --- a/ocs_ci/ocs/ui/views.py +++ b/ocs_ci/ocs/ui/views.py @@ -1372,7 +1372,10 @@ "td[class='pf-u-w-10 performanceCard--verticalAlign'] a", By.CSS_SELECTOR, ), - "storagesystems": (".pf-c-breadcrumb__link", By.CSS_SELECTOR), + "storagesystems": ( + ".pf-c-breadcrumb__link, .pf-v5-c-breadcrumb__link", + By.CSS_SELECTOR, + ), "console_plugin_option": ( ".pf-c-button.pf-m-link.pf-m-inline[data-test='edit-console-plugin'], " "button[data-test='edit-console-plugin']", From 1771b181dc00366adb0f2c8075ee306f94c39352 Mon Sep 17 00:00:00 2001 From: Elena Bondarenko Date: Wed, 10 Apr 2024 12:29:43 +0200 Subject: [PATCH 4/6] Update performance card locator Signed-off-by: Elena Bondarenko --- ocs_ci/ocs/ui/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ocs_ci/ocs/ui/views.py b/ocs_ci/ocs/ui/views.py index 28aef36603e..de35b3fc849 100644 --- a/ocs_ci/ocs/ui/views.py +++ b/ocs_ci/ocs/ui/views.py @@ -1369,7 +1369,8 @@ By.XPATH, ), "odf-performanceCardLink": ( - "td[class='pf-u-w-10 performanceCard--verticalAlign'] a", + "td[class='pf-u-w-10 performanceCard--verticalAlign'] a, " + "td[class='pf-v5-c-table__td pf-v5-u-w-10 performanceCard--verticalAlign'] a", By.CSS_SELECTOR, ), "storagesystems": ( From 38099844124e14dbd6fe1913689ffea366d7b66a Mon Sep 17 00:00:00 2001 From: Elena Bondarenko Date: Wed, 10 Apr 2024 13:21:38 +0200 Subject: [PATCH 5/6] Update namespace store locator Signed-off-by: Elena Bondarenko --- ocs_ci/ocs/ui/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ocs_ci/ocs/ui/views.py b/ocs_ci/ocs/ui/views.py index de35b3fc849..75fa1cdfdbf 100644 --- a/ocs_ci/ocs/ui/views.py +++ b/ocs_ci/ocs/ui/views.py @@ -1555,6 +1555,8 @@ ), "namespace-store-tab-active": ( "//button[@class='pf-c-tabs__link' and @aria-selected='true']" + "//span[normalize-space()='Namespace Store'] | " + "//button[@class='pf-v5-c-tabs__link' and @aria-selected='true']" "//span[normalize-space()='Namespace Store']", By.XPATH, ), From 37930ce8e2a3863aec0bf7b4cd5f9a04b3cd845a Mon Sep 17 00:00:00 2001 From: Elena Bondarenko Date: Wed, 10 Apr 2024 14:05:03 +0200 Subject: [PATCH 6/6] Address review comment Signed-off-by: Elena Bondarenko --- ocs_ci/ocs/ui/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ocs_ci/ocs/ui/views.py b/ocs_ci/ocs/ui/views.py index 75fa1cdfdbf..2b9e1d87a2e 100644 --- a/ocs_ci/ocs/ui/views.py +++ b/ocs_ci/ocs/ui/views.py @@ -1369,8 +1369,7 @@ By.XPATH, ), "odf-performanceCardLink": ( - "td[class='pf-u-w-10 performanceCard--verticalAlign'] a, " - "td[class='pf-v5-c-table__td pf-v5-u-w-10 performanceCard--verticalAlign'] a", + "td[class*='performanceCard--verticalAlign'] a", By.CSS_SELECTOR, ), "storagesystems": (