mgr/dashboard: refactoring Helper class to remove PageHelper instances

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
index a4f3c6d6d4c67cdd6827ef3d7372442fca2b35f6..f046966451aad7b40205f7e1c79e4afcbd9a9356 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
@@ -7,8 +7,8 @@ describe('Images page', () => {
   let images: ImagesPageHelper;
 
   beforeAll(() => {
-    images = new Helper().images;
-    pools = new Helper().pools;
+    images = new ImagesPageHelper();
+    pools = new PoolPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
index 0e78102895ef35c1e761bff47cf76430a1c53dd0..e4aee230624ec9d3750b81b4c0d5a2475aa8135b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('Iscsi Page', () => {
   let iscsi: IscsiPageHelper;
 
   beforeAll(() => {
-    iscsi = new Helper().iscsi;
+    iscsi = new IscsiPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
index 3e1fb764c0c87c8a9c831a4758e16016fcce479a..205779a6d2e8c1bb25030bb3edee1bdb333d6111 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
@@ -7,8 +7,8 @@ describe('Mirroring page', () => {
   let mirroring: MirroringPageHelper;
 
   beforeAll(() => {
-    mirroring = new Helper().mirroring;
-    pools = new Helper().pools;
+    mirroring = new MirroringPageHelper();
+    pools = new PoolPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
index d706a3355b580d280a3143e8d19bd07d923994ef..d20a3f4f3e6b5afd0a40f4a88fede0dfc4e42d4d 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('Alerts page', () => {
   let alerts: AlertsPageHelper;
 
   beforeAll(() => {
-    alerts = new Helper().alerts;
+    alerts = new AlertsPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
index 9c1c9ad51dcaebed5e6220bfb60847f29fc468b1..e25ea4ac460cdbc6f6e042c7e2b184eac7b65718 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('Configuration page', () => {
   let configuration: ConfigurationPageHelper;
 
   beforeAll(() => {
-    configuration = new Helper().configuration;
+    configuration = new ConfigurationPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
index c995b6b96620fd3dcfd20faeeba37c994a3965c2..4df82e1d3428f8d1dbeea442d15fac3656716abe 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
@@ -6,7 +6,7 @@ describe('CRUSH map page', () => {
   let crushmap: CrushMapPageHelper;
 
   beforeAll(() => {
-    crushmap = new Helper().crushMap;
+    crushmap = new CrushMapPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
index 2b80588419dfe0bfee834e5674c93b2223b21163..9619c7878b5d286846cd58aa19e07cf0dc634a35 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('Hosts page', () => {
   let hosts: HostsPageHelper;
 
   beforeAll(() => {
-    hosts = new Helper().hosts;
+    hosts = new HostsPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
index 54ef1bc98ac7c6057b9146f10a7793096e91e6a3..72aa8c895f096eef9881235759c272776b957a47 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
@@ -18,9 +18,9 @@ describe('Logs page', () => {
   const minute = today.getMinutes();
 
   beforeAll(() => {
-    logs = new Helper().logs;
-    pools = new Helper().pools;
-    configuration = new Helper().configuration;
+    logs = new LogsPageHelper();
+    pools = new PoolPageHelper();
+    configuration = new ConfigurationPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
index a6248c6e27e7f998b92f871833ef9a5e9a4e19d5..0a238d4e076b765396ed4854805c62985e259e2c 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('Manager modules page', () => {
   let mgrmodules: ManagerModulesPageHelper;
 
   beforeAll(() => {
-    mgrmodules = new Helper().mgrModules;
+    mgrmodules = new ManagerModulesPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
index 8b91ab9c4245b5a50250164f417ccc6277fa9b81..122f923fd3e95c1e182256953d92ce159e36e869 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('Monitors page', () => {
   let monitors: MonitorsPageHelper;
 
   beforeAll(() => {
-    monitors = new Helper().monitors;
+    monitors = new MonitorsPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
index 235412f5484162d0a26d8d1f3c6c93aa918803da..55c482a35efd90d2fd3bc9c485a6482fc93dbb58 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('OSDs page', () => {
   let osds: OSDsPageHelper;
 
   beforeAll(() => {
-    osds = new Helper().osds;
+    osds = new OSDsPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts
index df1d03abc74d2ba170f4f7a75159fb77d42c6c7a..711be73a0ddb6061e72e22183bc396f8a4428928 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts
@@ -19,14 +19,13 @@ describe('Dashboard Main Page', () => {
   let iscsi: IscsiPageHelper;
 
   beforeAll(() => {
-    const h = new Helper();
-    dashboard = h.dashboard;
-    daemons = h.daemons;
-    hosts = h.hosts;
-    osds = h.osds;
-    pools = h.pools;
-    monitors = h.monitors;
-    iscsi = h.iscsi;
+    dashboard = new DashboardPageHelper();
+    daemons = new DaemonsPageHelper();
+    hosts = new HostsPageHelper();
+    osds = new OSDsPageHelper();
+    pools = new PoolPageHelper();
+    monitors = new MonitorsPageHelper();
+    iscsi = new IscsiPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
index dc339f6df78e2cc497fd2e64df5c435ebaff2164..efbf9222ddb8999e1b9279e5133fed3252ab750f 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('Filesystems page', () => {
   let filesystems: FilesystemsPageHelper;
 
   beforeAll(() => {
-    filesystems = new Helper().filesystems;
+    filesystems = new FilesystemsPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
index a27e57e394a4e2cda2d1f31e3d8d720a4da97339..64e0cd1c3c8ff97ed3694b57ef215f77a280c04a 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
@@ -26,7 +26,6 @@ export class Helper {
   pools: PoolPageHelper;
   buckets: BucketsPageHelper;
   images: ImagesPageHelper;
-  iscsi: IscsiPageHelper;
   mirroring: MirroringPageHelper;
   dashboard: DashboardPageHelper;
   usermgmt: UserMgmtPageHelper;
@@ -42,9 +41,7 @@ export class Helper {
   crushMap: CrushMapPageHelper;
   configuration: ConfigurationPageHelper;
   alerts: AlertsPageHelper;
-  mirroring: MirroringPageHelper;
   iscsi: IscsiPageHelper;
-  dashboard: DashboardPageHelper;
 
   constructor() {
     this.pools = new PoolPageHelper();

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
index 00aaffa3bd8f708ece8b28f63bf655e5b68f12e6..f53e30ff86d8d4f9edb2fda0d3b6ab6c4cccaeb4 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('Nfs page', () => {
   let nfs: NfsPageHelper;
 
   beforeAll(() => {
-    nfs = new Helper().nfs;
+    nfs = new NfsPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
index 514b77c240d2bd17fe6c56832206875f5d38050f..1ec08b2865a26496936747f958b1d44f74909c0b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
@@ -6,7 +6,7 @@ describe('Pools page', () => {
   const poolName = 'pool_e2e_pool_test';
 
   beforeAll(async () => {
-    pools = new Helper().pools;
+    pools = new PoolPageHelper();
     await pools.navigateTo();
   });
 

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts
index b8e6a6b47870558e31df22107fcf1d02f8950a79..1631b645f9054db21471e74d618f02f05a7a3e14 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts
@@ -6,8 +6,7 @@ describe('RGW buckets page', () => {
   let buckets: BucketsPageHelper;
 
   beforeAll(async () => {
-    const helper = new Helper();
-    buckets = helper.buckets;
+    buckets = new BucketsPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
index d8ed69fe777ff3858f3bdf2b4448ae8f74596402..ba8a2b46466a3a54474e853f91a35cf05950a599 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
@@ -5,7 +5,7 @@ describe('RGW daemons page', () => {
   let daemons: DaemonsPageHelper;
 
   beforeAll(() => {
-    daemons = new Helper().daemons;
+    daemons = new DaemonsPageHelper();
   });
 
   afterEach(async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
index 72ce100e5a2034b9308e82179a213143bfdbbde2..bf6cf71726e91370e48113420cc4bb4a327deb1e 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
@@ -6,7 +6,7 @@ describe('RGW users page', () => {
   const user_name = '000user_create_edit_delete';
 
   beforeAll(() => {
-    users = new Helper().users;
+    users = new UsersPageHelper();
   });
 
   afterEach(async () => {