mgr/dashboard: stabilizing the cephadm dashboard e2e

Reordering the tests and adding some more tests to verify the cluster is
healthy before proceeding to do some complex tasks like maintenance and
drain host

Fixes: https://tracker.ceph.com/issues/53742
Signed-off-by: Nizamudeen A <nia@redhat.com>

src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/services.po.ts

@@ -70,12 +70,12 @@ export class ServicesPageHelper extends PageHelper {
     }
   }
 
-  editService(name: string, count: string) {
+  editService(name: string, daemonCount: string) {
     this.navigateEdit(name, true, false);
     cy.get(`${this.pages.create.id}`).within(() => {
       cy.get('#service_type').should('be.disabled');
       cy.get('#service_id').should('be.disabled');
-      cy.get('#count').clear().type(count);
+      cy.get('#count').clear().type(daemonCount);
       cy.get('cd-submit-button').click();
     });
   }

src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/03-create-cluster-create-services.e2e-spec.ts

@@ -39,9 +39,9 @@ describe('Create cluster create services page', () => {
     });
 
     it('should edit a service', () => {
-      const count = '3';
-      createClusterServicePage.editService(serviceName, count);
-      createClusterServicePage.expectPlacementCount(serviceName, count);
+      const daemonCount = '4';
+      createClusterServicePage.editService(serviceName, daemonCount);
+      createClusterServicePage.expectPlacementCount(serviceName, daemonCount);
     });
 
     it('should create an ingress service', () => {

src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/06-cluster-check.e2e-spec.ts

@@ -55,11 +55,13 @@ describe('when cluster creation is completed', () => {
       });
     });
 
-    it('should check if rgw service is running', () => {
-      hosts.clickTab('cd-host-details', hostnames[3], 'Daemons');
-      cy.get('cd-host-details').within(() => {
-        services.checkServiceStatus('rgw');
-      });
+    it('should check if mon daemon is running on all hosts', () => {
+      for (const hostname of hostnames) {
+        hosts.clickTab('cd-host-details', hostname, 'Daemons');
+        cy.get('cd-host-details').within(() => {
+          services.checkServiceStatus('mon');
+        });
+      }
     });
   });
 
@@ -71,7 +73,7 @@ describe('when cluster creation is completed', () => {
     });
 
     it('should check if osds are created', { retries: 1 }, () => {
-      osds.getTableCount('total').should('be.gte', 1);
+      osds.getTableCount('total').should('be.gte', 2);
     });
   });
 
@@ -90,6 +92,13 @@ describe('when cluster creation is completed', () => {
       hosts.navigateTo();
     });
 
+    it('should check if rgw daemon is running', () => {
+      hosts.clickTab('cd-host-details', hostnames[3], 'Daemons');
+      cy.get('cd-host-details').within(() => {
+        services.checkServiceStatus('rgw');
+      });
+    });
+
     it('should force maintenance and exit', { retries: 1 }, () => {
       hosts.maintenance(hostnames[3], true, true);
     });