Skip to content

Commit d2d079f

Browse files
authored
Merge pull request ceph#58068 from rhcs-dashboard/disable-telemetry-notifications-in-e2e
mgr/dashboard: disable telemetry notification in e2e Reviewed-by: afreen23 <NOT@FOUND> Reviewed-by: nmunet <NOT@FOUND>
2 parents b33620a + 1da0a4f commit d2d079f

File tree

9 files changed

+52
-19
lines changed

9 files changed

+52
-19
lines changed

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/images.e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('Images page', () => {
1111
cy.login();
1212
// Need pool for image testing
1313
pools.navigateTo('create');
14-
pools.create(poolName, 8, 'rbd');
14+
pools.create(poolName, 8, ['rbd']);
1515
pools.existTableCell(poolName);
1616
});
1717

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/mirroring.e2e-spec.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('Mirroring page', () => {
3232
cy.ceph2Login();
3333
cy.login();
3434
pools.navigateTo('create');
35-
pools.create(poolName, 8, 'rbd');
35+
pools.create(poolName, 8, ['rbd']);
3636
pools.navigateTo();
3737
pools.existTableCell(poolName, true);
3838
mirroring.navigateTo();
@@ -49,16 +49,17 @@ describe('Mirroring page', () => {
4949
// so writing the code to copy the token inside the origin manually
5050
// rather than using a function call
5151
// @ts-ignore
52+
cy.ceph2Login();
5253
cy.origin(url, { args }, ({ name, bootstrapToken }) => {
5354
// Create an rbd pool in the second cluster
55+
cy.visit('#/pool/create').wait(100);
5456

5557
// Login to the second cluster
5658
// Somehow its not working with the cypress login function
57-
cy.visit('#/pool/create').wait(100);
58-
5959
cy.get('[name=username]').type('admin');
6060
cy.get('#password').type('admin');
6161
cy.get('[type=submit]').click();
62+
6263
cy.get('input[name=name]').clear().type(name);
6364
cy.get(`select[name=poolType]`).select('replicated');
6465
cy.get(`select[name=poolType] option:checked`).contains('replicated');
@@ -93,7 +94,7 @@ describe('Mirroring page', () => {
9394

9495
beforeEach(() => {
9596
pools.navigateTo('create'); // Need pool for mirroring testing
96-
pools.create(poolName, 8, 'rbd');
97+
pools.create(poolName, 8, ['rbd']);
9798
pools.navigateTo();
9899
pools.existTableCell(poolName, true);
99100
});

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/logs.e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('Logs page', () => {
4646
describe('audit logs respond to pool creation and deletion test', () => {
4747
it('should create pool and check audit logs reacted', () => {
4848
pools.navigateTo('create');
49-
pools.create(poolname, 8, 'rbd');
49+
pools.create(poolname, 8, ['rbd']);
5050
pools.navigateTo();
5151
pools.existTableCell(poolname, true);
5252
logs.checkAuditForPoolFunction(poolname, 'create', hour, minute);

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ export class ServicesPageHelper extends PageHelper {
4949
switch (serviceType) {
5050
case 'rgw':
5151
cy.get('#service_id').type('foo');
52-
unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count));
52+
unmanaged
53+
? cy.get('label[for=unmanaged]').click()
54+
: cy.get('#count').clear().type(String(count));
5355
break;
5456

5557
case 'ingress':
@@ -65,12 +67,16 @@ export class ServicesPageHelper extends PageHelper {
6567

6668
case 'nfs':
6769
cy.get('#service_id').type('testnfs');
68-
unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count));
70+
unmanaged
71+
? cy.get('label[for=unmanaged]').click()
72+
: cy.get('#count').clear().type(String(count));
6973
break;
7074

7175
case 'smb':
7276
cy.get('#service_id').type('testsmb');
73-
unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count));
77+
unmanaged
78+
? cy.get('label[for=unmanaged]').click()
79+
: cy.get('#count').clear().type(String(count));
7480
cy.get('#cluster_id').type('cluster_foo');
7581
cy.get('#config_uri').type('rados://.smb/foo/scc.toml');
7682
break;
@@ -96,7 +102,9 @@ export class ServicesPageHelper extends PageHelper {
96102

97103
default:
98104
cy.get('#service_id').type('test');
99-
unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count));
105+
unmanaged
106+
? cy.get('label[for=unmanaged]').click()
107+
: cy.get('#count').clear().type(String(count));
100108
break;
101109
}
102110
if (serviceType === 'snmp-gateway') {

src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.e2e-spec.ts

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ describe('Pools page', () => {
2828
});
2929

3030
describe('Create, update and destroy', () => {
31-
it('should create a pool with mirroring enabled', () => {
31+
it('should create a pool', () => {
3232
pools.existTableCell(poolName, false);
3333
pools.navigateTo('create');
34-
pools.create(poolName, 8, 'rbd');
34+
pools.create(poolName, 8, ['rbd']);
3535
pools.existTableCell(poolName);
3636
});
3737

38-
it('should edit a pools placement group and check if mirroring is enabled', () => {
38+
it('should edit a pools placement group', () => {
3939
pools.existTableCell(poolName);
4040
pools.edit_pool_pg(poolName, 32);
4141
});
@@ -50,4 +50,22 @@ describe('Pools page', () => {
5050
pools.delete(poolName);
5151
});
5252
});
53+
54+
describe('Pool with mirroring', () => {
55+
it('should create a pool with mirroring enabled', () => {
56+
pools.existTableCell(poolName, false);
57+
pools.navigateTo('create');
58+
pools.create(poolName, 8, ['rbd'], true);
59+
pools.existTableCell(poolName);
60+
});
61+
62+
it('should edit a pools placement group with mirroring enabled', () => {
63+
pools.existTableCell(poolName);
64+
pools.edit_pool_pg(poolName, 32, true, true);
65+
});
66+
67+
it('should delete the pool', () => {
68+
pools.delete(poolName);
69+
});
70+
});
5371
});

src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.po.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class PoolPageHelper extends PageHelper {
1414
}
1515

1616
@PageHelper.restrictTo(pages.create.url)
17-
create(name: string, placement_groups: number, ...apps: string[]) {
17+
create(name: string, placement_groups: number, apps: string[], mirroring = false) {
1818
cy.get('input[name=name]').clear().type(name);
1919

2020
this.isPowerOf2(placement_groups);
@@ -25,15 +25,19 @@ export class PoolPageHelper extends PageHelper {
2525
this.selectOption('pgAutoscaleMode', 'off'); // To show pgNum field
2626
cy.get('input[name=pgNum]').clear().type(`${placement_groups}`);
2727
this.setApplications(apps);
28-
cy.get('#rbdMirroring').check({ force: true });
28+
if (mirroring) {
29+
cy.get('#rbdMirroring').check({ force: true });
30+
}
2931
cy.get('cd-submit-button').click();
3032
}
3133

32-
edit_pool_pg(name: string, new_pg: number, wait = true) {
34+
edit_pool_pg(name: string, new_pg: number, wait = true, mirroring = false) {
3335
this.isPowerOf2(new_pg);
3436
this.navigateEdit(name);
3537

36-
cy.get('#rbdMirroring').should('be.checked');
38+
if (mirroring) {
39+
cy.get('#rbdMirroring').should('be.checked');
40+
}
3741

3842
cy.get('input[name=pgNum]').clear().type(`${new_pg}`);
3943
cy.get('cd-submit-button').click();

src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/language.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ export class LanguagePageHelper extends PageHelper {
1010
}
1111

1212
getAllLanguages() {
13-
return cy.get('cd-language-selector cds-header-menu');
13+
return cy.get('cd-language-selector cds-header-menu cds-header-item');
1414
}
1515
}

src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/notification.e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('Notification page', () => {
99
before(() => {
1010
cy.login();
1111
pools.navigateTo('create');
12-
pools.create(poolName, 8, 'rbd');
12+
pools.create(poolName, 8, ['rbd']);
1313
pools.edit_pool_pg(poolName, 4, false);
1414
});
1515

src/pybind/mgr/dashboard/frontend/cypress/support/commands.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const fillAuth = () => {
2727
window.localStorage.setItem('user_pwd_expiration_date', auth.pwdExpirationDate);
2828
window.localStorage.setItem('user_pwd_update_required', auth.pwdUpdateRequired);
2929
window.localStorage.setItem('sso', auth.sso);
30+
window.localStorage.setItem('telemetry_notification_hidden', 'true'); // disable telemetry notification in e2e
3031
};
3132

3233
Cypress.Commands.add('login', (username, password) => {
@@ -68,6 +69,7 @@ Cypress.Commands.add('ceph2Login', (username, password) => {
6869
window.localStorage.setItem('user_pwd_expiration_date', pwdExpirationDate);
6970
window.localStorage.setItem('user_pwd_update_required', pwdUpdateRequired);
7071
window.localStorage.setItem('sso', sso);
72+
window.localStorage.setItem('telemetry_notification_hidden', 'true'); // disable telemetry notification in e2e
7173
}
7274
);
7375
});

0 commit comments

Comments
 (0)