mgr/dashboard: Add Api module

src/pybind/mgr/dashboard/frontend/src/app/app.module.ts

@@ -30,15 +30,12 @@ export class CustomOption extends ToastOptions {
     BrowserAnimationsModule,
     ToastModule.forRoot(),
     AppRoutingModule,
-    HttpClientModule,
     CoreModule,
     SharedModule,
     CephModule,
     AccordionModule.forRoot(),
     BsDropdownModule.forRoot(),
-    TabsModule.forRoot(),
-    HttpClientModule,
-    BrowserAnimationsModule
+    TabsModule.forRoot()
   ],
   exports: [SharedModule],
   providers: [

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts

@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AppModule } from '../../../app.module';
-import { TcmuIscsiService } from '../../../shared/services/tcmu-iscsi.service';
+import { TcmuIscsiService } from '../../../shared/api/tcmu-iscsi.service';
 import { IscsiComponent } from './iscsi.component';
 
 describe('IscsiComponent', () => {

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts

@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
 
+import { TcmuIscsiService } from '../../../shared/api/tcmu-iscsi.service';
 import { CellTemplate } from '../../../shared/enum/cell-template.enum';
 import { CephShortVersionPipe } from '../../../shared/pipes/ceph-short-version.pipe';
 import { DimlessPipe } from '../../../shared/pipes/dimless.pipe';
 import { ListPipe } from '../../../shared/pipes/list.pipe';
 import { RelativeDatePipe } from '../../../shared/pipes/relative-date.pipe';
-import { TcmuIscsiService } from '../../../shared/services/tcmu-iscsi.service';
 
 @Component({
   selector: 'cd-iscsi',

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts

@@ -5,7 +5,7 @@ import { BsDropdownModule, TabsModule } from 'ngx-bootstrap';
 import { ProgressbarModule } from 'ngx-bootstrap/progressbar';
 import { Observable } from 'rxjs/Observable';
 
-import { RbdMirroringService } from '../../../shared/services/rbd-mirroring.service';
+import { RbdMirroringService } from '../../../shared/api/rbd-mirroring.service';
 import { SharedModule } from '../../../shared/shared.module';
 import { MirrorHealthColorPipe } from '../mirror-health-color.pipe';
 import { MirroringComponent } from './mirroring.component';

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.ts

@@ -3,9 +3,9 @@ import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 
 import * as _ from 'lodash';
 
+import { RbdMirroringService } from '../../../shared/api/rbd-mirroring.service';
 import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum';
 import { CephShortVersionPipe } from '../../../shared/pipes/ceph-short-version.pipe';
-import { RbdMirroringService } from '../../../shared/services/rbd-mirroring.service';
 
 @Component({
   selector: 'cd-mirroring',

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/pool-detail/pool-detail.component.ts

@@ -1,11 +1,11 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
+import { PoolService } from '../../../shared/api/pool.service';
 import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum';
 import { CdTableColumn } from '../../../shared/models/cd-table-column';
 import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe';
 import { DimlessPipe } from '../../../shared/pipes/dimless.pipe';
-import { PoolService } from '../../../shared/services/pool.service';
 
 @Component({
   selector: 'cd-pool-detail',

src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.module.ts

@@ -7,7 +7,6 @@ import { ProgressbarModule } from 'ngx-bootstrap/progressbar';
 import { AppRoutingModule } from '../../app-routing.module';
 import { SharedModule } from '../../shared/shared.module';
 import { CephfsChartComponent } from './cephfs-chart/cephfs-chart.component';
-import { CephfsService } from './cephfs.service';
 import { CephfsComponent } from './cephfs/cephfs.component';
 import { ClientsComponent } from './clients/clients.component';
 
@@ -19,7 +18,6 @@ import { ClientsComponent } from './clients/clients.component';
     ChartsModule,
     ProgressbarModule.forRoot()
   ],
-  declarations: [CephfsComponent, ClientsComponent, CephfsChartComponent],
-  providers: [CephfsService]
+  declarations: [CephfsComponent, ClientsComponent, CephfsChartComponent]
 })
 export class CephfsModule {}

src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.spec.ts

@@ -5,9 +5,9 @@ import { ChartsModule } from 'ng2-charts/ng2-charts';
 import { BsDropdownModule, ProgressbarModule } from 'ngx-bootstrap';
 import { Observable } from 'rxjs/Observable';
 
+import { CephfsService } from '../../../shared/api/cephfs.service';
 import { SharedModule } from '../../../shared/shared.module';
 import { CephfsChartComponent } from '../cephfs-chart/cephfs-chart.component';
-import { CephfsService } from '../cephfs.service';
 import { CephfsComponent } from './cephfs.component';
 
 describe('CephfsComponent', () => {

src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.ts

@@ -4,9 +4,9 @@ import { ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import { Subscription } from 'rxjs/Subscription';
 
+import { CephfsService } from '../../../shared/api/cephfs.service';
 import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe';
 import { DimlessPipe } from '../../../shared/pipes/dimless.pipe';
-import { CephfsService } from '../cephfs.service';
 
 @Component({
   selector: 'cd-cephfs',

src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.spec.ts

@@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { BsDropdownModule } from 'ngx-bootstrap';
 import { Observable } from 'rxjs/Observable';
 
+import { CephfsService } from '../../../shared/api/cephfs.service';
 import { SharedModule } from '../../../shared/shared.module';
-import { CephfsService } from '../cephfs.service';
 import { ClientsComponent } from './clients.component';
 
 describe('ClientsComponent', () => {

src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
+import { CephfsService } from '../../../shared/api/cephfs.service';
 import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum';
-import { CephfsService } from '../cephfs.service';
 
 @Component({
   selector: 'cd-clients',

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts

@@ -10,14 +10,12 @@ import { SharedModule } from '../../shared/shared.module';
 import { PerformanceCounterModule } from '../performance-counter/performance-counter.module';
 import { ConfigurationComponent } from './configuration/configuration.component';
 import { HostsComponent } from './hosts/hosts.component';
-import { MonitorService } from './monitor.service';
 import { MonitorComponent } from './monitor/monitor.component';
 import { OsdDetailsComponent } from './osd/osd-details/osd-details.component';
 import { OsdListComponent } from './osd/osd-list/osd-list.component';
 import {
   OsdPerformanceHistogramComponent
 } from './osd/osd-performance-histogram/osd-performance-histogram.component';
-import { OsdService } from './osd/osd.service';
 
 @NgModule({
   entryComponents: [
@@ -39,10 +37,6 @@ import { OsdService } from './osd/osd.service';
     OsdListComponent,
     OsdDetailsComponent,
     OsdPerformanceHistogramComponent
-  ],
-  providers: [
-    MonitorService,
-    OsdService
   ]
 })
 export class ClusterModule {}

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts

@@ -3,7 +3,7 @@ import { FormsModule } from '@angular/forms';
 
 import { Observable } from 'rxjs/Observable';
 
-import { ConfigurationService } from '../../../shared/services/configuration.service';
+import { ConfigurationService } from '../../../shared/api/configuration.service';
 import { SharedModule } from '../../../shared/shared.module';
 import { ConfigurationComponent } from './configuration.component';
 

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 
-import { ConfigurationService } from '../../../shared/services/configuration.service';
+import { ConfigurationService } from '../../../shared/api/configuration.service';
 
 @Component({
   selector: 'cd-configuration',

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 
+import { HostService } from '../../../shared/api/host.service';
 import { CdTableColumn } from '../../../shared/models/cd-table-column';
 import { CephShortVersionPipe } from '../../../shared/pipes/ceph-short-version.pipe';
-import { HostService } from '../../../shared/services/host.service';
 
 @Component({
   selector: 'cd-hosts',

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
+import { MonitorService } from '../../../shared/api/monitor.service';
 import { CellTemplate } from '../../../shared/enum/cell-template.enum';
-import { MonitorService } from '../monitor.service';
 
 @Component({
   selector: 'cd-monitor',

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts

@@ -5,11 +5,11 @@ import { TabsModule } from 'ngx-bootstrap';
 
 import { DataTableModule } from '../../../../shared/datatable/datatable.module';
 import { CdTableSelection } from '../../../../shared/models/cd-table-selection';
+import { SharedModule } from '../../../../shared/shared.module';
 import { PerformanceCounterModule } from '../../../performance-counter/performance-counter.module';
 import {
   OsdPerformanceHistogramComponent
 } from '../osd-performance-histogram/osd-performance-histogram.component';
-import { OsdService } from '../osd.service';
 import { OsdDetailsComponent } from './osd-details.component';
 
 describe('OsdDetailsComponent', () => {
@@ -22,13 +22,13 @@ describe('OsdDetailsComponent', () => {
         HttpClientModule,
         TabsModule.forRoot(),
         PerformanceCounterModule,
-        DataTableModule
+        DataTableModule,
+        SharedModule
       ],
       declarations: [
         OsdDetailsComponent,
         OsdPerformanceHistogramComponent
-      ],
-      providers: [OsdService]
+      ]
     })
     .compileComponents();
   }));

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts

@@ -2,8 +2,8 @@ import { Component, Input, OnChanges } from '@angular/core';
 
 import * as _ from 'lodash';
 
+import { OsdService } from '../../../../shared/api/osd.service';
 import { CdTableSelection } from '../../../../shared/models/cd-table-selection';
-import { OsdService } from '../osd.service';
 
 @Component({
   selector: 'cd-osd-details',

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts

@@ -7,12 +7,12 @@ import { ComponentsModule } from '../../../../shared/components/components.modul
 import { DataTableModule } from '../../../../shared/datatable/datatable.module';
 import { DimlessPipe } from '../../../../shared/pipes/dimless.pipe';
 import { FormatterService } from '../../../../shared/services/formatter.service';
+import { SharedModule } from '../../../../shared/shared.module';
 import { PerformanceCounterModule } from '../../../performance-counter/performance-counter.module';
 import { OsdDetailsComponent } from '../osd-details/osd-details.component';
 import {
   OsdPerformanceHistogramComponent
 } from '../osd-performance-histogram/osd-performance-histogram.component';
-import { OsdService } from '../osd.service';
 import { OsdListComponent } from './osd-list.component';
 
 describe('OsdListComponent', () => {
@@ -26,14 +26,15 @@ describe('OsdListComponent', () => {
         PerformanceCounterModule,
         TabsModule.forRoot(),
         DataTableModule,
-        ComponentsModule
+        ComponentsModule,
+        SharedModule
       ],
       declarations: [
         OsdListComponent,
         OsdDetailsComponent,
         OsdPerformanceHistogramComponent
       ],
-      providers: [OsdService, DimlessPipe, FormatterService]
+      providers: [ DimlessPipe, FormatterService]
     })
     .compileComponents();
   }));

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 
+import { OsdService } from '../../../../shared/api/osd.service';
 import { CellTemplate } from '../../../../shared/enum/cell-template.enum';
 import { CdTableColumn } from '../../../../shared/models/cd-table-column';
 import { CdTableSelection } from '../../../../shared/models/cd-table-selection';
 import { DimlessBinaryPipe } from '../../../../shared/pipes/dimless-binary.pipe';
-import { OsdService } from '../osd.service';
 
 @Component({
   selector: 'cd-osd-list',

src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.module.ts

@@ -6,7 +6,6 @@ import { ChartsModule } from 'ng2-charts';
 import { TabsModule } from 'ngx-bootstrap/tabs';
 
 import { SharedModule } from '../../shared/shared.module';
-import { DashboardService } from './dashboard.service';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { HealthPieComponent } from './health-pie/health-pie.component';
 import { HealthComponent } from './health/health.component';
@@ -31,7 +30,6 @@ import { PgStatusPipe } from './pg-status.pipe';
     MdsSummaryPipe,
     PgStatusStylePipe,
     HealthPieComponent
-  ],
-  providers: [DashboardService]
+  ]
 })
 export class DashboardModule {}

src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts

@@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabsModule } from 'ngx-bootstrap/tabs';
 
+import { DashboardService } from '../../../shared/api/dashboard.service';
 import { SharedModule } from '../../../shared/shared.module';
-import { DashboardService } from '../dashboard.service';
 import { HealthComponent } from './health.component';
 
 describe('HealthComponent', () => {

src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts

@@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 
 import * as _ from 'lodash';
 
-import { DashboardService } from '../dashboard.service';
+import { DashboardService } from '../../../shared/api/dashboard.service';
 
 @Component({
   selector: 'cd-health',

src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter.module.ts

@@ -6,7 +6,6 @@ import { SharedModule } from '../../shared/shared.module';
 import {
   PerformanceCounterComponent
 } from './performance-counter/performance-counter.component';
-import { TablePerformanceCounterService } from './services/table-performance-counter.service';
 import {
   TablePerformanceCounterComponent
 } from './table-performance-counter/table-performance-counter.component';
@@ -21,9 +20,6 @@ import {
     TablePerformanceCounterComponent,
     PerformanceCounterComponent
   ],
-  providers: [
-    TablePerformanceCounterService
-  ],
   exports: [
     TablePerformanceCounterComponent
   ]

src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts

@@ -3,8 +3,10 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { BsDropdownModule } from 'ngx-bootstrap';
 
+import {
+  TablePerformanceCounterService
+} from '../../../shared/api/table-performance-counter.service';
 import { PerformanceCounterModule } from '../performance-counter.module';
-import { TablePerformanceCounterService } from '../services/table-performance-counter.service';
 import { PerformanceCounterComponent } from './performance-counter.component';
 
 describe('PerformanceCounterComponent', () => {
@@ -27,11 +29,7 @@ describe('PerformanceCounterComponent', () => {
   beforeEach(
     async(() => {
       TestBed.configureTestingModule({
-        imports: [
-          PerformanceCounterModule,
-          BsDropdownModule.forRoot(),
-          RouterTestingModule
-        ],
+        imports: [PerformanceCounterModule, BsDropdownModule.forRoot(), RouterTestingModule],
         providers: [{ provide: TablePerformanceCounterService, useValue: fakeService }]
       }).compileComponents();
     })

src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts

@@ -5,7 +5,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { BsDropdownModule } from 'ngx-bootstrap';
 
 import { SharedModule } from '../../../shared/shared.module';
-import { TablePerformanceCounterService } from '../services/table-performance-counter.service';
 import { TablePerformanceCounterComponent } from './table-performance-counter.component';
 
 describe('TablePerformanceCounterComponent', () => {
@@ -20,8 +19,7 @@ describe('TablePerformanceCounterComponent', () => {
         HttpClientModule,
         BsDropdownModule.forRoot(),
         SharedModule
-      ],
-      providers: [ TablePerformanceCounterService ]
+      ]
     })
     .compileComponents();
   }));

src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts

@@ -1,7 +1,9 @@
 import { Component, Input, OnInit, TemplateRef, ViewChild } from '@angular/core';
 
+import {
+  TablePerformanceCounterService
+} from '../../../shared/api/table-performance-counter.service';
 import { CdTableColumn } from '../../../shared/models/cd-table-column';
-import { TablePerformanceCounterService } from '../services/table-performance-counter.service';
 
 /**
  * Display the specified performance counters in a datatable.

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts

@@ -2,10 +2,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabsModule } from 'ngx-bootstrap/tabs';
 
+import { RgwDaemonService } from '../../../shared/api/rgw-daemon.service';
 import { CdTableSelection } from '../../../shared/models/cd-table-selection';
 import { SharedModule } from '../../../shared/shared.module';
 import { PerformanceCounterModule } from '../../performance-counter/performance-counter.module';
-import { RgwDaemonService } from '../services/rgw-daemon.service';
 import { RgwDaemonDetailsComponent } from './rgw-daemon-details.component';
 
 describe('RgwDaemonDetailsComponent', () => {