mgr/dashboard: refactoring of references of classes to point to classes directly

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 44c86e660bb9465ec23491c6d40cf51af1663cf5..a4f3c6d6d4c67cdd6827ef3d7372442fca2b35f6 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
@@ -1,8 +1,10 @@
 import { Helper } from '../helper.po';
+import { PoolPageHelper } from '../pools/pools.po';
+import { ImagesPageHelper } from './images.po';
 
 describe('Images page', () => {
-  let images: Helper['images'];
-  let pools: Helper['pools'];
+  let pools: PoolPageHelper;
+  let images: ImagesPageHelper;
 
   beforeAll(() => {
     images = new Helper().images;

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 f78cec7d7a4e5b452f956dd051df90ceadd76ced..0e78102895ef35c1e761bff47cf76430a1c53dd0 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { IscsiPageHelper } from './iscsi.po';
 
 describe('Iscsi Page', () => {
-  let iscsi: Helper['iscsi'];
+  let iscsi: IscsiPageHelper;
 
   beforeAll(() => {
     iscsi = new Helper().iscsi;

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 091537518d5537643a2871e7b0856d120d5a91e0..3e1fb764c0c87c8a9c831a4758e16016fcce479a 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
@@ -1,8 +1,10 @@
 import { Helper } from '../helper.po';
+import { PoolPageHelper } from '../pools/pools.po';
+import { MirroringPageHelper } from './mirroring.po';
 
 describe('Mirroring page', () => {
-  let mirroring: Helper['mirroring'];
-  let pools: Helper['pools'];
+  let pools: PoolPageHelper;
+  let mirroring: MirroringPageHelper;
 
   beforeAll(() => {
     mirroring = new Helper().mirroring;

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 946cc36019b57b3168318b2409c14236cefb3319..d706a3355b580d280a3143e8d19bd07d923994ef 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { AlertsPageHelper } from './alerts.po';
 
 describe('Alerts page', () => {
-  let alerts: Helper['alerts'];
+  let alerts: AlertsPageHelper;
 
   beforeAll(() => {
     alerts = new Helper().alerts;

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 6ddbafbca98fc36536d7e65fe963c85ad6fa48dd..9c1c9ad51dcaebed5e6220bfb60847f29fc468b1 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { ConfigurationPageHelper } from './configuration.po';
 
 describe('Configuration page', () => {
-  let configuration: Helper['configuration'];
+  let configuration: ConfigurationPageHelper;
 
   beforeAll(() => {
     configuration = new Helper().configuration;

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 6c98c0192dd80a572ca4418cb3d36336fbd83ec3..c995b6b96620fd3dcfd20faeeba37c994a3965c2 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
@@ -1,8 +1,9 @@
 import { $, browser } from 'protractor';
 import { Helper } from '../helper.po';
+import { CrushMapPageHelper } from './crush-map.po';
 
 describe('CRUSH map page', () => {
-  let crushmap: Helper['crushMap'];
+  let crushmap: CrushMapPageHelper;
 
   beforeAll(() => {
     crushmap = new Helper().crushMap;

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 db385ed6a3e13c26e1a36346b57c0b444d948111..2b80588419dfe0bfee834e5674c93b2223b21163 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { HostsPageHelper } from './hosts.po';
 
 describe('Hosts page', () => {
-  let hosts: Helper['hosts'];
+  let hosts: HostsPageHelper;
 
   beforeAll(() => {
     hosts = new Helper().hosts;

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 0d5ce553d8767012fd0d9016800e171dbd1d51cd..54ef1bc98ac7c6057b9146f10a7793096e91e6a3 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
@@ -1,9 +1,12 @@
 import { Helper } from '../helper.po';
+import { PoolPageHelper } from '../pools/pools.po';
+import { ConfigurationPageHelper } from './configuration.po';
+import { LogsPageHelper } from './logs.po';
 
 describe('Logs page', () => {
-  let logs: Helper['logs'];
-  let pools: Helper['pools'];
-  let configuration: Helper['configuration'];
+  let logs: LogsPageHelper;
+  let pools: PoolPageHelper;
+  let configuration: ConfigurationPageHelper;
 
   const poolname = 'logs_e2e_test_pool';
   const configname = 'log_graylog_port';

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 b99c1aa1ed0e9f11eb358c61bdf7e24232993cbe..a6248c6e27e7f998b92f871833ef9a5e9a4e19d5 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { ManagerModulesPageHelper } from './mgr-modules.po';
 
 describe('Manager modules page', () => {
-  let mgrmodules: Helper['mgrmodules'];
+  let mgrmodules: ManagerModulesPageHelper;
 
   beforeAll(() => {
     mgrmodules = new Helper().mgrModules;

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 f1146b5ac32530143ca7036e4bee7d2bfc519312..8b91ab9c4245b5a50250164f417ccc6277fa9b81 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { MonitorsPageHelper } from './monitors.po';
 
 describe('Monitors page', () => {
-  let monitors: Helper['monitors'];
+  let monitors: MonitorsPageHelper;
 
   beforeAll(() => {
     monitors = new Helper().monitors;

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 7f0201c1a52b87cb30e084254fb0f59a48f2b0a6..235412f5484162d0a26d8d1f3c6c93aa918803da 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { OSDsPageHelper } from './osds.po';
 
 describe('OSDs page', () => {
-  let osds: Helper['osds'];
+  let osds: OSDsPageHelper;
 
   beforeAll(() => {
     osds = new Helper().osds;

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 2f3ba4c16b7285406310413dc315e22a292c2811..02e14ecbe890fd3784040b5a7f5204341a018535 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts
@@ -1,14 +1,21 @@
 import { $$, browser, by, element } from 'protractor';
+import { IscsiPageHelper } from './block/iscsi.po';
+import { HostsPageHelper } from './cluster/hosts.po';
+import { MonitorsPageHelper } from './cluster/monitors.po';
+import { OSDsPageHelper } from './cluster/osds.po';
+import { DashboardPageHelper } from './dashboard.po';
 import { Helper } from './helper.po';
+import { PoolPageHelper } from './pools/pools.po';
+import { DaemonsPageHelper } from './rgw/daemons.po';
 
 describe('Dashboard Main Page', () => {
-  let dashboard: Helper['dashboard'];
-  let daemons: Helper['daemons'];
-  let hosts: Helper['hosts'];
-  let osds: Helper['osds'];
-  let pools: Helper['pools'];
-  let monitors: Helper['monitors'];
-  let iscsi: Helper['iscsi'];
+  let dashboard: DashboardPageHelper;
+  let daemons: DaemonsPageHelper;
+  let hosts: HostsPageHelper;
+  let osds: OSDsPageHelper;
+  let pools: PoolPageHelper;
+  let monitors: MonitorsPageHelper;
+  let iscsi: IscsiPageHelper;
 
   beforeAll(() => {
     dashboard = new Helper().dashboard;

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 68b0dfdda657138bb140c4cd1b070cd34aa8d1aa..dc339f6df78e2cc497fd2e64df5c435ebaff2164 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { FilesystemsPageHelper } from './filesystems.po';
 
 describe('Filesystems page', () => {
-  let filesystems: Helper['filesystems'];
+  let filesystems: FilesystemsPageHelper;
 
   beforeAll(() => {
     filesystems = new Helper().filesystems;

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 976e9824bcad558b4f5eb1eb74e76f0d4c132f86..00aaffa3bd8f708ece8b28f63bf655e5b68f12e6 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { NfsPageHelper } from './nfs.po';
 
 describe('Nfs page', () => {
-  let nfs: Helper['nfs'];
+  let nfs: NfsPageHelper;
 
   beforeAll(() => {
     nfs = new Helper().nfs;

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 d90fdcd317d4901ed1cad269ae06c7ae748c2060..514b77c240d2bd17fe6c56832206875f5d38050f 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { PoolPageHelper } from './pools.po';
 
 describe('Pools page', () => {
-  let pools: Helper['pools'];
+  let pools: PoolPageHelper;
   const poolName = 'pool_e2e_pool_test';
 
   beforeAll(async () => {

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 ce864dca847dcb9e0a8ea1b04ab11cf80a2f3bf5..b8e6a6b47870558e31df22107fcf1d02f8950a79 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
@@ -1,8 +1,9 @@
 import { $ } from 'protractor';
 import { Helper } from '../helper.po';
+import { BucketsPageHelper } from './buckets.po';
 
 describe('RGW buckets page', () => {
-  let buckets: Helper['buckets'];
+  let buckets: BucketsPageHelper;
 
   beforeAll(async () => {
     const helper = new Helper();

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 e5f4bd93115868a7404d2fdc1e86adacf55c0486..d8ed69fe777ff3858f3bdf2b4448ae8f74596402 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { DaemonsPageHelper } from './daemons.po';
 
 describe('RGW daemons page', () => {
-  let daemons: Helper['daemons'];
+  let daemons: DaemonsPageHelper;
 
   beforeAll(() => {
     daemons = new Helper().daemons;

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 33870b3cb8a3656b4f888b590103d5bef0b96ac6..72ce100e5a2034b9308e82179a213143bfdbbde2 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
@@ -1,7 +1,8 @@
 import { Helper } from '../helper.po';
+import { UsersPageHelper } from './users.po';
 
 describe('RGW users page', () => {
-  let users: Helper['users'];
+  let users: UsersPageHelper;
   const user_name = '000user_create_edit_delete';
 
   beforeAll(() => {