I renamed servers service file into controller.service

e2e/helpers/controller.po.ts

@@ -1,22 +1,22 @@
 import { browser, by } from 'protractor';
 import { TestHelper } from './common.po';
 
-export class ServersPage {
+export class ControllersPage {
   helper = new TestHelper();
 
   maximizeWindow() {
     browser.driver.manage().window().maximize();
   }
 
-  navigateToServersPage() {
+  navigateToControllersPage() {
     return browser.get('/controllers');
   }
 
-  getAddServerNotificationText() {
+  getAddControllerNotificationText() {
     return browser.driver.findElement(by.className('mat-card-content')).getText();
   }
 
-  async clickAddServer() {
+  async clickAddController() {
     let controllerTable = await this.checkControllersTable();
     if (controllerTable.length === 0) {
       let buttons = await browser.driver.findElements(by.className('mat-button mat-button-base'));

e2e/project-map.e2e-spec.ts

@@ -1,23 +1,23 @@
 import { TestHelper } from './helpers/common.po';
 import { ProjectMapPage } from './helpers/project-map.po';
 import { ProjectsPage } from './helpers/project.po';
-import { ServersPage } from './helpers/server.po';
+import { ControllersPage } from './helpers/controller.po';
 
 describe('Project map page', () => {
-  let controllersPage: ServersPage;
+  let controllersPage: ControllersPage;
   let projectsPage: ProjectsPage;
   let projectMapPage: ProjectMapPage;
   let helper: TestHelper;
 
   beforeEach(async () => {
-    controllersPage = new ServersPage();
+    controllersPage = new ControllersPage();
     projectsPage = new ProjectsPage();
     projectMapPage = new ProjectMapPage();
     helper = new TestHelper();
 
     controllersPage.maximizeWindow();
-    await controllersPage.navigateToServersPage();
+    await controllersPage.navigateToControllersPage();
-    await controllersPage.clickAddServer();
+    await controllersPage.clickAddController();
     await controllersPage.navigateToServerProjects();
     await projectsPage.openAddProjectDialog();
     helper.sleep(2000);

e2e/projects.e2e-spec.ts

@@ -1,14 +1,14 @@
 import { TestHelper } from './helpers/common.po';
 import { ProjectsPage } from './helpers/project.po';
-import { ServersPage } from './helpers/server.po';
+import { ControllersPage } from './helpers/server.po';
 
 describe('Projects page', () => {
-  let controllersPage: ServersPage;
+  let controllersPage: ControllersPage;
   let projectsPage: ProjectsPage;
   let helper: TestHelper;
 
   beforeEach(() => {
-    controllersPage = new ServersPage();
+    controllersPage = new ControllersPage();
     projectsPage = new ProjectsPage();
     helper = new TestHelper();
   });
@@ -16,8 +16,8 @@ describe('Projects page', () => {
   it('user should have possibility to create new project', async () => {
     // arrange
     controllersPage.maximizeWindow();
-    await controllersPage.navigateToServersPage();
+    await controllersPage.navigateToControllersPage();
-    await controllersPage.clickAddServer();
+    await controllersPage.clickAddController();
     await controllersPage.navigateToServerProjects();
     helper.sleep(2000);
 

e2e/servers.e2e-spec.ts

@@ -1,22 +1,22 @@
 import { TestHelper } from './helpers/common.po';
-import { ServersPage } from './helpers/server.po';
+import { ControllersPage } from './helpers/server.po';
 
 describe('Servers page', () => {
-  let page: ServersPage;
+  let page: ControllersPage;
   let helper: TestHelper;
 
   beforeEach(() => {
-    page = new ServersPage();
+    page = new ControllersPage();
     helper = new TestHelper();
   });
 
   xit('user should have possibility to add controller', async () => {
     // arrange
     page.maximizeWindow();
-    await page.navigateToServersPage();
+    await page.navigateToControllersPage();
 
     // act
-    let text = await page.getAddServerNotificationText();
+    let text = await page.getAddControllerNotificationText();
 
     // assert
     expect(text).toBe("We've discovered GNS3 controller on 127.0.0.1:3080, would you like to add to the list?");
@@ -25,8 +25,8 @@ describe('Servers page', () => {
   it('user should see added controller in the list', async () => {
     // arrange
     page.maximizeWindow();
-    await page.navigateToServersPage();
+    await page.navigateToControllersPage();
-    await page.clickAddServer();
+    await page.clickAddController();
     helper.sleep(1000);
 
     // act

src/app/app-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { BundledServerFinderComponent } from './components/bundled-server-finder/bundled-server-finder.component';
+import { BundledControllerFinderComponent } from './components/bundled-controller-finder/bundled-controller-finder.component';
 import { DirectLinkComponent } from './components/direct-link/direct-link.component';
 import { HelpComponent } from './components/help/help.component';
 import { InstalledSoftwareComponent } from './components/installed-software/installed-software.component';
@@ -65,7 +65,7 @@ const routes: Routes = [
     children: [
       { path: '', redirectTo: 'controllers', pathMatch: 'full' },
       { path: 'controllers', component: ControllersComponent },
-      { path: 'bundled', component: BundledServerFinderComponent },
+      { path: 'bundled', component: BundledControllerFinderComponent },
       { path: 'controller/:controller_id/login', component: LoginComponent },
       { path: 'controller/:controller_id/loggeduser', component: LoggedUserComponent },
       {path : 'controller/:controller_id/image-manager', component: ImageManagerComponent},

src/app/app.module.ts

@@ -29,7 +29,7 @@ import { ProgressDialogService } from './common/progress-dialog/progress-dialog.
 import { ProgressComponent } from './common/progress/progress.component';
 import { ProgressService } from './common/progress/progress.service';
 import { AdbutlerComponent } from './components/adbutler/adbutler.component';
-import { BundledServerFinderComponent } from './components/bundled-server-finder/bundled-server-finder.component';
+import { BundledControllerFinderComponent } from './components/bundled-controller-finder/bundled-controller-finder.component';
 import { InformationDialogComponent } from './components/dialogs/information-dialog.component';
 import { DirectLinkComponent } from './components/direct-link/direct-link.component';
 import { DrawingAddedComponent } from './components/drawings-listeners/drawing-added/drawing-added.component';
@@ -224,7 +224,7 @@ import { DockerService } from './services/docker.service';
 import { DrawingService } from './services/drawing.service';
 import { ExternalSoftwareDefinitionService } from './services/external-software-definition.service';
 import { GoogleAnalyticsService } from './services/google-analytics.service';
-import { HttpServer, ServerErrorHandler } from './services/http-server.service';
+import { HttpController, ControllerErrorHandler } from './services/http-controller.service';
 import { InfoService } from './services/info.service';
 import { InstalledSoftwareService } from './services/installed-software.service';
 import { IosConfigurationService } from './services/ios-configuration.service';
@@ -319,7 +319,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n
     SuspendLinkActionComponent,
     SettingsComponent,
     PreferencesComponent,
-    BundledServerFinderComponent,
+    BundledControllerFinderComponent,
     ProgressComponent,
     ControllerDiscoveryComponent,
     NodeSelectInterfaceComponent,
@@ -510,7 +510,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n
     NodeService,
     LinkService,
     DrawingService,
-    HttpServer,
+    HttpController,
     SnapshotService,
     ProgressDialogService,
     ToasterService,
@@ -523,7 +523,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n
     SelectionManager,
     InRectangleHelper,
     DrawingsDataSource,
-    ServerErrorHandler,
+    ControllerErrorHandler,
     ControllerDatabase,
     ProjectNameValidator,
     ToolsService,

src/app/components/bundled-controller-finder/bundled-controller-finder.component.spec.ts

@@ -6,13 +6,13 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { ProgressService } from '../../common/progress/progress.service';
 import{ Controller } from '../../models/controller';
 import { ControllerService } from '../../services/controller.service';
-import { MockedServerService } from '../../services/controller.service.spec';
+import { MockedControllerService } from '../../services/controller.service.spec';
 import { MockedProgressService } from '../project-map/project-map.component.spec';
-import { BundledServerFinderComponent } from './bundled-server-finder.component';
+import { BundledControllerFinderComponent } from './bundled-controller-finder.component';
 
-describe('BundledServerFinderComponent', () => {
+describe('BundledControllerFinderComponent', () => {
-  let component: BundledServerFinderComponent;
+  let component: BundledControllerFinderComponent;
-  let fixture: ComponentFixture<BundledServerFinderComponent>;
+  let fixture: ComponentFixture<BundledControllerFinderComponent>;
   let router: any;
   let service: ControllerService;
   let progressService: MockedProgressService = new MockedProgressService();
@@ -31,7 +31,7 @@ describe('BundledServerFinderComponent', () => {
     ]);
 
 
-    // serverService = new MockedServerService();
+    // serverService = new MockedControllerService();
     // spyOn(serverService, 'getLocalServer').and.returnValue(Promise.resolve(server));
 
     await TestBed.configureTestingModule({
@@ -40,11 +40,11 @@ describe('BundledServerFinderComponent', () => {
         { provide: ControllerService, useValue: controllerServiceMock },
         { provide: ProgressService, useValue: progressService },
       ],
-      declarations: [BundledServerFinderComponent],
+      declarations: [BundledControllerFinderComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(BundledServerFinderComponent);
+    fixture = TestBed.createComponent(BundledControllerFinderComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts

@@ -6,11 +6,11 @@ import{ Controller } from '../../models/controller';
 import { ControllerService } from '../../services/controller.service';
 
 @Component({
-  selector: 'app-bundled-server-finder',
+  selector: 'app-bundled-controller-finder',
-  templateUrl: './bundled-server-finder.component.html',
+  templateUrl: './bundled-controller-finder.component.html',
-  styleUrls: ['./bundled-server-finder.component.scss'],
+  styleUrls: ['./bundled-controller-finder.component.scss'],
 })
-export class BundledServerFinderComponent implements OnInit {
+export class BundledControllerFinderComponent implements OnInit {
   constructor(
     private router: Router,
     private serverService: ControllerService,

src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts

@@ -6,7 +6,7 @@ import{ Controller } from '../../../models/controller';
 import { Version } from '../../../models/version';
 import { ControllerDatabase } from '../../../services/controller.database';
 import { ControllerService } from '../../../services/controller.service';
-import { MockedServerService } from '../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../services/controller.service.spec';
 import { VersionService } from '../../../services/version.service';
 import { MockedVersionService } from '../../../services/version.service.spec';
 import { ControllerDiscoveryComponent } from './controller-discovery.component';
@@ -15,10 +15,10 @@ xdescribe('ControllerDiscoveryComponent', () => {
   let component: ControllerDiscoveryComponent;
   let fixture: ComponentFixture<ControllerDiscoveryComponent>;
   let mockedVersionService: MockedVersionService;
-  let mockedServerService: MockedServerService;
+  let mockedServerService: MockedControllerService;
 
   beforeEach(async () => {
-    mockedServerService = new MockedServerService();
+    mockedServerService = new MockedControllerService();
     mockedVersionService = new MockedVersionService();
     await TestBed.configureTestingModule({
       imports: [MatCardModule, MatDividerModule],

src/app/components/controllers/controllers.component.spec.ts

@@ -6,9 +6,9 @@ import { MatMenuModule } from '@angular/material/menu';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { ControllerDatabase } from '../../services/controller.database';
 import { ControllerService } from '../../services/controller.service';
-import { MockedServerService } from 'app/services/controller.service.spec';
+import { MockedControllerService } from 'app/services/controller.service.spec';
 import { ControllersComponent } from './controllers.component';
-import { ControllerManagementService } from 'app/services/server-management.service';
+import { ControllerManagementService } from '../../services/controller-management.service';
 import { ElectronService } from 'ngx-electron';
 import { ChildProcessService } from 'ngx-childprocess';
 import { MatBottomSheet, MatBottomSheetModule } from '@angular/material/bottom-sheet';
@@ -21,7 +21,7 @@ import { MockedRouter } from 'app/common/progress/progress.component.spec';
 describe('ControllersComponent', () => {
   let component: ControllersComponent;
   let fixture: ComponentFixture<ControllersComponent>;
-  let serverMockedService: MockedServerService
+  let serverMockedService: MockedControllerService
   let mockedActivatedRoute: MockedActivatedRoute
   let mockedRouter  : MockedRouter
 

src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts

@@ -6,7 +6,7 @@ import { MatMenuModule } from '@angular/material/menu';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { ImageManagerService } from 'app/services/image-manager.service';
 import { ControllerService } from '../../../services/controller.service';
-import { MockedServerService } from '../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../services/controller.service.spec';
 import { of } from 'rxjs';
 import{ Controller } from '../../../models/controller';
 
@@ -27,7 +27,7 @@ describe('AddImageDialogComponent', () => {
   let component: AddImageDialogComponent;
   let fixture: ComponentFixture<AddImageDialogComponent>;
   
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedImageManagerService = new MockedImageManagerService()
   let mockedToasterService = new MockedToasterService()
 

src/app/components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component.spec.ts

@@ -11,7 +11,7 @@ import{ Server } from 'http';
 import { of } from 'rxjs';
 import { ImageManagerService } from '../../../services/image-manager.service';
 import { ControllerService } from '../../../services/controller.service';
-import { MockedServerService } from '../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../services/controller.service.spec';
 import { ImageManagerComponent } from '../image-manager.component';
 
 import { DeleteAllImageFilesDialogComponent } from './deleteallfiles-dialog.component';
@@ -25,7 +25,7 @@ export class MockedImageManagerService {
  describe('DeleteAllImageFilesDialogComponent', () => {
   let component: DeleteAllImageFilesDialogComponent;
   let fixture: ComponentFixture<DeleteAllImageFilesDialogComponent>;
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedImageManagerService = new MockedImageManagerService()
   let mockedToasterService = new MockedToasterService()
 

src/app/components/image-manager/image-manager.component.spec.ts

@@ -7,7 +7,7 @@ import { MatMenuModule } from '@angular/material/menu';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { ImageManagerService } from 'app/services/image-manager.service';
 import { ControllerService } from 'app/services/controller.service';
-import { MockedServerService } from 'app/services/controller.service.spec';
+import { MockedControllerService } from 'app/services/controller.service.spec';
 import { of } from 'rxjs';
 import{ Controller } from '../../models/controller';
 
@@ -37,7 +37,7 @@ describe('ImageManagerComponent', () => {
   let component: ImageManagerComponent;
   let fixture: ComponentFixture<ImageManagerComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedImageManagerService = new MockedImageManagerService()
   let mockedProgressService = new MockedProgressService()
   let mockedVersionService = new MockedVersionService()

src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts

@@ -15,7 +15,7 @@ import { CloudTemplate } from '../../../../../models/templates/cloud-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ComputeService } from '../../../../../services/compute.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../../services/toaster.service.spec';
@@ -33,7 +33,7 @@ describe('CloudNodesAddTemplateComponent', () => {
   let component: CloudNodesAddTemplateComponent;
   let fixture: ComponentFixture<CloudNodesAddTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let mockedToasterService = new MockedToasterService();
   let mockedComputeService = new MockedComputeService();

src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts

@@ -16,7 +16,7 @@ import { CloudTemplate } from '../../../../../models/templates/cloud-template';
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../../services/toaster.service.spec';
 import { MockedActivatedRoute } from '../../../preferences.component.spec';
@@ -36,7 +36,7 @@ describe('CloudNodesTemplateDetailsComponent', () => {
   let component: CloudNodesTemplateDetailsComponent;
   let fixture: ComponentFixture<CloudNodesTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts

@@ -13,7 +13,7 @@ import{ Controller } from '../../../../../models/controller';
 import { CloudTemplate } from '../../../../../models/templates/cloud-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../../preferences.component.spec';
 import { CloudNodesTemplatesComponent } from './cloud-nodes-templates.component';
 
@@ -27,7 +27,7 @@ describe('CloudNodesTemplatesComponent', () => {
   let component: CloudNodesTemplatesComponent;
   let fixture: ComponentFixture<CloudNodesTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts

@@ -15,7 +15,7 @@ import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hu
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ComputeService } from '../../../../../services/compute.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../../services/toaster.service.spec';
@@ -33,7 +33,7 @@ describe('EthernetHubsAddTemplateComponent', () => {
   let component: EthernetHubsAddTemplateComponent;
   let fixture: ComponentFixture<EthernetHubsAddTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let mockedToasterService = new MockedToasterService();
   let mockedComputeService = new MockedComputeService();

src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts

@@ -16,7 +16,7 @@ import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hu
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../../services/toaster.service.spec';
 import { MockedActivatedRoute } from '../../../preferences.component.spec';
@@ -36,7 +36,7 @@ describe('EthernetHubsTemplateDetailsComponent', () => {
   let component: EthernetHubsTemplateDetailsComponent;
   let fixture: ComponentFixture<EthernetHubsTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts

@@ -13,7 +13,7 @@ import{ Controller } from '../../../../../models/controller';
 import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../../preferences.component.spec';
 import { EthernetHubsTemplatesComponent } from './ethernet-hubs-templates.component';
 
@@ -27,7 +27,7 @@ describe('EthernetHubsTemplatesComponent', () => {
   let component: EthernetHubsTemplatesComponent;
   let fixture: ComponentFixture<EthernetHubsTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts

@@ -15,7 +15,7 @@ import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ComputeService } from '../../../../../services/compute.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../../services/toaster.service.spec';
@@ -33,7 +33,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => {
   let component: EthernetSwitchesAddTemplateComponent;
   let fixture: ComponentFixture<EthernetSwitchesAddTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let mockedToasterService = new MockedToasterService();
   let mockedComputeService = new MockedComputeService();

src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts

@@ -16,7 +16,7 @@ import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../../services/toaster.service.spec';
 import { PortsComponent } from '../../../common/ports/ports.component';
@@ -37,7 +37,7 @@ describe('EthernetSwitchesTemplateDetailsComponent', () => {
   let component: EthernetSwitchesTemplateDetailsComponent;
   let fixture: ComponentFixture<EthernetSwitchesTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts

@@ -13,7 +13,7 @@ import{ Controller } from '../../../../../models/controller';
 import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../../preferences.component.spec';
 import { EthernetSwitchesTemplatesComponent } from './ethernet-switches-templates.component';
 
@@ -27,7 +27,7 @@ describe('EthernetSwitchesTemplatesComponent', () => {
   let component: EthernetSwitchesTemplatesComponent;
   let fixture: ComponentFixture<EthernetSwitchesTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts

@@ -23,7 +23,7 @@ import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { DockerConfigurationService } from '../../../../services/docker-configuration.service';
 import { DockerService } from '../../../../services/docker.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
@@ -41,7 +41,7 @@ xdescribe('AddDockerTemplateComponent', () => {
   let component: AddDockerTemplateComponent;
   let fixture: ComponentFixture<AddDockerTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedDockerService = new MockedDockerService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts

@@ -15,7 +15,7 @@ import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { DockerConfigurationService } from '../../../../services/docker-configuration.service';
 import { DockerService } from '../../../../services/docker.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
@@ -35,7 +35,7 @@ describe('DockerTemplateDetailsComponent', () => {
   let component: DockerTemplateDetailsComponent;
   let fixture: ComponentFixture<DockerTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedDockerService = new MockedDockerService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts

@@ -13,7 +13,7 @@ import{ Controller } from '../../../../models/controller';
 import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { DockerService } from '../../../../services/docker.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { DockerTemplatesComponent } from './docker-templates.component';
 
@@ -27,7 +27,7 @@ describe('DockerTemplatesComponent', () => {
   let component: DockerTemplatesComponent;
   let fixture: ComponentFixture<DockerTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedDockerService = new MockedDockerService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts

@@ -21,7 +21,7 @@ import { IosTemplate } from '../../../../models/templates/ios-template';
 import { IosConfigurationService } from '../../../../services/ios-configuration.service';
 import { IosService } from '../../../../services/ios.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
@@ -39,7 +39,7 @@ xdescribe('AddIosTemplateComponent', () => {
   let component: AddIosTemplateComponent;
   let fixture: ComponentFixture<AddIosTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedIosService = new MockedIosService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts

@@ -12,7 +12,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { ControllerSettingsService } from '../../../../services/controller-settings.service';
 import { MockedControllerSettingsService } from '../../../../services/controller-settings.service.spec';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
@@ -22,7 +22,7 @@ describe('DynamipsPreferencesComponent', () => {
   let component: DynamipsPreferencesComponent;
   let fixture: ComponentFixture<DynamipsPreferencesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let activatedRoute = new MockedActivatedRoute().get();
   let mockedServerSettingsService = new MockedControllerSettingsService();
   let mockedToasterService = new MockedToasterService();

src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts

@@ -15,7 +15,7 @@ import { IosTemplate } from '../../../../models/templates/ios-template';
 import { IosConfigurationService } from '../../../../services/ios-configuration.service';
 import { IosService } from '../../../../services/ios.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
@@ -35,7 +35,7 @@ describe('IosTemplateDetailsComponent', () => {
   let component: IosTemplateDetailsComponent;
   let fixture: ComponentFixture<IosTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedIosService = new MockedIosService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts

@@ -13,7 +13,7 @@ import{ Controller } from '../../../../models/controller';
 import { IosTemplate } from '../../../../models/templates/ios-template';
 import { IosService } from '../../../../services/ios.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { IosTemplatesComponent } from './ios-templates.component';
 
@@ -27,7 +27,7 @@ describe('IosTemplatesComponent', () => {
   let component: IosTemplatesComponent;
   let fixture: ComponentFixture<IosTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedIosService = new MockedIosService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts

@@ -21,7 +21,7 @@ import { IouTemplate } from '../../../../models/templates/iou-template';
 import { IouConfigurationService } from '../../../../services/iou-configuration.service';
 import { IouService } from '../../../../services/iou.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
@@ -39,7 +39,7 @@ xdescribe('AddIouTemplateComponent', () => {
   let component: AddIouTemplateComponent;
   let fixture: ComponentFixture<AddIouTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedIouService = new MockedIouService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts

@@ -15,7 +15,7 @@ import { IouTemplate } from '../../../../models/templates/iou-template';
 import { IouConfigurationService } from '../../../../services/iou-configuration.service';
 import { IouService } from '../../../../services/iou.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
@@ -35,7 +35,7 @@ describe('IouTemplateDetailsComponent', () => {
   let component: IouTemplateDetailsComponent;
   let fixture: ComponentFixture<IouTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedIouService = new MockedIouService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts

@@ -13,7 +13,7 @@ import{ Controller } from '../../../../models/controller';
 import { IouTemplate } from '../../../../models/templates/iou-template';
 import { IouService } from '../../../../services/iou.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { IouTemplatesComponent } from './iou-templates.component';
 
@@ -27,7 +27,7 @@ describe('IouTemplatesComponent', () => {
   let component: IouTemplatesComponent;
   let fixture: ComponentFixture<IouTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedIouService = new MockedIouService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts

@@ -20,7 +20,7 @@ import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { QemuConfigurationService } from '../../../../services/qemu-configuration.service';
 import { QemuService } from '../../../../services/qemu.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
@@ -46,7 +46,7 @@ xdescribe('AddQemuVmTemplateComponent', () => {
   let component: AddQemuVmTemplateComponent;
   let fixture: ComponentFixture<AddQemuVmTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedQemuService = new MockedQemuService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts

@@ -13,7 +13,7 @@ import { of } from 'rxjs';
 import { ControllerSettingsService } from '../../../../services/controller-settings.service';
 import { MockedControllerSettingsService } from '../../../../services/controller-settings.service.spec';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
@@ -23,7 +23,7 @@ describe('QemuPreferencesComponent', () => {
   let component: QemuPreferencesComponent;
   let fixture: ComponentFixture<QemuPreferencesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let activatedRoute = new MockedActivatedRoute().get();
   let mockedServerSettingsService = new MockedControllerSettingsService();
   let mockedToasterService = new MockedToasterService();

src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts

@@ -16,7 +16,7 @@ import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { QemuConfigurationService } from '../../../../services/qemu-configuration.service';
 import { QemuService } from '../../../../services/qemu.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
@@ -44,7 +44,7 @@ describe('QemuVmTemplateDetailsComponent', () => {
   let component: QemuVmTemplateDetailsComponent;
   let fixture: ComponentFixture<QemuVmTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedQemuService = new MockedQemuService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts

@@ -13,7 +13,7 @@ import{ Controller } from '../../../../models/controller';
 import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { QemuService } from '../../../../services/qemu.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { QemuVmTemplatesComponent } from './qemu-vm-templates.component';
 
@@ -27,7 +27,7 @@ describe('QemuTemplatesComponent', () => {
   let component: QemuVmTemplatesComponent;
   let fixture: ComponentFixture<QemuVmTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedQemuService = new MockedQemuService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts

@@ -13,7 +13,7 @@ import { of } from 'rxjs';
 import{ Controller } from '../../../../models/controller';
 import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
@@ -35,7 +35,7 @@ describe('AddVirtualBoxTemplateComponent', () => {
   let component: AddVirtualBoxTemplateComponent;
   let fixture: ComponentFixture<AddVirtualBoxTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedVirtualBoxService = new MockedVirtualBoxService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts

@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { VirtualBoxPreferencesComponent } from './virtual-box-preferences.component';
 
@@ -17,7 +17,7 @@ describe('VirtualBoxPreferencesComponent', () => {
   let component: VirtualBoxPreferencesComponent;
   let fixture: ComponentFixture<VirtualBoxPreferencesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let activatedRoute = new MockedActivatedRoute().get();
 
   beforeEach(async() => {

src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts

@@ -14,7 +14,7 @@ import { of } from 'rxjs';
 import{ Controller } from '../../../../models/controller';
 import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
 import { VirtualBoxConfigurationService } from '../../../../services/virtual-box-configuration.service';
@@ -36,7 +36,7 @@ describe('VirtualBoxTemplateDetailsComponent', () => {
   let component: VirtualBoxTemplateDetailsComponent;
   let fixture: ComponentFixture<VirtualBoxTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedVirtualBoxService = new MockedVirtualBoxService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts

@@ -12,7 +12,7 @@ import { of } from 'rxjs';
 import{ Controller } from '../../../../models/controller';
 import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { VirtualBoxService } from '../../../../services/virtual-box.service';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { VirtualBoxTemplatesComponent } from './virtual-box-templates.component';
@@ -27,7 +27,7 @@ describe('VirtualBoxTemplatesComponent', () => {
   let component: VirtualBoxTemplatesComponent;
   let fixture: ComponentFixture<VirtualBoxTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedVirtualBoxService = new MockedVirtualBoxService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts

@@ -14,7 +14,7 @@ import{ Controller } from '../../../../models/controller';
 import { VmwareTemplate } from '../../../../models/templates/vmware-template';
 import { VmwareVm } from '../../../../models/vmware/vmware-vm';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
@@ -36,7 +36,7 @@ describe('AddVmwareTemplateComponent', () => {
   let component: AddVmwareTemplateComponent;
   let fixture: ComponentFixture<AddVmwareTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedVmwareService = new MockedVmwareService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts

@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { VmwarePreferencesComponent } from './vmware-preferences.component';
 
@@ -17,7 +17,7 @@ describe('VmwarePreferencesComponent', () => {
   let component: VmwarePreferencesComponent;
   let fixture: ComponentFixture<VmwarePreferencesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let activatedRoute = new MockedActivatedRoute().get();
 
   beforeEach(async() => {

src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts

@@ -14,7 +14,7 @@ import { of } from 'rxjs';
 import{ Controller } from '../../../../models/controller';
 import { VmwareTemplate } from '../../../../models/templates/vmware-template';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
 import { VmwareConfigurationService } from '../../../../services/vmware-configuration.service';
@@ -36,7 +36,7 @@ describe('VmwareTemplateDetailsComponent', () => {
   let component: VmwareTemplateDetailsComponent;
   let fixture: ComponentFixture<VmwareTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedVmwareService = new MockedVmwareService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts

@@ -12,7 +12,7 @@ import { of } from 'rxjs';
 import{ Controller } from '../../../../models/controller';
 import { VmwareTemplate } from '../../../../models/templates/vmware-template';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { VmwareService } from '../../../../services/vmware.service';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { VmwareTemplatesComponent } from './vmware-templates.component';
@@ -27,7 +27,7 @@ describe('VmwareTemplatesComponent', () => {
   let component: VmwareTemplatesComponent;
   let fixture: ComponentFixture<VmwareTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedVmwareService = new MockedVmwareService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts

@@ -14,7 +14,7 @@ import{ Controller } from '../../../../models/controller';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ComputeService } from '../../../../services/compute.service';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { TemplateMocksService } from '../../../../services/template-mocks.service';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
@@ -38,7 +38,7 @@ describe('AddVpcsTemplateComponent', () => {
   let component: AddVpcsTemplateComponent;
   let fixture: ComponentFixture<AddVpcsTemplateComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedVpcsService = new MockedVpcsService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts

@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { VpcsPreferencesComponent } from './vpcs-preferences.component';
 
@@ -17,7 +17,7 @@ describe('VpcsPreferencesComponent', () => {
   let component: VpcsPreferencesComponent;
   let fixture: ComponentFixture<VpcsPreferencesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let activatedRoute = new MockedActivatedRoute().get();
 
   beforeEach(async() => {

src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts

@@ -13,7 +13,7 @@ import { of } from 'rxjs';
 import{ Controller } from '../../../../models/controller';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../services/toaster.service.spec';
 import { VpcsConfigurationService } from '../../../../services/vpcs-configuration.service';
@@ -35,7 +35,7 @@ describe('VpcsTemplateDetailsComponent', () => {
   let component: VpcsTemplateDetailsComponent;
   let fixture: ComponentFixture<VpcsTemplateDetailsComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedVpcsService = new MockedVpcsService();
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();

src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts

@@ -12,7 +12,7 @@ import { of } from 'rxjs';
 import{ Controller } from '../../../../models/controller';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ControllerService } from '../../../../services/controller.service';
-import { MockedServerService } from '../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../services/controller.service.spec';
 import { VpcsService } from '../../../../services/vpcs.service';
 import { MockedActivatedRoute } from '../../preferences.component.spec';
 import { VpcsTemplatesComponent } from './vpcs-templates.component';
@@ -27,7 +27,7 @@ describe('VpcsTemplatesComponent', () => {
   let component: VpcsTemplatesComponent;
   let fixture: ComponentFixture<VpcsTemplatesComponent>;
 
-  let mockedServerService = new MockedServerService();
+  let mockedServerService = new MockedControllerService();
   let mockedVpcsService = new MockedVpcsService();
   let activatedRoute = new MockedActivatedRoute().get();
 

src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts

@@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node';
 import{ Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ControllerService } from '../../../../../services/controller.service';
-import { MockedServerService } from '../../../../../services/controller.service.spec';
+import { MockedControllerService } from '../../../../../services/controller.service.spec';
 import { SettingsService } from '../../../../../services/settings.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { MockedToasterService } from '../../../../../services/toaster.service.spec';
@@ -18,7 +18,7 @@ describe('ConsoleDeviceActionComponent', () => {
   let electronService;
   let controller:Controller ;
   let settingsService: SettingsService;
-  let mockedServerService: MockedServerService;
+  let mockedServerService: MockedControllerService;
   let mockedToaster: MockedToasterService;
   let mockedNodeService: MockedNodeService = new MockedNodeService();
 
@@ -34,7 +34,7 @@ describe('ConsoleDeviceActionComponent', () => {
       },
     };
 
-    mockedServerService = new MockedServerService();
+    mockedServerService = new MockedControllerService();
     mockedToaster = new MockedToasterService();
 
     controller = { host: 'localhost', port: 222 } as Controller ;

src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.spec.ts

@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MockedNodeService } from 'app/components/project-map/project-map.component.spec';
-import { HttpServer } from 'app/services/http-server.service';
+import { HttpController } from 'app/services/http-controller.service';
 import { NodeService } from 'app/services/node.service';
 import { ToasterService } from 'app/services/toaster.service';
 import { MockedToasterService } from 'app/services/toaster.service.spec';
@@ -19,7 +19,7 @@ describe('StartNodeActionComponent', () => {
       imports:[MatProgressSpinnerModule ],
       providers: [
         { provide: NodeService, useValue: mockedNodeService },
-        { provide: HttpServer, useValue: {} },
+        { provide: HttpController, useValue: {} },
         { provide: ToasterService, useValue: mockedToasterService },
       ],
     }).compileComponents();

src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.spec.ts

@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockedNodeService } from 'app/components/project-map/project-map.component.spec';
-import { HttpServer } from 'app/services/http-server.service';
+import { HttpController } from 'app/services/http-controller.service';
 import { NodeService } from 'app/services/node.service';
 import { StopNodeActionComponent } from './stop-node-action.component';
 

src/app/components/project-map/log-console/log-console.component.spec.ts

@@ -10,7 +10,7 @@ import { of } from 'rxjs';
 import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource';
 import { ProjectWebServiceHandler, WebServiceMessage } from '../../../handlers/project-web-service-handler';
 import{ Controller } from '../../../models/controller';
-import { HttpServer, ServerErrorHandler } from '../../../services/http-server.service';
+import { HttpController, ControllerErrorHandler } from '../../../services/http-controller.service';
 import { NodeService } from '../../../services/node.service';
 import { NodeConsoleService } from '../../../services/nodeConsole.service';
 import { MockedNodesDataSource, MockedNodeService } from '../project-map.component.spec';
@@ -39,7 +39,7 @@ describe('LogConsoleComponent', () => {
   let mapSettingsService: MapSettingsService;
   let toasterService: ToasterService;
 
-  let httpServer = new HttpServer({} as HttpClient, {} as ServerErrorHandler);
+  let httpServer = new HttpController({} as HttpClient, {} as ControllerErrorHandler);
 
   beforeEach(async() => {
    await TestBed.configureTestingModule({
@@ -49,7 +49,7 @@ describe('LogConsoleComponent', () => {
         { provide: NodeService, useValue: mockedNodeService },
         { provide: NodesDataSource, useValue: mockedNodesDataSource },
         { provide: LogEventsDataSource, useClass: LogEventsDataSource },
-        { provide: HttpServer, useValue: httpServer },
+        { provide: HttpController, useValue: httpServer },
         NodeConsoleService,
         ToasterService,
         MapSettingsService

src/app/components/project-map/log-console/log-console.component.ts

@@ -20,7 +20,7 @@ import { LogEvent } from '../../../models/logEvent';
 import { Port } from '../../../models/port';
 import { Project } from '../../../models/project';
 import{ Controller } from '../../../models/controller';
-import { HttpServer } from '../../../services/http-server.service';
+import { HttpController } from '../../../services/http-controller.service';
 import { NodeService } from '../../../services/node.service';
 import { NodeConsoleService } from '../../../services/nodeConsole.service';
 import { ThemeService } from '../../../services/theme.service';
@@ -70,7 +70,7 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy {
     private nodeService: NodeService,
     private nodesDataSource: NodesDataSource,
     private logEventsDataSource: LogEventsDataSource,
-    private httpService: HttpServer,
+    private httpService: HttpController,
     private themeService: ThemeService,
     private cd: ChangeDetectorRef,
     private nodeConsoleService: NodeConsoleService,

src/app/components/project-map/project-map.component.spec.ts

@@ -57,7 +57,7 @@ import { ProjectService } from '../../services/project.service';
 import { MockedProjectService } from '../../services/project.service.spec';
 import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service';
 import { ControllerService } from '../../services/controller.service';
-import { MockedServerService } from '../../services/controller.service.spec';
+import { MockedControllerService } from '../../services/controller.service.spec';
 import { SettingsService } from '../../services/settings.service';
 import { ToasterService } from '../../services/toaster.service';
 import { MockedToasterService } from '../../services/toaster.service.spec';
@@ -276,7 +276,7 @@ xdescribe('ProjectMapComponent', () => {
       ],
       providers: [
         { provide: ActivatedRoute },
-        { provide: ControllerService, useClass: MockedServerService },
+        { provide: ControllerService, useClass: MockedControllerService },
         { provide: ProjectService, useClass: MockedProjectService },
         { provide: NodeService },
         { provide: LinkService },

src/app/components/projects/projects.component.spec.ts

@@ -21,7 +21,7 @@ import{ Controller } from '../../models/controller';
 import { ProjectService } from '../../services/project.service';
 import { MockedProjectService } from '../../services/project.service.spec';
 import { ControllerService } from '../../services/controller.service';
-import { MockedServerService } from '../../services/controller.service.spec';
+import { MockedControllerService } from '../../services/controller.service.spec';
 import { Settings, SettingsService } from '../../services/settings.service';
 import { ToasterService } from '../../services/toaster.service';
 import { ChooseNameDialogComponent } from './choose-name-dialog/choose-name-dialog.component';
@@ -66,7 +66,7 @@ xdescribe('ProjectsComponent', () => {
         RouterTestingModule.withRoutes([]),
       ],
       providers: [
-        { provide: ControllerService, useClass: MockedServerService },
+        { provide: ControllerService, useClass: MockedControllerService },
         { provide: ProjectService, useValue: mockedProjectService },
         { provide: SettingsService },
         { provide: ToasterService },

src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.spec.ts

@@ -5,7 +5,7 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { Context } from 'app/cartography/models/context';
 import { ProgressDialogService } from 'app/common/progress-dialog/progress-dialog.service';
-import { HttpServer, ServerErrorHandler } from 'app/services/http-server.service';
+import { HttpController, ControllerErrorHandler } from 'app/services/http-controller.service';
 import { SnapshotService } from 'app/services/snapshot.service';
 import { ToasterService } from 'app/services/toaster.service';
 import { SnapshotMenuItemComponent } from './snapshot-menu-item.component';
@@ -21,11 +21,11 @@ describe('SnapshotMenuItemComponent', () => {
       providers: [
         SnapshotService,
         MatDialog,
-        HttpServer,
+        HttpController,
         Overlay,
         ScrollStrategyOptions,
         HttpClient,
-        ServerErrorHandler,
+        ControllerErrorHandler,
         ProgressDialogService,
         Context,
         ToasterService

src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts

@@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { RouterTestingModule } from '@angular/router/testing';
-import { HttpServer } from 'app/services/http-server.service';
+import { HttpController } from '../../../services/http-controller.service';
-import { MockedServerService } from 'app/services/controller.service.spec';
+import { MockedControllerService } from 'app/services/controller.service.spec';
 import { TemplateMocksService } from 'app/services/template-mocks.service';
 import { TemplateService } from 'app/services/template.service';
 import { ToasterService } from 'app/services/toaster.service';
@@ -28,7 +28,7 @@ describe('TemplateListDialogComponent', () => {
         { provide: MatDialogRef, useValue: {} },
         { provide: MAT_DIALOG_DATA, useValue: {} },
         { provide: NonNegativeValidator, useValue: {} },
-        HttpServer,
+        HttpController,
         HttpClient
       ]
     }).compileComponents();

src/app/components/template/template.component.spec.ts

@@ -5,7 +5,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { MatMenuModule } from '@angular/material/menu';
 import { Context } from 'app/cartography/models/context';
-import { HttpServer, ServerErrorHandler } from 'app/services/http-server.service';
+import { HttpController, ControllerErrorHandler } from 'app/services/http-controller.service';
 import { MapScaleService } from 'app/services/mapScale.service';
 import { SymbolService } from 'app/services/symbol.service';
 import { TemplateService } from 'app/services/template.service';
@@ -24,11 +24,11 @@ describe('TemplateComponent', () => {
         MatDialog,
         Overlay,
         TemplateService,
-        HttpServer,
+        HttpController,
         MapScaleService,
         HttpClient,
         HttpHandler,
-        ServerErrorHandler,
+        ControllerErrorHandler,
         Context, 
         { provide: SymbolService, useClass: mockedSymbolService },
       ],

src/app/filters/authImageFilter.ts

@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { Console } from 'console';
 import{ Controller } from '../models/controller';
-import { HttpServer } from '../services/http-server.service';
+import { HttpController } from '../services/http-controller.service';
 import { DomSanitizer } from '@angular/platform-browser';
 import { environment } from 'environments/environment';
 
@@ -11,7 +11,7 @@ import { environment } from 'environments/environment';
 export class AuthImageFilter implements PipeTransform {
 
     constructor(
-        private httpServer: HttpServer,
+        private httpServer: HttpController,
         private domSanitizer: DomSanitizer
     ) { }
 

src/app/layouts/default-layout/default-layout.component.spec.ts

@@ -10,11 +10,11 @@ import { Subject } from 'rxjs';
 import { ProgressComponent } from '../../common/progress/progress.component';
 import { ProgressService } from '../../common/progress/progress.service';
 import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service';
-import { ControllerManagementService, ServerStateEvent } from '../../services/controller-management.service';
+import { ControllerManagementService, ControllerStateEvent } from '../../services/controller-management.service';
 import { ToasterService } from '../../services/toaster.service';
 import { MockedToasterService } from '../../services/toaster.service.spec';
 import { DefaultLayoutComponent } from './default-layout.component';
-import { HttpServer, ServerErrorHandler } from '../../services/http-server.service';
+import { HttpController, ControllerErrorHandler } from '../../services/http-controller.service';
 import { HttpClientModule } from '@angular/common/http';
 
 class ElectronServiceMock {
@@ -22,7 +22,7 @@ class ElectronServiceMock {
 }
 
 class MockedServerManagementService {
-  public serverStatusChanged;
+  public controllerStatusChanged;
   public stopAll() {}
 }
 
@@ -32,12 +32,12 @@ describe('DefaultLayoutComponent', () => {
   let electronServiceMock: ElectronServiceMock;
   let serverManagementService = new MockedServerManagementService();
   let serverService: ControllerService;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
-  let errorHandler: ServerErrorHandler;
+  let errorHandler: ControllerErrorHandler;
 
   beforeEach(async() => {
     electronServiceMock = new ElectronServiceMock();
-    serverManagementService.controllerStatusChanged = new Subject<ServerStateEvent>();
+    serverManagementService.controllerStatusChanged = new Subject<ControllerStateEvent>();
 
     await TestBed.configureTestingModule({
       declarations: [DefaultLayoutComponent, ProgressComponent],
@@ -60,14 +60,14 @@ describe('DefaultLayoutComponent', () => {
           useClass: RecentlyOpenedProjectService,
         },
         { provide: ControllerService },
-        { provide: HttpServer },
+        { provide: HttpController },
-        { provide: ServerErrorHandler },
+        { provide: ControllerErrorHandler },
         ProgressService,
       ],
     }).compileComponents();
 
-    errorHandler = TestBed.inject(ServerErrorHandler);
+    errorHandler = TestBed.inject(ControllerErrorHandler);
-    httpServer = TestBed.inject(HttpServer);
+    httpServer = TestBed.inject(HttpController);
     serverService = TestBed.inject(ControllerService);
   });
 

src/app/services/appliances.service.ts

@@ -3,11 +3,11 @@ import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { Appliance } from '../models/appliance';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class ApplianceService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getAppliances(controller:Controller ): Observable<Appliance[]> {
     return this.httpServer.get<Appliance[]>(controller, '/appliances') as Observable<Appliance[]>;

src/app/services/built-in-templates.service.spec.ts

@@ -7,24 +7,24 @@ import { CloudTemplate } from '../models/templates/cloud-template';
 import { EthernetHubTemplate } from '../models/templates/ethernet-hub-template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { BuiltInTemplatesService } from './built-in-templates.service';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { getTestServer } from './testing';
 
 describe('BuiltInTemplatesService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, BuiltInTemplatesService],
+      providers: [HttpController, BuiltInTemplatesService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     controller = getTestServer();
   });
 

src/app/services/built-in-templates.service.ts

@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class BuiltInTemplatesService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getTemplates(controller:Controller ): Observable<any[]> {
     return this.httpServer.get<any[]>(controller, '/templates') as Observable<any[]>;

src/app/services/compute.service.ts

@@ -4,11 +4,11 @@ import { Observable } from 'rxjs';
 import { Compute } from '../models/compute';
 import { ComputeStatistics } from '../models/computeStatistics';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class ComputeService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getComputes(controller:Controller ): Observable<Compute[]> {
     return this.httpServer.get<Compute[]>(controller, '/computes') as Observable<Compute[]>;

src/app/services/controller-settings.service.spec.ts

@@ -4,7 +4,7 @@ import { of } from 'rxjs';
 import{ Controller } from '../models/controller';
 import { QemuSettings } from '../models/settings/qemu-settings';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { ControllerSettingsService } from './controller-settings.service';
 
 export class MockedControllerSettingsService {
@@ -18,15 +18,15 @@ export class MockedControllerSettingsService {
 }
 
 describe('ControllerSettingsService', () => {
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, ControllerSettingsService],
+      providers: [HttpController, ControllerSettingsService],
     });
 
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
   });
 
   it('should be created', inject([ControllerSettingsService], (service: ControllerSettingsService) => {

src/app/services/controller-settings.service.ts

@@ -2,11 +2,11 @@ import { Injectable } from '@angular/core';
 import{ Controller } from '../models/controller';
 import { ServerSettings } from '../models/serverSettings';
 import { QemuSettings } from '../models/settings/qemu-settings';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class ControllerSettingsService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   get(controller:Controller ) {
     return this.httpServer.get<ServerSettings>(controller, `/settings`);

src/app/services/controller.service.spec.ts

@@ -1,6 +1,6 @@
 import{ Controller } from '../models/controller';
 
-export class MockedServerService {
+export class MockedControllerService {
   public servers:Controller [] = [];
 
   public create(controller:Controller ) {

src/app/services/controller.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import {Controller , ServerProtocol } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class ControllerService {
@@ -9,7 +9,7 @@ export class ControllerService {
   public serviceInitialized: Subject<boolean> = new Subject<boolean>();
   public isServiceInitialized: boolean;
 
-  constructor(private httpServer: HttpServer) {
+  constructor(private httpServer: HttpController) {
     this.controllerIds = this.getcontrollerIds();
     this.isServiceInitialized = true;
     this.serviceInitialized.next(this.isServiceInitialized);

src/app/services/docker.service.ts

@@ -4,11 +4,11 @@ import { Observable } from 'rxjs';
 import { DockerImage } from '../models/docker/docker-image';
 import{ Controller } from '../models/controller';
 import { DockerTemplate } from '../models/templates/docker-template';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class DockerService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getTemplates(controller:Controller ): Observable<DockerTemplate[]> {
     return this.httpServer.get<DockerTemplate[]>(controller, '/templates') as Observable<DockerTemplate[]>;

src/app/services/drawing.service.spec.ts

@@ -8,25 +8,25 @@ import { Project } from '../models/project';
 import{ Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { DrawingService } from './drawing.service';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { getTestServer } from './testing';
 
 describe('DrawingService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let controller:Controller ;
   let project: Project = new Project();
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, SvgToDrawingConverter, DrawingService],
+      providers: [HttpController, SvgToDrawingConverter, DrawingService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     controller = getTestServer();
   });
 

src/app/services/drawing.service.ts

@@ -5,11 +5,11 @@ import { SvgToDrawingConverter } from '../cartography/helpers/svg-to-drawing-con
 import { Drawing } from '../cartography/models/drawing';
 import { Project } from '../models/project';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class DrawingService {
-  constructor(private httpServer: HttpServer, private svgToDrawingConverter: SvgToDrawingConverter) {}
+  constructor(private httpServer: HttpController, private svgToDrawingConverter: SvgToDrawingConverter) {}
 
   add(controller:Controller , project_id: string, x: number, y: number, svg: string) {
     return this.httpServer.post<Drawing>(controller, `/projects/${project_id}/drawings`, {

src/app/services/http-controller.service.spec.ts

@@ -4,36 +4,36 @@ import { TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
 import{ Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer, ServerError, ServerErrorHandler } from './http-server.service';
+import { HttpController, ControllerError, ControllerErrorHandler } from './http-controller.service';
 import { getTestServer } from './testing';
 
 class MyType {
   id: number;
 }
 
-describe('ServerError', () => {
+describe('ControllerError', () => {
   it('should construct with message', () => {
     const error = new Error('test');
     expect(error.message).toEqual('test');
   });
 
-  it('should construct ServerError from error', () => {
+  it('should construct ControllerError from error', () => {
     const error = new Error('test');
-    const serverError = ServerError.fromError('new message', error);
+    const controllerError = ControllerError.fromError('new message', error);
-    expect(serverError.originalError).toEqual(error);
+    expect(controllerError.originalError).toEqual(error);
-    expect(serverError.message).toEqual('new message');
+    expect(controllerError.message).toEqual('new message');
   });
 });
 
-describe('ServerErrorHandler', () => {
+describe('ControllerErrorHandler', () => {
   it('should handle HttpErrorResponse with status 0', (done) => {
     const error = new HttpErrorResponse({ status: 0 });
 
-    const handler = new ServerErrorHandler();
+    const handler = new ControllerErrorHandler();
     const result = handler.handleError(error);
 
     result.subscribe(null, (err) => {
-      expect(err.message).toEqual('Server is unreachable');
+      expect(err.message).toEqual('Controller is unreachable');
       done();
     });
   });
@@ -41,7 +41,7 @@ describe('ServerErrorHandler', () => {
   it('should not handle HttpErrorResponse with status!=0', (done) => {
     const error = new HttpErrorResponse({ status: 499 });
 
-    const handler = new ServerErrorHandler();
+    const handler = new ControllerErrorHandler();
     const result = handler.handleError(error);
 
     result.subscribe(null, (err) => {
@@ -51,21 +51,21 @@ describe('ServerErrorHandler', () => {
   });
 });
 
-describe('HttpServer', () => {
+describe('HttpController', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let service: HttpServer;
+  let service: HttpController;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer],
+      providers: [HttpController],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    service = TestBed.get(HttpServer);
+    service = TestBed.get(HttpController);
 
     controller = getTestServer();
   });

src/app/services/http-controller.service.ts

@@ -66,7 +66,7 @@ export type HeadersOptions = {
 };
 /* tslint:enable:interface-over-type-literal */
 
-export class ServerError extends Error {
+export class ControllerError extends Error {
   public originalError: Error;
 
   constructor(message: string) {
@@ -74,19 +74,19 @@ export class ServerError extends Error {
   }
 
   static fromError(message: string, originalError: Error) {
-    const serverError = new ServerError(message);
+    const controllerError = new ControllerError(message);
-    serverError.originalError = originalError;
+    controllerError.originalError = originalError;
-    return serverError;
+    return controllerError;
   }
 }
 
 @Injectable()
-export class ServerErrorHandler {
+export class ControllerErrorHandler {
   handleError(error: HttpErrorResponse) {
     let err: Error = error;
 
     if (error.name === 'HttpErrorResponse' && error.status === 0) {
-      err = ServerError.fromError('Server is unreachable', error);
+      err = ControllerError.fromError('Controller is unreachable', error);
     }
 
     if (error.status === 401) {
@@ -98,14 +98,14 @@ export class ServerErrorHandler {
 }
 
 @Injectable()
-export class HttpServer {
+export class HttpController {
   public requestsNotificationEmitter = new EventEmitter<string>();
 
-  constructor(private http: HttpClient, private errorHandler: ServerErrorHandler) {}
+  constructor(private http: HttpClient, private errorHandler: ControllerErrorHandler) {}
 
   get<T>(controller:Controller , url: string, options?: JsonOptions): Observable<T> {
     options = this.getJsonOptions(options);
-    const intercepted = this.getOptionsForServer<JsonOptions>(controller, url, options);
+    const intercepted = this.getOptionsForController<JsonOptions>(controller, url, options);
     this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`);
 
     return this.http
@@ -115,7 +115,7 @@ export class HttpServer {
 
   getText(controller:Controller , url: string, options?: TextOptions): Observable<string> {
     options = this.getTextOptions(options);
-    const intercepted = this.getOptionsForServer<TextOptions>(controller, url, options);
+    const intercepted = this.getOptionsForController<TextOptions>(controller, url, options);
     this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`);
 
     return this.http
@@ -125,7 +125,7 @@ export class HttpServer {
 
   getBlob(controller:Controller , url: string, options?: BlobOptions): Observable<Blob> {
     options = this.getBlobOptions(options);
-    const intercepted = this.getOptionsForServer<BlobOptions>(controller, url, options);
+    const intercepted = this.getOptionsForController<BlobOptions>(controller, url, options);
     this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`);
 
     return this.http
@@ -135,7 +135,7 @@ export class HttpServer {
 
   post<T>(controller:Controller , url: string, body: any | null, options?: JsonOptions): Observable<T> {
     options = this.getJsonOptions(options);
-    const intercepted = this.getOptionsForServer(controller, url, options);
+    const intercepted = this.getOptionsForController(controller, url, options);
     this.requestsNotificationEmitter.emit(`POST ${intercepted.url}`);
 
     return this.http
@@ -145,7 +145,7 @@ export class HttpServer {
 
   put<T>(controller:Controller , url: string, body: any, options?: JsonOptions): Observable<T> {
     options = this.getJsonOptions(options);
-    const intercepted = this.getOptionsForServer(controller, url, options);
+    const intercepted = this.getOptionsForController(controller, url, options);
     this.requestsNotificationEmitter.emit(`PUT ${intercepted.url}`);
 
     return this.http
@@ -155,7 +155,7 @@ export class HttpServer {
 
   delete<T>(controller:Controller , url: string, options?: JsonOptions): Observable<T> {
     options = this.getJsonOptions(options);
-    const intercepted = this.getOptionsForServer(controller, url, options);
+    const intercepted = this.getOptionsForController(controller, url, options);
     this.requestsNotificationEmitter.emit(`DELETE ${intercepted.url}`);
 
     return this.http
@@ -165,7 +165,7 @@ export class HttpServer {
 
   patch<T>(controller:Controller , url: string, body: any, options?: JsonOptions): Observable<T> {
     options = this.getJsonOptions(options);
-    const intercepted = this.getOptionsForServer(controller, url, options);
+    const intercepted = this.getOptionsForController(controller, url, options);
     return this.http
       .patch<T>(intercepted.url, body, intercepted.options)
       .pipe(catchError<T, any>(this.errorHandler.handleError)) as Observable<T>;
@@ -173,7 +173,7 @@ export class HttpServer {
 
   head<T>(controller:Controller , url: string, options?: JsonOptions): Observable<T> {
     options = this.getJsonOptions(options);
-    const intercepted = this.getOptionsForServer(controller, url, options);
+    const intercepted = this.getOptionsForController(controller, url, options);
     return this.http
       .head<T>(intercepted.url, intercepted.options)
       .pipe(catchError<T, any>(this.errorHandler.handleError)) as Observable<T>;
@@ -181,7 +181,7 @@ export class HttpServer {
 
   options<T>(controller:Controller , url: string, options?: JsonOptions): Observable<T> {
     options = this.getJsonOptions(options);
-    const intercepted = this.getOptionsForServer(controller, url, options);
+    const intercepted = this.getOptionsForController(controller, url, options);
     return this.http
       .options<T>(intercepted.url, intercepted.options)
       .pipe(catchError<T, any>(this.errorHandler.handleError)) as Observable<T>;
@@ -214,7 +214,7 @@ export class HttpServer {
     return options;
   }
 
-  private getOptionsForServer<T extends HeadersOptions>(controller:Controller , url: string, options: T) {
+  private getOptionsForController<T extends HeadersOptions>(controller:Controller , url: string, options: T) {
     if (controller && controller.host && controller.port) {
       if (!controller.protocol) {
         controller.protocol = location.protocol as ServerProtocol;

src/app/services/image-manager.service.spec.ts

@@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { inject, TestBed } from '@angular/core/testing';
 import { AppTestingModule } from 'app/testing/app-testing/app-testing.module';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { getTestServer } from './testing';
 
 import { ImageManagerService } from './image-manager.service';
@@ -13,18 +13,18 @@ import { environment } from 'environments/environment';
 describe('ImageManagerService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, ImageManagerService],
+      providers: [HttpController, ImageManagerService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     controller = getTestServer();
     // service = TestBed.inject(ImageManagerService);
   });

src/app/services/image-manager.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { Observable } from 'rxjs';
 import { Image } from "../models/images";
 import { environment } from 'environments/environment';
@@ -10,7 +10,7 @@ import { environment } from 'environments/environment';
 })
 export class ImageManagerService {
 
-  constructor(private httpServer: HttpServer) { }
+  constructor(private httpServer: HttpController) { }
 
   getImages(controller:Controller ) {
     return this.httpServer.get<Image[]>(controller, '/images') as Observable<Image[]>;

src/app/services/ios.service.ts

@@ -4,11 +4,11 @@ import { Observable } from 'rxjs';
 import { IosImage } from '../models/images/ios-image';
 import{ Controller } from '../models/controller';
 import { IosTemplate } from '../models/templates/ios-template';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class IosService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getImages(controller:Controller ): Observable<any> {
     return this.httpServer.get<IosImage[]>(controller, '/images?image_type=ios') as Observable<IosImage[]>;

src/app/services/iou.service.ts

@@ -4,11 +4,11 @@ import { Observable } from 'rxjs';
 import { IouImage } from '../models/iou/iou-image';
 import{ Controller } from '../models/controller';
 import { IouTemplate } from '../models/templates/iou-template';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class IouService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getTemplates(controller:Controller ): Observable<IouTemplate[]> {
     return this.httpServer.get<IouTemplate[]>(controller, '/templates') as Observable<IouTemplate[]>;

src/app/services/link.service.spec.ts

@@ -6,25 +6,25 @@ import { Node } from '../cartography/models/node';
 import { Port } from '../models/port';
 import{ Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { LinkService } from './link.service';
 import { getTestServer } from './testing';
 
 describe('LinkService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, LinkService],
+      providers: [HttpController, LinkService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     controller = getTestServer();
   });
 

src/app/services/link.service.ts

@@ -7,11 +7,11 @@ import { Link } from '../models/link';
 import { LinkNode } from '../models/link-node';
 import { Port } from '../models/port';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class LinkService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   createLink(
     controller:Controller ,

src/app/services/login.service.ts

@@ -2,13 +2,13 @@ import { HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import 'rxjs/add/operator/map';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { AuthResponse } from '../models/authResponse';
 
 @Injectable()
 export class LoginService {
   controller_id:string =''
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   login(controller:Controller , username: string, password: string) {
     const payload = new HttpParams()

src/app/services/node.service.spec.ts

@@ -8,14 +8,14 @@ import { Project } from '../models/project';
 import{ Controller } from '../models/controller';
 import { Template } from '../models/template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { NodeService } from './node.service';
 import { getTestServer } from './testing';
 
 describe('NodeService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let service: NodeService;
   let controller:Controller ;
 
@@ -23,14 +23,14 @@ describe('NodeService', () => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
       providers: [
-        HttpServer,
+        HttpController,
         NodeService,
       ],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     service = TestBed.get(NodeService);
     controller = getTestServer();
   });

src/app/services/node.service.ts

@@ -6,11 +6,11 @@ import { Node } from '../cartography/models/node';
 import { Project } from '../models/project';
 import{ Controller } from '../models/controller';
 import { Template } from '../models/template';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class NodeService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getNodeById(controller:Controller , projectId: string, nodeId: string) {
     return this.httpServer.get(controller, `/projects/${projectId}/nodes/${nodeId}`);

src/app/services/project.service.spec.ts

@@ -6,7 +6,7 @@ import { of } from 'rxjs';
 import { Project } from '../models/project';
 import{ Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { ProjectService } from './project.service';
 import { RecentlyOpenedProjectService } from './recentlyOpenedProject.service';
 import { SettingsService } from './settings.service';
@@ -63,7 +63,7 @@ export class MockedProjectService {
 describe('ProjectService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let service: ProjectService;
   let controller:Controller ;
   let settingsService: SettingsService;
@@ -72,7 +72,7 @@ describe('ProjectService', () => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
       providers: [
-        HttpServer,
+        HttpController,
         ProjectService,
         RecentlyOpenedProjectService,
         { provide: SettingsService },
@@ -81,7 +81,7 @@ describe('ProjectService', () => {
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     service = TestBed.get(ProjectService);
     settingsService = TestBed.get(SettingsService);
 

src/app/services/project.service.ts

@@ -6,7 +6,7 @@ import { Node } from '../cartography/models/node';
 import { Link } from '../models/link';
 import { Project } from '../models/project';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { RecentlyOpenedProjectService } from './recentlyOpenedProject.service';
 import { SettingsService } from './settings.service';
 
@@ -34,7 +34,7 @@ export class ProjectService {
 
   public projectListSubject = new Subject<boolean>();
   constructor(
-    private httpServer: HttpServer,
+    private httpServer: HttpController,
     private settingsService: SettingsService,
     private recentlyOpenedProjectService: RecentlyOpenedProjectService
   ) {}

src/app/services/qemu.service.spec.ts

@@ -5,25 +5,25 @@ import { environment } from 'environments/environment';
 import{ Controller } from '../models/controller';
 import { QemuTemplate } from '../models/templates/qemu-template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { QemuService } from './qemu.service';
 import { getTestServer } from './testing';
 
 describe('QemuService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, QemuService],
+      providers: [HttpController, QemuService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     controller = getTestServer();
   });
 

src/app/services/qemu.service.ts

@@ -5,11 +5,11 @@ import { QemuImage } from '../models/qemu/qemu-image';
 import { QemuImg } from '../models/qemu/qemu-img';
 import{ Controller } from '../models/controller';
 import { QemuTemplate } from '../models/templates/qemu-template';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class QemuService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getTemplates(controller:Controller ): Observable<QemuTemplate[]> {
     return this.httpServer.get<QemuTemplate[]>(controller, '/templates') as Observable<QemuTemplate[]>;

src/app/services/snapshot.service.spec.ts

@@ -5,26 +5,26 @@ import { environment } from 'environments/environment';
 import{ Controller } from '../models/controller';
 import { Snapshot } from '../models/snapshot';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { SnapshotService } from './snapshot.service';
 import { getTestServer } from './testing';
 
 describe('SnapshotService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let service: SnapshotService;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, HttpClient,SnapshotService],
+      providers: [HttpController, HttpClient,SnapshotService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     service = TestBed.get(SnapshotService);
     controller = getTestServer();
   });

src/app/services/snapshot.service.ts

@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
 import{ Controller } from '../models/controller';
 import { Snapshot } from '../models/snapshot';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class SnapshotService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   create(controller:Controller , project_id: string, snapshot: Snapshot) {
     return this.httpServer.post<Snapshot>(controller, `/projects/${project_id}/snapshots`, snapshot);

src/app/services/symbol.service.spec.ts

@@ -6,25 +6,25 @@ import { of } from 'rxjs';
 import{ Controller } from '../models/controller';
 import { Symbol } from '../models/symbol';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { SymbolService } from './symbol.service';
 import { getTestServer } from './testing';
 
 describe('SymbolService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, SymbolService],
+      providers: [HttpController, SymbolService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     controller = getTestServer();
   });
 

src/app/services/symbol.service.ts

@@ -5,7 +5,7 @@ import { shareReplay } from 'rxjs/operators';
 import { Node } from '../cartography/models/node';
 import{ Controller } from '../models/controller';
 import { Symbol } from '../models/symbol';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { environment } from 'environments/environment';
 
 const CACHE_SIZE = 1;
@@ -16,7 +16,7 @@ export class SymbolService {
   private cache: Observable<Symbol[]>;
   private maximumSymbolSize: number = 80;
 
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getMaximumSymbolSize() {
     return this.maximumSymbolSize;

src/app/services/template.service.spec.ts

@@ -4,7 +4,7 @@ import { TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
 import{ Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { TemplateService } from './template.service';
 
 describe('TemplateService', () => {
@@ -15,7 +15,7 @@ describe('TemplateService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [TemplateService, HttpServer, HttpClient],
+      providers: [TemplateService, HttpController, HttpClient],
     });
 
     httpClient = TestBed.get(HttpClient);

src/app/services/template.service.ts

@@ -3,13 +3,13 @@ import { Observable, Subject } from 'rxjs';
 import 'rxjs/add/operator/map';
 import{ Controller } from '../models/controller';
 import { Template } from '../models/template';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class TemplateService {
   public newTemplateCreated: Subject<Template> = new Subject<Template>();
 
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   list(controller:Controller ): Observable<Template[]> {
     return this.httpServer.get<Template[]>(controller, '/templates') as Observable<Template[]>;

src/app/services/user.service.ts

@@ -1,13 +1,13 @@
 import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs';
 import{ Controller } from '../models/controller';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { User } from '../models/users/user';
 
 @Injectable()
 export class UserService {
   constructor(
-    private httpServer: HttpServer
+    private httpServer: HttpController
   ) {}
 
   getInformationAboutLoggedUser(controller:Controller ) {

src/app/services/version.service.spec.ts

@@ -5,7 +5,7 @@ import { environment } from 'environments/environment';
 import { Observable } from 'rxjs/Rx';
 import{ Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { getTestServer } from './testing';
 import { VersionService } from './version.service';
 
@@ -20,19 +20,19 @@ export class MockedVersionService {
 describe('VersionService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let service: VersionService;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, VersionService],
+      providers: [HttpController, VersionService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     service = TestBed.get(VersionService);
     controller = getTestServer();
   });

src/app/services/version.service.ts

@@ -2,11 +2,11 @@ import { Injectable } from '@angular/core';
 import 'rxjs/add/operator/map';
 import{ Controller } from '../models/controller';
 import { Version } from '../models/version';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class VersionService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   get(controller:Controller ) {
     return this.httpServer.get<Version>(controller, '/version');

src/app/services/virtual-box.service.spec.ts

@@ -5,25 +5,25 @@ import { environment } from 'environments/environment';
 import{ Controller } from '../models/controller';
 import { VirtualBoxTemplate } from '../models/templates/virtualbox-template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { getTestServer } from './testing';
 import { VirtualBoxService } from './virtual-box.service';
 
 describe('VirtualBoxService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, VirtualBoxService],
+      providers: [HttpController, VirtualBoxService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     controller = getTestServer();
   });
 

src/app/services/virtual-box.service.ts

@@ -4,11 +4,11 @@ import { Observable } from 'rxjs';
 import{ Controller } from '../models/controller';
 import { VirtualBoxTemplate } from '../models/templates/virtualbox-template';
 import { VirtualBoxVm } from '../models/virtualBox/virtual-box-vm';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 
 @Injectable()
 export class VirtualBoxService {
-  constructor(private httpServer: HttpServer) {}
+  constructor(private httpServer: HttpController) {}
 
   getTemplates(controller:Controller ): Observable<VirtualBoxTemplate[]> {
     return this.httpServer.get<VirtualBoxTemplate[]>(controller, '/templates') as Observable<VirtualBoxTemplate[]>;

src/app/services/vmware.service.spec.ts

@@ -5,25 +5,25 @@ import { environment } from 'environments/environment';
 import{ Controller } from '../models/controller';
 import { VmwareTemplate } from '../models/templates/vmware-template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
-import { HttpServer } from './http-server.service';
+import { HttpController } from './http-controller.service';
 import { getTestServer } from './testing';
 import { VmwareService } from './vmware.service';
 
 describe('VmwareService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let httpServer: HttpServer;
+  let httpServer: HttpController;
   let controller:Controller ;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, AppTestingModule],
-      providers: [HttpServer, VmwareService],
+      providers: [HttpController, VmwareService],
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    httpServer = TestBed.get(HttpServer);
+    httpServer = TestBed.get(HttpController);
     controller = getTestServer();
   });