From 7f77433bf55df136084f1d95fb487708e40cbbc3 Mon Sep 17 00:00:00 2001 From: Pere Diaz Bou Date: Wed, 17 May 2023 13:19:10 +0200 Subject: [PATCH] mgr/dashboard: rename Service>Details to Service>Daemons Daemons and services are not interchangeable in cephadm terms. As stated in the docs: `A daemon is a systemd unit that is running and part of a service.` https://docs.ceph.com/en/latest/cephadm/services/#daemon-status Fixes: https://tracker.ceph.com/issues/61214 Signed-off-by: Pere Diaz Bou (cherry picked from commit a0c59bf580adacb755334d9cc8f7c452223f9706) --- .../workflow/09-services.e2e-spec.ts | 23 ++++++++++++------- .../workflow/10-nfs-exports.e2e-spec.ts | 2 +- .../service-daemon-list.component.html | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts index 6b497a9a0a1c6..91f2de58e6b58 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/09-services.e2e-spec.ts @@ -20,14 +20,14 @@ describe('Services page', () => { services.addService('mds', false); services.checkExist(mdsDaemonName, true); - services.clickServiceTab(mdsDaemonName, 'Details'); + services.clickServiceTab(mdsDaemonName, 'Daemons'); cy.get('cd-service-details').within(() => { services.checkServiceStatus(mdsDaemonName); }); }); it('should stop a daemon', () => { - services.clickServiceTab(mdsDaemonName, 'Details'); + services.clickServiceTab(mdsDaemonName, 'Daemons'); services.checkServiceStatus(mdsDaemonName); services.daemonAction('mds', 'stop'); @@ -38,7 +38,7 @@ describe('Services page', () => { it('should restart a daemon', () => { services.checkExist(mdsDaemonName, true); - services.clickServiceTab(mdsDaemonName, 'Details'); + services.clickServiceTab(mdsDaemonName, 'Daemons'); services.daemonAction('mds', 'restart'); cy.get('cd-service-details').within(() => { services.checkServiceStatus(mdsDaemonName, 'running'); @@ -47,7 +47,7 @@ describe('Services page', () => { it('should redeploy a daemon', () => { services.checkExist(mdsDaemonName, true); - services.clickServiceTab(mdsDaemonName, 'Details'); + services.clickServiceTab(mdsDaemonName, 'Daemons'); services.daemonAction('mds', 'stop'); cy.get('cd-service-details').within(() => { @@ -61,7 +61,7 @@ describe('Services page', () => { it('should start a daemon', () => { services.checkExist(mdsDaemonName, true); - services.clickServiceTab(mdsDaemonName, 'Details'); + services.clickServiceTab(mdsDaemonName, 'Daemons'); services.daemonAction('mds', 'stop'); cy.get('cd-service-details').within(() => { @@ -82,7 +82,7 @@ describe('Services page', () => { services.addService('snmp-gateway', false, 1, 'V2c'); services.checkExist('snmp-gateway', true); - services.clickServiceTab('snmp-gateway', 'Details'); + services.clickServiceTab('snmp-gateway', 'Daemons'); cy.get('cd-service-details').within(() => { services.checkServiceStatus('snmp-gateway'); }); @@ -95,7 +95,7 @@ describe('Services page', () => { services.addService('snmp-gateway', false, 1, 'V3', true); services.checkExist('snmp-gateway', true); - services.clickServiceTab('snmp-gateway', 'Details'); + services.clickServiceTab('snmp-gateway', 'Daemons'); cy.get('cd-service-details').within(() => { services.checkServiceStatus('snmp-gateway'); }); @@ -108,7 +108,7 @@ describe('Services page', () => { services.addService('snmp-gateway', false, 1, 'V3', false); services.checkExist('snmp-gateway', true); - services.clickServiceTab('snmp-gateway', 'Details'); + services.clickServiceTab('snmp-gateway', 'Daemons'); cy.get('cd-service-details').within(() => { services.checkServiceStatus('snmp-gateway'); }); @@ -123,4 +123,11 @@ describe('Services page', () => { services.isUnmanaged('ingress.rgw.foo', true); services.deleteService('ingress.rgw.foo'); }); + + it('should check if exporter daemons are running', () => { + services.clickServiceTab('ceph-exporter', 'Daemons'); + cy.get('cd-service-details').within(() => { + services.checkServiceStatus('ceph-exporter', 'running'); + }); + }); }); diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/10-nfs-exports.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/10-nfs-exports.e2e-spec.ts index a32d6b5bb99b1..f97509db3b033 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/10-nfs-exports.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/orchestrator/workflow/10-nfs-exports.e2e-spec.ts @@ -36,7 +36,7 @@ describe('nfsExport page', () => { services.addService('nfs'); services.checkExist('nfs.testnfs', true); - services.clickServiceTab('nfs.testnfs', 'Details'); + services.clickServiceTab('nfs.testnfs', 'Daemons'); services.checkServiceStatus('nfs'); }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.html index 193090b438a0d..c5c173044ea42 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.html @@ -12,7 +12,7 @@ cdStatefulTab="service-details"> Details + i18n>Daemons -- 2.39.5