From c9d33cb27e7e25eac4e5196b0a17d1b1c5b5dfa2 Mon Sep 17 00:00:00 2001
From: markbainix <mark.bain@ixsystems.com>
Date: Mon, 10 Jun 2024 10:02:34 -0400
Subject: [PATCH] fix more 'iscsi' issues

---
 keywords/webui/common_shares.py | 7 +++----
 keywords/webui/iscsi.py         | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/keywords/webui/common_shares.py b/keywords/webui/common_shares.py
index 754e5e6e..f0aa8d20 100644
--- a/keywords/webui/common_shares.py
+++ b/keywords/webui/common_shares.py
@@ -60,7 +60,7 @@ def assert_card_iscsi_configure_button_is_restricted(cls) -> bool:
         Example:
            - Common_Shares.assert_configure_button_is_restricted()
         """
-        return COM.assert_button_is_restricted('iscsi-share-configure')
+        return COM.assert_element_is_restricted('//*[@data-test="button-iscsi-share-configure"]')
 
     @classmethod
     def assert_card_iscsi_delete_button_is_restricted(cls, target_name: str) -> bool:
@@ -73,7 +73,7 @@ def assert_card_iscsi_delete_button_is_restricted(cls, target_name: str) -> bool
         Example:
            - Common_Shares.assert_iscsi_delete_button_is_restricted('target-1')
         """
-        return COM.assert_button_is_restricted(f'card-iscsi-target-{target_name}-delete-row-action')
+        return COM.assert_element_is_restricted(f'//*[@data-test="button-card-iscsi-target-{target_name}-delete-row-action"]')
 
     @classmethod
     def assert_card_iscsi_wizard_button_is_restricted(cls):
@@ -85,7 +85,7 @@ def assert_card_iscsi_wizard_button_is_restricted(cls):
         Example:
            - Common_Shares.assert_iscsi_wizard_button_is_restricted()
         """
-        return COM.assert_button_is_restricted('iscsi-share-wizard')
+        return COM.assert_element_is_restricted('//*[@data-test="button-iscsi-share-wizard"]')
 
     @classmethod
     def assert_card_share_delete_button_is_restricted(cls, share_type: str, name: str) -> bool:
@@ -665,7 +665,6 @@ def click_edit_iscsi_target(cls, target_name: str) -> None:
         Example:
            - Common_Shares.click_edit_iscsi_target('target-1')
         """
-        target_name = COM.convert_to_tag_format(target_name)
         COM.click_button(f'card-iscsi-target-{target_name}-edit-row-action')
 
     @classmethod
diff --git a/keywords/webui/iscsi.py b/keywords/webui/iscsi.py
index c8d2a288..8893686c 100644
--- a/keywords/webui/iscsi.py
+++ b/keywords/webui/iscsi.py
@@ -145,7 +145,7 @@ def assert_tab_row_item_delete_button_is_restricted(cls, tab_name: str, row_item
                 tab = 'initiator'
             case _:
                 tab = tab_name.replace(' ', '-').lower().rstrip('s')
-        return COM.assert_button_is_restricted(f'iscsi-{tab}-{row_item}-delete-row-action')
+        return COM.assert_element_is_restricted(f'//*[@data-test="button-iscsi-{tab}-{row_item}-delete-row-action"]')
 
     @classmethod
     def click_on_the_tab_row_item_edit_button(cls, tab_name: str, row_item: str) -> None: