fix: Fix database in user & e2e

1. Fix the associated database of user in trove instance detail
2. Add waitting time to delete router of l3 agent

Change-Id: Ibdea651d968eaf128d273acca7a347e6a9d09453
This commit is contained in:
xusongfu 2022-06-02 17:08:03 +08:00
parent 6b34ad1b05
commit 55841fa520
2 changed files with 13 additions and 3 deletions

View File

@ -21,6 +21,10 @@ export class InstancesUsersStore extends Base {
return client.trove.instances.users;
}
get databaseClient() {
return client.trove.instances.databases;
}
get isSubResource() {
return true;
}
@ -36,11 +40,17 @@ export class InstancesUsersStore extends Base {
};
}
listDidFetch(items) {
async listDidFetch(items, _, filters) {
if (items.length === 0) return items;
const { id } = filters;
const { databases = [] } = await this.databaseClient.list(id);
return items.map((it) => ({
...it,
databases: (it.databases || []).map((db) => db.name).join(' , ') || '-',
databases:
(it.databases || [])
.filter((l1) => databases.find((l2) => l2.name === l1.name))
.map((db) => db.name)
.join(' , ') || '-',
}));
}

View File

@ -111,7 +111,7 @@ describe('The System Info Page', () => {
.clickDetailTab('Router')
.tableSearchText(routerName)
.clickActionButtonByTitle('Remove')
.clickConfirmActionSubmitButton();
.clickConfirmActionSubmitButton(10000);
});
it('successfully neutron agent l3 add router', () => {