diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts
index 5965e6402ee84..4cb5223d46ac2 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts
@@ -107,6 +107,7 @@ export class ServicesPageHelper extends PageHelper {
: cy.get('#count').clear().type(String(count));
break;
}
+ cy.wait(1000);
if (serviceType === 'snmp-gateway') {
cy.get('cd-submit-button').dblclick();
} else {
diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/common/forms-helper.feature.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/common/forms-helper.feature.po.ts
index ce09614c99e0f..a43a304c680d4 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/common/forms-helper.feature.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/common/forms-helper.feature.po.ts
@@ -6,9 +6,7 @@ import { And, Then } from 'cypress-cucumber-preprocessor/steps';
* @param value Value that should be filled in the field.
*/
And('enter {string} {string}', (field: string, value: string) => {
- cy.get('.cd-col-form').within(() => {
- cy.get(`input[id=${field}]`).clear().type(value);
- });
+ cy.get(`input[id=${field}]`).clear().type(value);
});
/**
@@ -22,6 +20,17 @@ And('enter {string} {string} in the modal', (field: string, value: string) => {
});
});
+/**
+ * Fills in the given field using the value provided in carbon modal
+ * @param field ID of the field that needs to be filled out.
+ * @param value Value that should be filled in the field.
+ */
+And('enter {string} {string} in the carbon modal', (field: string, value: string) => {
+ cy.get('cds-modal').within(() => {
+ cy.get(`input[id=${field}]`).clear().type(value);
+ });
+});
+
And('select options {string}', (labels: string) => {
if (labels) {
cy.get('a[data-testid=select-menu-edit]').click();
diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/snapshots.e2e-spec.feature b/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/snapshots.e2e-spec.feature
index 4f523bda4ef78..67f0e10cb0020 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/snapshots.e2e-spec.feature
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/snapshots.e2e-spec.feature
@@ -23,7 +23,7 @@ Feature: CephFS Snapshot Management
When I expand the row "test_cephfs"
And I go to the "Subvolumes" tab
And I click on "Create" button from the expanded row
- And enter "subvolumeName" "test_subvolume" in the modal
+ And enter "subvolumeName" "test_subvolume" in the carbon modal
And I click on "Create Subvolume" button
Then I should see a row with "test_subvolume" in the expanded row
@@ -38,7 +38,7 @@ Feature: CephFS Snapshot Management
When I expand the row "test_cephfs"
And I go to the "Snapshots" tab
And I click on "Create" button from the expanded row
- And enter "snapshotName" "test_snapshot" in the modal
+ And enter "snapshotName" "test_snapshot" in the carbon modal
And I click on "Create Snapshot" button
Then I should see a row with "test_snapshot" in the expanded row
@@ -48,7 +48,7 @@ Feature: CephFS Snapshot Management
And I go to the "Snapshots" tab
And I select a row "test_snapshot" in the expanded row
And I click on "Clone" button from the table actions in the expanded row
- And enter "cloneName" "test_clone" in the modal
+ And enter "cloneName" "test_clone" in the carbon modal
And I click on "Create Clone" button
Then I wait for "5" seconds
And I go to the "Subvolumes" tab
diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolume-groups.e2e-spec.feature b/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolume-groups.e2e-spec.feature
index 6b3f119c87f71..cc0835146b7b2 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolume-groups.e2e-spec.feature
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolume-groups.e2e-spec.feature
@@ -17,7 +17,7 @@ Feature: CephFS Subvolume Group management
When I expand the row "test_cephfs"
And I go to the "Subvolume groups" tab
And I click on "Create" button from the expanded row
- And enter "subvolumegroupName" "test_subvolume_group" in the modal
+ And enter "subvolumegroupName" "test_subvolume_group" in the carbon modal
And I click on "Create Subvolume group" button
Then I should see a row with "test_subvolume_group" in the expanded row
@@ -27,7 +27,7 @@ Feature: CephFS Subvolume Group management
And I go to the "Subvolume groups" tab
When I select a row "test_subvolume_group" in the expanded row
And I click on "Edit" button from the table actions in the expanded row
- And enter "size" "1" in the modal
+ And enter "size" "1" in the carbon modal
And I click on "Edit Subvolume group" button
Then I should see row "test_subvolume_group" of the expanded row to have a usage bar
diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolumes.e2e-spec.feature b/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolumes.e2e-spec.feature
index 42e30c3b7e4a4..cf3df6e3f3069 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolumes.e2e-spec.feature
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolumes.e2e-spec.feature
@@ -17,7 +17,7 @@ Feature: CephFS Subvolume management
When I expand the row "test_cephfs"
And I go to the "Subvolumes" tab
And I click on "Create" button from the expanded row
- And enter "subvolumeName" "test_subvolume" in the modal
+ And enter "subvolumeName" "test_subvolume" in the carbon modal
And I click on "Create Subvolume" button
Then I should see a row with "test_subvolume" in the expanded row
@@ -27,7 +27,7 @@ Feature: CephFS Subvolume management
And I go to the "Subvolumes" tab
When I select a row "test_subvolume" in the expanded row
And I click on "Edit" button from the table actions in the expanded row
- And enter "size" "1" in the modal
+ And enter "size" "1" in the carbon modal
And I click on "Edit Subvolume" button
Then I should see row "test_subvolume" of the expanded row to have a usage bar
diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/workflow/nfs/nfs-export.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/workflow/nfs/nfs-export.po.ts
index e13d34d00d4e3..4fd9feecd12c9 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/workflow/nfs/nfs-export.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/workflow/nfs/nfs-export.po.ts
@@ -17,7 +17,7 @@ export class NFSPageHelper extends PageHelper {
this.selectOption('fs_name', 'myfs');
cy.get('#security_label').click({ force: true });
} else {
- cy.get('input[data-testid=rgw_path]').type(rgwPath);
+ cy.get('input[id=path]').type(rgwPath);
}
cy.get('input[name=pseudo]').type(pseudo);
@@ -28,7 +28,7 @@ export class NFSPageHelper extends PageHelper {
cy.get('input[name=addresses]').type(client['addresses']);
// Check if we can remove clients and add it again
- cy.get('span[name=remove_client]').click({ force: true });
+ cy.get('[data-testid=remove_client]').click({ force: true });
cy.get('button[name=add_client]').click({ force: true });
cy.get('input[name=addresses]').type(client['addresses']);
diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/page-helper.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/page-helper.po.ts
index 78c360f974d62..4d5b0aa7bc7f9 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/page-helper.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/page-helper.po.ts
@@ -313,6 +313,7 @@ export abstract class PageHelper {
.parent('[cdstablerow]')
.find('[cdstabledata] [data-testid="table-action-btn"]')
.click({ force: true });
+ cy.wait(waitTime);
cy.get(`button.${action}`).click({ force: true });
}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html
index 8ba67c5312f6f..07b0bebe951a1 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.html
@@ -24,7 +24,7 @@
Site Name
@@ -76,7 +76,7 @@