From c682db45952bb238ac89b1b9bdc1fae60afb396d Mon Sep 17 00:00:00 2001 From: Rajnikant Lodhi Date: Thu, 21 Jul 2022 12:41:12 +0530 Subject: [PATCH] Rename Server file name into controller --- src/ReleaseNotes.txt | 2 +- src/app/app-routing.module.ts | 6 +- src/app/app.module.ts | 20 +++---- .../components/d3-map/d3-map.component.ts | 4 +- .../text-editor/text-editor.component.ts | 4 +- .../bundled-server-finder.component.spec.ts | 18 +++--- .../bundled-server-finder.component.ts | 8 +-- .../add-controller-dialog.component.ts | 8 +-- .../controller-discovery.component.spec.ts | 26 ++++----- .../controller-discovery.component.ts | 34 +++++------ .../controllers/controllers.component.spec.ts | 14 ++--- .../controllers/controllers.component.ts | 34 +++++------ .../direct-link/direct-link.component.ts | 14 ++--- .../drawing-added/drawing-added.component.ts | 4 +- .../drawing-dragged.component.ts | 4 +- .../drawing-resized.component.ts | 4 +- .../interface-label-dragged.component.ts | 4 +- .../link-created/link-created.component.ts | 4 +- .../node-dragged/node-dragged.component.ts | 4 +- .../node-label-dragged.component.ts | 4 +- .../text-added/text-added.component.ts | 4 +- .../text-edited/text-edited.component.ts | 4 +- .../export-portable-project.component.ts | 4 +- .../add-image-dialog.component.spec.ts | 10 ++-- .../add-image-dialog.component.ts | 4 +- .../deleteallfiles-dialog.component.spec.ts | 10 ++-- .../image-manager.component.spec.ts | 12 ++-- .../image-manager/image-manager.component.ts | 10 ++-- src/app/components/login/login.component.ts | 14 ++--- ...cloud-nodes-add-template.component.spec.ts | 14 ++--- .../cloud-nodes-add-template.component.ts | 10 ++-- ...d-nodes-template-details.component.spec.ts | 12 ++-- .../cloud-nodes-template-details.component.ts | 10 ++-- .../cloud-nodes-templates.component.spec.ts | 10 ++-- .../cloud-nodes-templates.component.ts | 10 ++-- ...hernet-hubs-add-template.component.spec.ts | 16 ++--- .../ethernet-hubs-add-template.component.ts | 10 ++-- ...et-hubs-template-details.component.spec.ts | 12 ++-- ...thernet-hubs-template-details.component.ts | 10 ++-- .../ethernet-hubs-templates.component.spec.ts | 10 ++-- .../ethernet-hubs-templates.component.ts | 10 ++-- ...et-switches-add-template.component.spec.ts | 16 ++--- ...thernet-switches-add-template.component.ts | 10 ++-- ...witches-template-details.component.spec.ts | 12 ++-- ...net-switches-template-details.component.ts | 10 ++-- ...ernet-switches-templates.component.spec.ts | 10 ++-- .../ethernet-switches-templates.component.ts | 10 ++-- .../delete-template.component.ts | 4 +- .../symbols-menu/symbols-menu.component.ts | 4 +- .../common/symbols/symbols.component.ts | 4 +- .../add-docker-template.component.spec.ts | 10 ++-- .../add-docker-template.component.ts | 10 ++-- .../copy-docker-template.component.ts | 10 ++-- .../docker-template-details.component.spec.ts | 12 ++-- .../docker-template-details.component.ts | 10 ++-- .../docker-templates.component.spec.ts | 10 ++-- .../docker-templates.component.ts | 10 ++-- .../add-ios-template.component.spec.ts | 18 +++--- .../add-ios-template.component.ts | 10 ++-- .../copy-ios-template.component.ts | 10 ++-- .../dynamips-preferences.component.spec.ts | 14 ++--- .../dynamips-preferences.component.ts | 14 ++--- .../ios-template-details.component.spec.ts | 12 ++-- .../ios-template-details.component.ts | 10 ++-- .../ios-templates.component.spec.ts | 10 ++-- .../ios-templates/ios-templates.component.ts | 10 ++-- .../add-iou-template.component.spec.ts | 16 ++--- .../add-iou-template.component.ts | 10 ++-- .../copy-iou-template.component.ts | 10 ++-- .../iou-template-details.component.spec.ts | 12 ++-- .../iou-template-details.component.ts | 10 ++-- .../iou-templates.component.spec.ts | 10 ++-- .../iou-templates/iou-templates.component.ts | 10 ++-- .../add-qemu-vm-template.component.spec.ts | 20 +++---- .../add-qemu-vm-template.component.ts | 10 ++-- .../copy-qemu-vm-template.component.ts | 10 ++-- .../qemu-preferences.component.spec.ts | 14 ++--- .../qemu-preferences.component.ts | 20 +++---- ...qemu-vm-template-details.component.spec.ts | 16 ++--- .../qemu-vm-template-details.component.ts | 10 ++-- .../qemu-vm-templates.component.spec.ts | 10 ++-- .../qemu-vm-templates.component.ts | 10 ++-- ...add-virtual-box-template.component.spec.ts | 16 ++--- .../add-virtual-box-template.component.ts | 10 ++-- .../virtual-box-preferences.component.ts | 10 ++-- .../virtual-box-prefernces.component.spec.ts | 6 +- ...ual-box-template-details.component.spec.ts | 12 ++-- .../virtual-box-template-details.component.ts | 10 ++-- .../virtual-box-templates.component.spec.ts | 10 ++-- .../virtual-box-templates.component.ts | 10 ++-- .../add-vmware-template.component.ts | 10 ++-- .../add-vmware.component.template.spec.ts | 16 ++--- .../vmware-preferences.component.spec.ts | 6 +- .../vmware-preferences.component.ts | 10 ++-- .../vmware-template-details.component.spec.ts | 12 ++-- .../vmware-template-details.component.ts | 10 ++-- .../vmware-templates.component.spec.ts | 10 ++-- .../vmware-templates.component.ts | 10 ++-- .../add-vpcs-template.component.spec.ts | 16 ++--- .../add-vpcs-template.component.ts | 10 ++-- .../vpcs-preferences.component.spec.ts | 6 +- .../vpcs-preferences.component.ts | 10 ++-- .../vpcs-template-details.component.spec.ts | 12 ++-- .../vpcs-template-details.component.ts | 10 ++-- .../vpcs-templates.component.spec.ts | 10 ++-- .../vpcs-templates.component.ts | 10 ++-- .../change-hostname-dialog.component.ts | 4 +- .../change-symbol-dialog.component.ts | 4 +- .../console-wrapper.component.ts | 4 +- .../context-console-menu.component.spec.ts | 4 +- .../context-console-menu.component.ts | 4 +- .../align-horizontally.component.ts | 4 +- .../align-vertically.component.ts | 4 +- .../bring-to-front-action.component.ts | 4 +- .../change-hostname-action.component.ts | 4 +- .../change-symbol-action.component.ts | 4 +- .../config-action/config-action.component.ts | 4 +- ...console-device-action-browser.component.ts | 4 +- .../console-device-action.component.spec.ts | 12 ++-- .../console-device-action.component.ts | 8 +-- .../delete-action/delete-action.component.ts | 4 +- .../duplicate-action.component.ts | 4 +- .../edit-config-action.component.ts | 4 +- .../edit-link-style-action.component.ts | 4 +- .../edit-style-action.component.ts | 4 +- .../edit-text-action.component.ts | 4 +- .../export-config-action.component.ts | 4 +- .../http-console-new-tab-action.component.ts | 4 +- .../http-console-action.component.ts | 4 +- .../import-config-action.component.ts | 4 +- .../isolate-node-action.component.ts | 4 +- .../lock-action/lock-action.component.ts | 4 +- .../move-layer-down-action.component.ts | 4 +- .../move-layer-up-action.component.ts | 4 +- .../open-file-explorer-action.component.ts | 4 +- .../packet-filters-action.component.ts | 4 +- .../reload-node-action.component.ts | 4 +- .../reset-link/reset-link-action.component.ts | 4 +- .../resume-link-action.component.ts | 4 +- .../show-node-action.component.ts | 4 +- ...start-capture-on-started-link.component.ts | 4 +- .../start-capture-action.component.ts | 4 +- .../start-node-action.component.ts | 4 +- .../stop-capture-action.component.ts | 4 +- .../stop-node-action.component.ts | 4 +- .../suspend-link-action.component.ts | 4 +- .../suspend-node-action.component.ts | 4 +- .../unisolate-node-action.component.ts | 4 +- .../context-menu.component.spec.ts | 4 +- .../context-menu/context-menu.component.ts | 4 +- .../link-style-editor.component.ts | 4 +- .../style-editor/style-editor.component.ts | 4 +- .../text-editor/text-editor.component.ts | 4 +- .../import-appliance.component.ts | 6 +- .../info-dialog/info-dialog.component.ts | 4 +- .../log-console/log-console.component.spec.ts | 4 +- .../log-console/log-console.component.ts | 4 +- .../new-template-dialog.component.ts | 4 +- .../template-name-dialog.component.ts | 4 +- .../config-editor.component.spec.ts | 6 +- .../config-editor/config-editor.component.ts | 4 +- .../configurator-atm-switch.component.ts | 4 +- .../cloud/configurator-cloud.component.ts | 4 +- .../docker/configurator-docker.component.ts | 4 +- .../configure-custom-adapters.component.ts | 4 +- .../edit-network-configuration.component.ts | 4 +- .../configurator-ethernet-switch.component.ts | 4 +- .../configurator-ethernet-hub.component.ts | 4 +- .../ios/configurator-ios.component.ts | 4 +- .../iou/configurator-iou.component.ts | 4 +- .../nat/configurator-nat.component.ts | 4 +- .../qemu/configurator-qemu.component.ts | 4 +- .../qemu-image-creator.component.ts | 4 +- .../switch/configurator-switch.component.ts | 4 +- .../configurator-virtualbox.component.ts | 4 +- .../vmware/configurator-vmware.component.ts | 4 +- .../vpcs/configurator-vpcs.component.ts | 4 +- .../nodes-menu/nodes-menu.component.spec.ts | 4 +- .../nodes-menu/nodes-menu.component.ts | 8 +-- .../packet-filters.component.ts | 4 +- .../start-capture/start-capture.component.ts | 4 +- .../project-map-menu.component.ts | 4 +- .../project-map/project-map.component.spec.ts | 58 +++++++++---------- .../project-map/project-map.component.ts | 10 ++-- .../project-readme.component.ts | 4 +- .../web-console/web-console.component.ts | 4 +- ...add-blank-project-dialog.component.spec.ts | 6 +- .../add-blank-project-dialog.component.ts | 4 +- .../choose-name-dialog.component.ts | 4 +- .../edit-project-dialog.component.ts | 4 +- .../readme-editor/readme-editor.component.ts | 4 +- .../import-project-dialog.component.spec.ts | 10 ++-- .../import-project-dialog.component.ts | 4 +- .../projects/projects.component.spec.ts | 16 ++--- .../components/projects/projects.component.ts | 4 +- .../save-project-dialog.component.ts | 4 +- .../create-snapshot-dialog.component.ts | 4 +- .../list-of-snaphshots.component.spec.ts | 14 ++--- .../list-of-snapshots.component.ts | 4 +- .../snapshot-menu-item.component.ts | 4 +- .../status-info/status-info.component.ts | 8 +-- .../template-list-dialog.component.spec.ts | 2 +- .../template-list-dialog.component.ts | 6 +- .../components/template/template.component.ts | 4 +- .../topology-summary.component.html | 2 +- .../topology-summary.component.spec.ts | 4 +- .../topology-summary.component.ts | 4 +- .../logged-user/logged-user.component.ts | 10 ++-- .../web-console-full-window.component.ts | 10 ++-- src/app/filters/authImageFilter.ts | 4 +- src/app/guards/login-guard.ts | 8 +-- src/app/interceptors/http.interceptor.ts | 6 +- .../default-layout.component.spec.ts | 18 +++--- .../default-layout.component.ts | 18 +++--- src/app/models/{server.ts => controller.ts} | 2 +- ...erver-resolve.ts => controller-resolve.ts} | 8 +-- src/app/services/appliances.service.ts | 10 ++-- .../built-in-templates.service.spec.ts | 4 +- .../services/built-in-templates.service.ts | 10 ++-- src/app/services/compute.service.ts | 8 +-- ... => controller-management.service.spec.ts} | 26 ++++----- ...ce.ts => controller-management.service.ts} | 18 +++--- ...ts => controller-settings.service.spec.ts} | 16 ++--- ...vice.ts => controller-settings.service.ts} | 12 ++-- src/app/services/controller.database.ts | 48 +++++++++++++++ ...ice.spec.ts => controller.service.spec.ts} | 12 ++-- ...erver.service.ts => controller.service.ts} | 34 +++++------ src/app/services/docker.service.ts | 12 ++-- src/app/services/drawing.service.spec.ts | 4 +- src/app/services/drawing.service.ts | 16 ++--- src/app/services/http-server.service.spec.ts | 4 +- src/app/services/http-server.service.ts | 22 +++---- .../services/image-manager.service.spec.ts | 4 +- src/app/services/image-manager.service.ts | 12 ++-- src/app/services/info.service.ts | 4 +- src/app/services/ios.service.ts | 14 ++--- src/app/services/iou.service.ts | 14 ++--- src/app/services/link.service.spec.ts | 4 +- src/app/services/link.service.ts | 24 ++++---- src/app/services/login.service.ts | 8 +-- src/app/services/node.service.spec.ts | 4 +- src/app/services/node.service.ts | 58 +++++++++---------- src/app/services/nodeConsole.service.ts | 4 +- src/app/services/notification.service.ts | 6 +- src/app/services/packet-capture.service.ts | 4 +- src/app/services/project.service.spec.ts | 20 +++---- src/app/services/project.service.ts | 38 ++++++------ src/app/services/qemu.service.spec.ts | 4 +- src/app/services/qemu.service.ts | 18 +++--- src/app/services/server.database.ts | 48 --------------- src/app/services/snapshot.service.spec.ts | 4 +- src/app/services/snapshot.service.ts | 10 ++-- src/app/services/symbol.service.spec.ts | 4 +- src/app/services/symbol.service.ts | 14 ++--- src/app/services/template.service.spec.ts | 4 +- src/app/services/template.service.ts | 6 +- src/app/services/testing.ts | 6 +- src/app/services/user.service.ts | 4 +- src/app/services/version.service.spec.ts | 6 +- src/app/services/version.service.ts | 4 +- .../virtual-box-configuration.service.ts | 4 +- src/app/services/virtual-box.service.spec.ts | 4 +- src/app/services/virtual-box.service.ts | 12 ++-- src/app/services/vmware.service.spec.ts | 4 +- src/app/services/vmware.service.ts | 12 ++-- src/app/services/vpcs.service.spec.ts | 4 +- src/app/services/vpcs.service.ts | 10 ++-- .../project-name-async-validator.ts | 4 +- .../template-name-async-validator.ts | 4 +- 269 files changed, 1200 insertions(+), 1200 deletions(-) rename src/app/models/{server.ts => controller.ts} (94%) rename src/app/resolvers/{server-resolve.ts => controller-resolve.ts} (51%) rename src/app/services/{server-management.service.spec.ts => controller-management.service.spec.ts} (69%) rename src/app/services/{server-management.service.ts => controller-management.service.ts} (74%) rename src/app/services/{server-settings.service.spec.ts => controller-settings.service.spec.ts} (56%) rename src/app/services/{server-settings.service.ts => controller-settings.service.ts} (71%) create mode 100644 src/app/services/controller.database.ts rename src/app/services/{server.service.spec.ts => controller.service.spec.ts} (69%) rename src/app/services/{server.service.ts => controller.service.ts} (75%) delete mode 100644 src/app/services/server.database.ts diff --git a/src/ReleaseNotes.txt b/src/ReleaseNotes.txt index 62fdf18d..9e5f07c7 100644 --- a/src/ReleaseNotes.txt +++ b/src/ReleaseNotes.txt @@ -67,7 +67,7 @@ GNS3 Web UI 2020.2.0-beta.4 Bug Fixes - New port setting for GNS3 VM preferences - Option to auto-hide menu toolbar on the left side -- Server type in template preferences +-Controller type in template preferences - Error when selecting existing Docker image - Default values in templates - TypeError: Cannot read property 'message' of undefined diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ad50ec3d..01f4be77 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -53,7 +53,7 @@ import { WebConsoleFullWindowComponent } from './components/web-console-full-win import { ConsoleGuard } from './guards/console-guard'; import { LoginGuard } from './guards/login-guard'; import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component'; -import { ServerResolve } from './resolvers/server-resolve'; +import { ControllerResolve } from './resolvers/controller-resolve'; import { UserManagementComponent } from './components/user-management/user-management.component'; import { LoggedUserComponent } from './components/users/logged-user/logged-user.component'; import { ImageManagerComponent } from './components/image-manager/image-manager.component'; @@ -73,7 +73,7 @@ const routes: Routes = [ path: 'controller/:controller_id/projects', component: ProjectsComponent, canActivate: [LoginGuard], - resolve: { controller: ServerResolve }, + resolve: { controller: ControllerResolve }, }, { path: 'help', component: HelpComponent }, { path: 'settings', component: SettingsComponent }, @@ -86,7 +86,7 @@ const routes: Routes = [ path: 'controller/:controller_id/project/:project_id/snapshots', component: ListOfSnapshotsComponent, canActivate: [LoginGuard], - resolve: { controller: ServerResolve }, + resolve: { controller: ControllerResolve }, }, { path: 'controller/:controller_id/preferences', component: PreferencesComponent, canActivate: [LoginGuard] }, // { path: 'controller/:controller_id/preferences/general', component: GeneralPreferencesComponent }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8cdb7834..90074ec3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -214,7 +214,7 @@ import { LoginGuard } from './guards/login-guard'; import { ProjectWebServiceHandler } from './handlers/project-web-service-handler'; import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component'; import { MATERIAL_IMPORTS } from './material.imports'; -import { ServerResolve } from './resolvers/server-resolve'; +import { ControllerResolve } from './resolvers/controller-resolve'; import { ApplianceService } from './services/appliances.service'; import { BuiltInTemplatesConfigurationService } from './services/built-in-templates-configuration.service'; import { BuiltInTemplatesService } from './services/built-in-templates.service'; @@ -243,10 +243,10 @@ import { ProjectService } from './services/project.service'; import { QemuConfigurationService } from './services/qemu-configuration.service'; import { QemuService } from './services/qemu.service'; import { RecentlyOpenedProjectService } from './services/recentlyOpenedProject.service'; -import { ServerManagementService } from './services/server-management.service'; -import { ServerSettingsService } from './services/server-settings.service'; -import { ServerDatabase } from './services/server.database'; -import { ServerService } from './services/server.service'; +import { ControllerManagementService } from './services/controller-management.service'; +import { ControllerSettingsService } from './services/controller-settings.service'; +import { ControllerDatabase } from './services/controller.database'; +import { ControllerService } from './services/controller.service'; import { SettingsService } from './services/settings.service'; import { ConsoleService } from './services/settings/console.service'; import { DefaultConsoleService } from './services/settings/default-console.service'; @@ -505,7 +505,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n VersionService, ProjectService, SymbolService, - ServerService, + ControllerService, TemplateService, NodeService, LinkService, @@ -524,10 +524,10 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n InRectangleHelper, DrawingsDataSource, ServerErrorHandler, - ServerDatabase, + ControllerDatabase, ProjectNameValidator, ToolsService, - ServerSettingsService, + ControllerSettingsService, QemuService, VpcsService, TemplateMocksService, @@ -549,7 +549,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n IouService, IouConfigurationService, RecentlyOpenedProjectService, - ServerManagementService, + ControllerManagementService, MapScaleService, ConsoleService, DefaultConsoleService, @@ -564,7 +564,7 @@ import { NodesMenuConfirmationDialogComponent } from './components/project-map/n ThemeService, GoogleAnalyticsService, NodeConsoleService, - ServerResolve, + ControllerResolve, LoginGuard, ConsoleGuard, Title, diff --git a/src/app/cartography/components/d3-map/d3-map.component.ts b/src/app/cartography/components/d3-map/d3-map.component.ts index 44599034..b0c0f950 100644 --- a/src/app/cartography/components/d3-map/d3-map.component.ts +++ b/src/app/cartography/components/d3-map/d3-map.component.ts @@ -13,7 +13,7 @@ import { select, Selection } from 'd3-selection'; import { Subscription } from 'rxjs'; import { Link } from '../../../models/link'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import { Controller } from '../../../models/controller'; import { Symbol } from '../../../models/symbol'; import { MapScaleService } from '../../../services/mapScale.service'; import { MapSettingsService } from '../../../services/mapsettings.service'; @@ -43,7 +43,7 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy { @Input() drawings: Drawing[] = []; @Input() symbols: Symbol[] = []; @Input() project: Project; - @Input() controller: Server; + @Input() controller: Controller; @Input() width = 1500; @Input() height = 600; diff --git a/src/app/cartography/components/text-editor/text-editor.component.ts b/src/app/cartography/components/text-editor/text-editor.component.ts index 2aed35d4..ef7eff1a 100644 --- a/src/app/cartography/components/text-editor/text-editor.component.ts +++ b/src/app/cartography/components/text-editor/text-editor.component.ts @@ -13,7 +13,7 @@ import { select } from 'd3-selection'; import { Subscription } from 'rxjs'; import { StyleProperty } from '../../../components/project-map/drawings-editors/text-editor/text-editor.component'; import { Link } from '../../../models/link'; -import { Server } from '../../../models/server'; +import { Controller } from '../../../models/controller'; import { LinkService } from '../../../services/link.service'; import { MapScaleService } from '../../../services/mapScale.service'; import { ToolsService } from '../../../services/tools.service'; @@ -37,7 +37,7 @@ import { Node } from '../../models/node'; export class TextEditorComponent implements OnInit, OnDestroy { @ViewChild('temporaryTextElement') temporaryTextElement: ElementRef; @Input('svg') svg: SVGSVGElement; - @Input('controller') controller: Server; + @Input('controller') controller: Controller; leftPosition: string = '0px'; topPosition: string = '0px'; diff --git a/src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts b/src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts index 92a8301a..b761810e 100644 --- a/src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts +++ b/src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts @@ -4,9 +4,9 @@ import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { ProgressService } from '../../common/progress/progress.service'; -import { Server } from '../../models/server'; -import { ServerService } from '../../services/server.service'; -import { MockedServerService } from '../../services/server.service.spec'; +import{ Controller } from '../../models/controller'; +import { ControllerService } from '../../services/controller.service'; +import { MockedServerService } from '../../services/controller.service.spec'; import { MockedProgressService } from '../project-map/project-map.component.spec'; import { BundledServerFinderComponent } from './bundled-server-finder.component'; @@ -14,9 +14,9 @@ describe('BundledServerFinderComponent', () => { let component: BundledServerFinderComponent; let fixture: ComponentFixture; let router: any; - let service: ServerService; + let service: ControllerService; let progressService: MockedProgressService = new MockedProgressService(); - let controllerServiceMock: jasmine.SpyObj; + let controllerServiceMock: jasmine.SpyObj; beforeEach(async () => { @@ -26,7 +26,7 @@ describe('BundledServerFinderComponent', () => { - controllerServiceMock = jasmine.createSpyObj([ + controllerServiceMock = jasmine.createSpyObj([ "getLocalServer" ]); @@ -37,7 +37,7 @@ describe('BundledServerFinderComponent', () => { await TestBed.configureTestingModule({ providers: [ { provide: Router, useValue: router }, - { provide: ServerService, useValue: controllerServiceMock }, + { provide: ControllerService, useValue: controllerServiceMock }, { provide: ProgressService, useValue: progressService }, ], declarations: [BundledServerFinderComponent], @@ -50,7 +50,7 @@ describe('BundledServerFinderComponent', () => { }); it('should create and redirect to controller', fakeAsync(() => { - const controller = new Server(); + const controller = new Controller (); controller.id = 99; controllerServiceMock.getLocalServer.and.returnValue( Promise.resolve(controller) @@ -62,6 +62,6 @@ describe('BundledServerFinderComponent', () => { expect(controllerServiceMock.getLocalServer).toHaveBeenCalledWith('vps3.gns3.net',3000); expect(router.navigate).toHaveBeenCalledWith(['/controller', 99, 'projects']); }) - service = TestBed.inject(ServerService); + service = TestBed.inject(ControllerService); })); }); diff --git a/src/app/components/bundled-server-finder/bundled-server-finder.component.ts b/src/app/components/bundled-server-finder/bundled-server-finder.component.ts index c55dbe8d..df124b30 100644 --- a/src/app/components/bundled-server-finder/bundled-server-finder.component.ts +++ b/src/app/components/bundled-server-finder/bundled-server-finder.component.ts @@ -2,8 +2,8 @@ import { DOCUMENT } from '@angular/common'; import { Component, Inject, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { ProgressService } from '../../common/progress/progress.service'; -import { Server } from '../../models/server'; -import { ServerService } from '../../services/server.service'; +import{ Controller } from '../../models/controller'; +import { ControllerService } from '../../services/controller.service'; @Component({ selector: 'app-bundled-server-finder', @@ -13,7 +13,7 @@ import { ServerService } from '../../services/server.service'; export class BundledServerFinderComponent implements OnInit { constructor( private router: Router, - private serverService: ServerService, + private serverService: ControllerService, private progressService: ProgressService, @Inject(DOCUMENT) private document ) {} @@ -31,7 +31,7 @@ export class BundledServerFinderComponent implements OnInit { port = 80; } - this.serverService.getLocalServer(this.document.location.hostname, port).then((controller: Server) => { + this.serverService.getLocalServer(this.document.location.hostname, port).then((controller:Controller ) => { this.router.navigate(['/controller', controller.id, 'projects']); this.progressService.deactivate(); }); diff --git a/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.ts b/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.ts index 6faaf9b8..4abd5370 100644 --- a/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.ts +++ b/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.ts @@ -2,8 +2,8 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ElectronService } from 'ngx-electron'; -import { Server } from '../../../models/server'; -import { ServerService } from '../../../services/server.service'; +import{ Controller } from '../../../models/controller'; +import { ControllerService } from '../../../services/controller.service'; import { ToasterService } from '../../../services/toaster.service'; @Component({ @@ -30,7 +30,7 @@ export class AddControllerDialogComponent implements OnInit { constructor( public dialogRef: MatDialogRef, private electronService: ElectronService, - private serverService: ServerService, + private serverService: ControllerService, private toasterService: ToasterService, @Inject(MAT_DIALOG_DATA) public data: any ) {} @@ -124,7 +124,7 @@ export class AddControllerDialogComponent implements OnInit { return; } - const controller: Server = Object.assign({}, this.controllerForm.value); + const controller:Controller = Object.assign({}, this.controllerForm.value); this.serverService.checkServerVersion(controller).subscribe( (serverInfo) => { if (serverInfo.version.split('.')[0] >= 3) { diff --git a/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts b/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts index 92a812af..c17f479f 100644 --- a/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts +++ b/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts @@ -2,11 +2,11 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { Observable } from 'rxjs/Rx'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { Version } from '../../../models/version'; -import { ServerDatabase } from '../../../services/server.database'; -import { ServerService } from '../../../services/server.service'; -import { MockedServerService } from '../../../services/server.service.spec'; +import { ControllerDatabase } from '../../../services/controller.database'; +import { ControllerService } from '../../../services/controller.service'; +import { MockedServerService } from '../../../services/controller.service.spec'; import { VersionService } from '../../../services/version.service'; import { MockedVersionService } from '../../../services/version.service.spec'; import { ControllerDiscoveryComponent } from './controller-discovery.component'; @@ -24,8 +24,8 @@ xdescribe('ControllerDiscoveryComponent', () => { imports: [MatCardModule, MatDividerModule], providers: [ { provide: VersionService, useFactory: () => mockedVersionService }, - { provide: ServerService, useFactory: () => mockedServerService }, - ServerDatabase, + { provide: ControllerService, useFactory: () => mockedServerService }, + ControllerDatabase, ], declarations: [ControllerDiscoveryComponent], }).compileComponents(); @@ -58,7 +58,7 @@ describe('isAvailable', () => { expect(s.port).toEqual(3080); }); - const controller = new Server(); + const controller = new Controller (); controller.host = '127.0.0.1'; controller.port = 3080; @@ -66,7 +66,7 @@ describe('isAvailable', () => { }); it('should throw error once controller is not available', () => { - const controller = new Server(); + const controller = new Controller (); controller.host = '127.0.0.1'; controller.port = 3080; @@ -94,7 +94,7 @@ describe('discovery', () => { version.version = '2.1.8'; spyOn(component, 'isServerAvailable').and.callFake((ip, port) => { - const controller = new Server(); + const controller = new Controller (); controller.host = ip; controller.port = port; return Observable.of(controller); @@ -112,10 +112,10 @@ describe('discovery', () => { }); describe('discoverFirstAvailableServer', () => { - let controller: Server; + let controller:Controller ; beforeEach(function () { - controller = new Server(); + controller = new Controller (); (controller.host = '199.111.111.1'), (controller.port = 3333); spyOn(component, 'discovery').and.callFake(() => { @@ -142,9 +142,9 @@ describe('discoverFirstAvailableServer', () => { }); describe('accepting and ignoring found controller', () => { - let controller: Server; + let controller:Controller ; beforeEach(() => { - controller = new Server(); + controller = new Controller (); (controller.host = '199.111.111.1'), (controller.port = 3333); component.discoveredServer = controller; }); diff --git a/src/app/components/controllers/controller-discovery/controller-discovery.component.ts b/src/app/components/controllers/controller-discovery/controller-discovery.component.ts index 124e21f8..fa95ca98 100644 --- a/src/app/components/controllers/controller-discovery/controller-discovery.component.ts +++ b/src/app/components/controllers/controller-discovery/controller-discovery.component.ts @@ -3,10 +3,10 @@ import { ActivatedRoute } from '@angular/router'; import { forkJoin, from } from 'rxjs'; import { map } from 'rxjs//operators'; import { Observable } from 'rxjs/Rx'; -import { Server, ServerProtocol } from '../../../models/server'; +import { Controller, ServerProtocol } from '../../../models/controller'; import { Version } from '../../../models/version'; -import { ServerDatabase } from '../../../services/server.database'; -import { ServerService } from '../../../services/server.service'; +import { ControllerDatabase } from '../../../services/controller.database'; +import { ControllerService } from '../../../services/controller.service'; import { VersionService } from '../../../services/version.service'; @Component({ @@ -22,12 +22,12 @@ export class ControllerDiscoveryComponent implements OnInit { }, ]; - discoveredServer: Server; + discoveredServer: Controller; constructor( private versionService: VersionService, - private serverService: ServerService, - private serverDatabase: ServerDatabase, + private serverService: ControllerService, + private serverDatabase: ControllerDatabase, private route: ActivatedRoute ) {} @@ -56,9 +56,9 @@ export class ControllerDiscoveryComponent implements OnInit { } async discoverServers() { - let discoveredServers: Server[] = []; + let discoveredServers: Controller[] = []; this.defaultServers.forEach(async (testServer) => { - const controller = new Server(); + const controller = new Controller(); controller.host = testServer.host; controller.port = testServer.port; let version = await this.versionService @@ -71,7 +71,7 @@ export class ControllerDiscoveryComponent implements OnInit { } discoverFirstAvailableServer() { - forkJoin([from(this.serverService.findAll()).pipe(map((s: Server[]) => s)), this.discovery()]).subscribe( + forkJoin([from(this.serverService.findAll()).pipe(map((s: Controller[]) => s)), this.discovery()]).subscribe( ([local, discovered]) => { local.forEach((added) => { discovered = discovered.filter((controller) => { @@ -86,8 +86,8 @@ export class ControllerDiscoveryComponent implements OnInit { ); } - discovery(): Observable { - const queries: Observable[] = []; + discovery(): Observable { + const queries: Observable[] = []; this.defaultServers.forEach((testServer) => { queries.push( @@ -97,7 +97,7 @@ export class ControllerDiscoveryComponent implements OnInit { ); }); - return new Observable((observer) => { + return new Observable((observer) => { forkJoin(queries).subscribe((discoveredServers) => { observer.next(discoveredServers.filter((s) => s != null)); observer.complete(); @@ -105,18 +105,18 @@ export class ControllerDiscoveryComponent implements OnInit { }); } - isServerAvailable(ip: string, port: number): Observable { - const controller = new Server(); + isServerAvailable(ip: string, port: number): Observable { + const controller = new Controller(); controller.host = ip; controller.port = port; return this.versionService.get(controller).flatMap((version: Version) => Observable.of(controller)); } - ignore(controller: Server) { + ignore(controller: Controller) { this.discoveredServer = null; } - accept(controller: Server) { + accept(controller: Controller) { if (controller.name == null) { controller.name = controller.host; } @@ -124,7 +124,7 @@ export class ControllerDiscoveryComponent implements OnInit { controller.location = 'remote'; controller.protocol = location.protocol as ServerProtocol; - this.serverService.create(controller).then((created: Server) => { + this.serverService.create(controller).then((created: Controller) => { this.serverDatabase.addServer(created); this.discoveredServer = null; }); diff --git a/src/app/components/controllers/controllers.component.spec.ts b/src/app/components/controllers/controllers.component.spec.ts index 372fae6e..7df1d2a2 100644 --- a/src/app/components/controllers/controllers.component.spec.ts +++ b/src/app/components/controllers/controllers.component.spec.ts @@ -4,11 +4,11 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { ServerDatabase } from '../../services/server.database'; -import { ServerService } from '../../services/server.service'; -import { MockedServerService } from 'app/services/server.service.spec'; +import { ControllerDatabase } from '../../services/controller.database'; +import { ControllerService } from '../../services/controller.service'; +import { MockedServerService } from 'app/services/controller.service.spec'; import { ControllersComponent } from './controllers.component'; -import { ServerManagementService } from 'app/services/server-management.service'; +import { ControllerManagementService } from 'app/services/server-management.service'; import { ElectronService } from 'ngx-electron'; import { ChildProcessService } from 'ngx-childprocess'; import { MatBottomSheet, MatBottomSheetModule } from '@angular/material/bottom-sheet'; @@ -35,13 +35,13 @@ describe('ControllersComponent', () => { ], providers: [ MatDialog, - ServerDatabase, - ServerManagementService, + ControllerDatabase, + ControllerManagementService, ElectronService, MatBottomSheet, ChildProcessService, ChangeDetectorRef, - { provide: ServerService, useValue: serverMockedService }, + { provide: ControllerService, useValue: serverMockedService }, { provide: ActivatedRoute, useValue: mockedActivatedRoute }, { provide: Router, useValue: mockedRouter }, ] diff --git a/src/app/components/controllers/controllers.component.ts b/src/app/components/controllers/controllers.component.ts index 2c2481c5..31975539 100644 --- a/src/app/components/controllers/controllers.component.ts +++ b/src/app/components/controllers/controllers.component.ts @@ -7,10 +7,10 @@ import { ChildProcessService } from 'ngx-childprocess'; import { ElectronService } from 'ngx-electron'; import { merge, Observable, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; -import { Server, ServerProtocol } from '../../models/server'; -import { ServerManagementService } from '../../services/server-management.service'; -import { ServerDatabase } from '../../services/server.database'; -import { ServerService } from '../../services/server.service'; +import {Controller , ServerProtocol } from '../../models/controller'; +import { ControllerManagementService } from '../../services/controller-management.service'; +import { ControllerDatabase } from '../../services/controller.database'; +import { ControllerService } from '../../services/controller.service'; import { ConfirmationBottomSheetComponent } from '../projects/confirmation-bottomsheet/confirmation-bottomsheet.component'; import { AddControllerDialogComponent } from './add-controller-dialog/add-controller-dialog.component'; @@ -27,9 +27,9 @@ export class ControllersComponent implements OnInit, OnDestroy { constructor( private dialog: MatDialog, - private serverService: ServerService, - private serverDatabase: ServerDatabase, - private serverManagement: ServerManagementService, + private serverService: ControllerService, + private serverDatabase: ControllerDatabase, + private serverManagement: ControllerManagementService, private changeDetector: ChangeDetectorRef, private electronService: ElectronService, private childProcessService: ChildProcessService, @@ -41,7 +41,7 @@ export class ControllersComponent implements OnInit, OnDestroy { getControllers() { const runningServersNames = this.serverManagement.getRunningServers(); - this.serverService.findAll().then((controllers: Server[]) => { + this.serverService.findAll().then((controllers:Controller []) => { controllers.forEach((controller) => { const serverIndex = runningServersNames.findIndex((controllerName) => controller.name === controllerName); if (serverIndex >= 0) { @@ -78,7 +78,7 @@ export class ControllersComponent implements OnInit, OnDestroy { this.dataSource = new ServerDataSource(this.serverDatabase); - this.serverStatusSubscription = this.serverManagement.serverStatusChanged.subscribe((serverStatus) => { + this.serverStatusSubscription = this.serverManagement.controllerStatusChanged.subscribe((serverStatus) => { const controller = this.serverDatabase.find(serverStatus.serverName); if (!controller) { return; @@ -122,14 +122,14 @@ export class ControllersComponent implements OnInit, OnDestroy { dialogRef.afterClosed().subscribe((controller) => { if (controller) { - this.serverService.create(controller).then((created: Server) => { + this.serverService.create(controller).then((created:Controller ) => { this.serverDatabase.addServer(created); }); } }); } - getServerStatus(controller: Server) { + getServerStatus(controller:Controller ) { if (controller.location === 'local') { if (controller.status === undefined) { return 'stopped'; @@ -138,7 +138,7 @@ export class ControllersComponent implements OnInit, OnDestroy { } } - deleteServer(controller: Server) { + deleteServer(controller:Controller ) { this.bottomSheet.open(ConfirmationBottomSheetComponent); let bottomSheetRef = this.bottomSheet._openedBottomSheetRef; bottomSheetRef.instance.message = 'Do you want to delete the controller?'; @@ -151,21 +151,21 @@ export class ControllersComponent implements OnInit, OnDestroy { }); } - async startServer(controller: Server) { + async startServer(controller:Controller ) { await this.serverManagement.start(controller); } - async stopServer(controller: Server) { + async stopServer(controller:Controller ) { await this.serverManagement.stop(controller); } } -export class ServerDataSource extends DataSource { - constructor(private serverDatabase: ServerDatabase) { +export class ServerDataSource extends DataSource { + constructor(private serverDatabase: ControllerDatabase) { super(); } - connect(): Observable { + connect(): Observable< Controller[] > { return merge(this.serverDatabase.dataChange).pipe( map(() => { return this.serverDatabase.data; diff --git a/src/app/components/direct-link/direct-link.component.ts b/src/app/components/direct-link/direct-link.component.ts index f5f51ef6..3b63bbd2 100644 --- a/src/app/components/direct-link/direct-link.component.ts +++ b/src/app/components/direct-link/direct-link.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../models/server'; -import { ServerDatabase } from '../../services/server.database'; -import { ServerService } from '../../services/server.service'; +import{ Controller } from '../../models/controller'; +import { ControllerDatabase } from '../../services/controller.database'; +import { ControllerService } from '../../services/controller.service'; import { ToasterService } from '../../services/toaster.service'; @Component({ @@ -34,8 +34,8 @@ export class DirectLinkComponent implements OnInit { }); constructor( - private serverService: ServerService, - private serverDatabase: ServerDatabase, + private serverService: ControllerService, + private serverDatabase: ControllerDatabase, private route: ActivatedRoute, private router: Router, private toasterService: ToasterService @@ -72,7 +72,7 @@ export class DirectLinkComponent implements OnInit { return; } - let serverToAdd: Server = new Server(); + let serverToAdd:Controller = new Controller (); serverToAdd.host = this.controllerIp; serverToAdd.port = this.controllerPort; @@ -80,7 +80,7 @@ export class DirectLinkComponent implements OnInit { serverToAdd.location = this.serverForm.get('location').value; serverToAdd.protocol = this.serverForm.get('protocol').value; - this.serverService.create(serverToAdd).then((addedServer: Server) => { + this.serverService.create(serverToAdd).then((addedServer:Controller ) => { this.router.navigate(['/controller', addedServer.id, 'project', this.projectId]); }); } diff --git a/src/app/components/drawings-listeners/drawing-added/drawing-added.component.ts b/src/app/components/drawings-listeners/drawing-added/drawing-added.component.ts index 8dd98067..ea9bafbf 100644 --- a/src/app/components/drawings-listeners/drawing-added/drawing-added.component.ts +++ b/src/app/components/drawings-listeners/drawing-added/drawing-added.component.ts @@ -7,7 +7,7 @@ import { AddedDataEvent } from '../../../cartography/events/event-source'; import { DefaultDrawingsFactory } from '../../../cartography/helpers/default-drawings-factory'; import { Drawing } from '../../../cartography/models/drawing'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { DrawingService } from '../../../services/drawing.service'; @Component({ @@ -16,7 +16,7 @@ import { DrawingService } from '../../../services/drawing.service'; styleUrls: ['./drawing-added.component.scss'], }) export class DrawingAddedComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller: Controller @Input() project: Project; @Input() selectedDrawing: string; @Output() drawingSaved = new EventEmitter(); diff --git a/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts b/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts index 9f5e1e7d..30642a56 100644 --- a/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts +++ b/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts @@ -6,7 +6,7 @@ import { DraggedDataEvent } from '../../../cartography/events/event-source'; import { Drawing } from '../../../cartography/models/drawing'; import { MapDrawing } from '../../../cartography/models/map/map-drawing'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { DrawingService } from '../../../services/drawing.service'; @Component({ @@ -15,7 +15,7 @@ import { DrawingService } from '../../../services/drawing.service'; styleUrls: ['./drawing-dragged.component.scss'], }) export class DrawingDraggedComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; private drawingDragged: Subscription; diff --git a/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts b/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts index 266f5d2b..1e9640fd 100644 --- a/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts +++ b/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts @@ -6,7 +6,7 @@ import { DrawingsEventSource } from '../../../cartography/events/drawings-event- import { ResizedDataEvent } from '../../../cartography/events/event-source'; import { Drawing } from '../../../cartography/models/drawing'; import { MapDrawing } from '../../../cartography/models/map/map-drawing'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { DrawingService } from '../../../services/drawing.service'; @Component({ @@ -15,7 +15,7 @@ import { DrawingService } from '../../../services/drawing.service'; styleUrls: ['./drawing-resized.component.scss'], }) export class DrawingResizedComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller:Controller ; private drawingResized: Subscription; constructor( diff --git a/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts b/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts index 83a5e1e4..c9b05e1b 100644 --- a/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts +++ b/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts @@ -5,7 +5,7 @@ import { DraggedDataEvent } from '../../../cartography/events/event-source'; import { LinksEventSource } from '../../../cartography/events/links-event-source'; import { MapLinkNode } from '../../../cartography/models/map/map-link-node'; import { Link } from '../../../models/link'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { LinkService } from '../../../services/link.service'; @Component({ @@ -14,7 +14,7 @@ import { LinkService } from '../../../services/link.service'; styleUrls: ['./interface-label-dragged.component.scss'], }) export class InterfaceLabelDraggedComponent { - @Input() controller: Server; + @Input() controller:Controller ; private interfaceDragged: Subscription; constructor( diff --git a/src/app/components/drawings-listeners/link-created/link-created.component.ts b/src/app/components/drawings-listeners/link-created/link-created.component.ts index 33972355..a5c027c6 100644 --- a/src/app/components/drawings-listeners/link-created/link-created.component.ts +++ b/src/app/components/drawings-listeners/link-created/link-created.component.ts @@ -7,7 +7,7 @@ import { MapLinkCreated } from '../../../cartography/events/links'; import { LinksEventSource } from '../../../cartography/events/links-event-source'; import { Link } from '../../../models/link'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { LinkService } from '../../../services/link.service'; import { ProjectService } from '../../../services/project.service'; @@ -17,7 +17,7 @@ import { ProjectService } from '../../../services/project.service'; styleUrls: ['./link-created.component.scss'], }) export class LinkCreatedComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; private linkCreated: Subscription; diff --git a/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts b/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts index 0aed5c12..ff716445 100644 --- a/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts +++ b/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts @@ -6,7 +6,7 @@ import { NodesEventSource } from '../../../cartography/events/nodes-event-source import { MapNode } from '../../../cartography/models/map/map-node'; import { Node } from '../../../cartography/models/node'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { NodeService } from '../../../services/node.service'; @Component({ @@ -15,7 +15,7 @@ import { NodeService } from '../../../services/node.service'; styleUrls: ['./node-dragged.component.scss'], }) export class NodeDraggedComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; private nodeDragged: Subscription; diff --git a/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts b/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts index 286b7f55..0088b6a7 100644 --- a/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts +++ b/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts @@ -6,7 +6,7 @@ import { DraggedDataEvent } from '../../../cartography/events/event-source'; import { NodesEventSource } from '../../../cartography/events/nodes-event-source'; import { MapLabel } from '../../../cartography/models/map/map-label'; import { Node } from '../../../cartography/models/node'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { NodeService } from '../../../services/node.service'; @Component({ @@ -15,7 +15,7 @@ import { NodeService } from '../../../services/node.service'; styleUrls: ['./node-label-dragged.component.scss'], }) export class NodeLabelDraggedComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller:Controller ; private nodeLabelDragged: Subscription; constructor( diff --git a/src/app/components/drawings-listeners/text-added/text-added.component.ts b/src/app/components/drawings-listeners/text-added/text-added.component.ts index a3c770e6..21bf78be 100644 --- a/src/app/components/drawings-listeners/text-added/text-added.component.ts +++ b/src/app/components/drawings-listeners/text-added/text-added.component.ts @@ -9,7 +9,7 @@ import { Context } from '../../../cartography/models/context'; import { Drawing } from '../../../cartography/models/drawing'; import { TextElement } from '../../../cartography/models/drawings/text-element'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { DrawingService } from '../../../services/drawing.service'; @Component({ @@ -18,7 +18,7 @@ import { DrawingService } from '../../../services/drawing.service'; styleUrls: ['./text-added.component.scss'], }) export class TextAddedComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller: Controller; @Input() project: Project; @Output() drawingSaved = new EventEmitter(); private textAdded: Subscription; diff --git a/src/app/components/drawings-listeners/text-edited/text-edited.component.ts b/src/app/components/drawings-listeners/text-edited/text-edited.component.ts index 424711da..053a3c36 100644 --- a/src/app/components/drawings-listeners/text-edited/text-edited.component.ts +++ b/src/app/components/drawings-listeners/text-edited/text-edited.component.ts @@ -7,7 +7,7 @@ import { TextEditedDataEvent } from '../../../cartography/events/event-source'; import { Drawing } from '../../../cartography/models/drawing'; import { TextElement } from '../../../cartography/models/drawings/text-element'; import { MapDrawing } from '../../../cartography/models/map/map-drawing'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { DrawingService } from '../../../services/drawing.service'; @Component({ @@ -16,7 +16,7 @@ import { DrawingService } from '../../../services/drawing.service'; styleUrls: ['./text-edited.component.scss'], }) export class TextEditedComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller: Controller; private textEdited: Subscription; constructor( diff --git a/src/app/components/export-portable-project/export-portable-project.component.ts b/src/app/components/export-portable-project/export-portable-project.component.ts index 540574ed..71751fd9 100644 --- a/src/app/components/export-portable-project/export-portable-project.component.ts +++ b/src/app/components/export-portable-project/export-portable-project.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Project } from '../../models/project'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { ProjectService } from '../../services/project.service'; @Component({ @@ -16,7 +16,7 @@ export class ExportPortableProjectComponent implements OnInit { compression_methods: any = []; compression_level: any = []; compression_filter_value: any = []; - controller: Server; + controller:Controller ; project: Project; index: number = 4; fileName: string; diff --git a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts index 7fc34798..c8875178 100644 --- a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts +++ b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts @@ -5,10 +5,10 @@ import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { ImageManagerService } from 'app/services/image-manager.service'; -import { ServerService } from '../../../services/server.service'; -import { MockedServerService } from '../../../services/server.service.spec'; +import { ControllerService } from '../../../services/controller.service'; +import { MockedServerService } from '../../../services/controller.service.spec'; import { of } from 'rxjs'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { AddImageDialogComponent } from './add-image-dialog.component'; import { NO_ERRORS_SCHEMA } from '@angular/core'; @@ -17,7 +17,7 @@ import { MockedToasterService } from 'app/services/toaster.service.spec'; import { MatSnackBarModule } from '@angular/material/snack-bar'; export class MockedImageManagerService { - public getImages(controller: Server) { + public getImages(controller:Controller ) { return of(); } @@ -42,7 +42,7 @@ describe('AddImageDialogComponent', () => { MatSnackBarModule ], providers: [ - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: ImageManagerService, useValue: mockedImageManagerService }, { provide: MAT_DIALOG_DATA, useValue: {} }, { provide: MatDialogRef, useValue: {} }, diff --git a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts index 2f5bb5b4..f796ac48 100644 --- a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts +++ b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts @@ -3,7 +3,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { UploadServiceService } from 'app/common/uploading-processbar/upload-service.service'; import { FileItem, FileUploader, ParsedResponseHeaders } from 'ng2-file-upload'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ImageManagerService } from '../../../services/image-manager.service'; import { ToasterService } from '../../../services/toaster.service'; @@ -20,7 +20,7 @@ import { ToasterService } from '../../../services/toaster.service'; ], }) export class AddImageDialogComponent implements OnInit { - controller: Server; + controller:Controller ; isInstallAppliance: boolean = false; install_appliance: boolean = false; selectFile: any = []; diff --git a/src/app/components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component.spec.ts b/src/app/components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component.spec.ts index 99a96b83..1f80e7be 100644 --- a/src/app/components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component.spec.ts +++ b/src/app/components/image-manager/deleteallfiles-dialog/deleteallfiles-dialog.component.spec.ts @@ -7,17 +7,17 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { ToasterService } from 'app/services/toaster.service'; import { MockedToasterService } from 'app/services/toaster.service.spec'; -import { Server } from 'http'; +import{ Server } from 'http'; import { of } from 'rxjs'; import { ImageManagerService } from '../../../services/image-manager.service'; -import { ServerService } from '../../../services/server.service'; -import { MockedServerService } from '../../../services/server.service.spec'; +import { ControllerService } from '../../../services/controller.service'; +import { MockedServerService } from '../../../services/controller.service.spec'; import { ImageManagerComponent } from '../image-manager.component'; import { DeleteAllImageFilesDialogComponent } from './deleteallfiles-dialog.component'; export class MockedImageManagerService { - public deleteALLFile(controller: Server, image_path) { + public deleteALLFile(controller:Server , image_path) { return of(); } } @@ -39,7 +39,7 @@ export class MockedImageManagerService { MatDialogModule, ], providers: [ - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: ImageManagerService, useValue: mockedImageManagerService }, { provide: MAT_DIALOG_DATA, useValue: {} }, { provide: MatDialogRef, useValue: {} }, diff --git a/src/app/components/image-manager/image-manager.component.spec.ts b/src/app/components/image-manager/image-manager.component.spec.ts index e8f2af81..4753bc8d 100644 --- a/src/app/components/image-manager/image-manager.component.spec.ts +++ b/src/app/components/image-manager/image-manager.component.spec.ts @@ -6,10 +6,10 @@ import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { ImageManagerService } from 'app/services/image-manager.service'; -import { ServerService } from 'app/services/server.service'; -import { MockedServerService } from 'app/services/server.service.spec'; +import { ControllerService } from 'app/services/controller.service'; +import { MockedServerService } from 'app/services/controller.service.spec'; import { of } from 'rxjs'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { ImageManagerComponent } from './image-manager.component'; import { Image } from '../../models/images'; @@ -23,11 +23,11 @@ import { ToasterService } from 'app/services/toaster.service'; import { MockedToasterService } from 'app/services/toaster.service.spec'; export class MockedImageManagerService { - public getImages(controller: Server) { + public getImages(controller:Controller ) { return of(); } - public deleteFile(controller: Server, image_path) { + public deleteFile(controller:Controller , image_path) { return of(); } @@ -59,7 +59,7 @@ describe('ImageManagerComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: ImageManagerService, useValue: mockedImageManagerService }, { provide: ProgressService, useValue: mockedProgressService }, { provide: VersionService, useValue: mockedVersionService }, diff --git a/src/app/components/image-manager/image-manager.component.ts b/src/app/components/image-manager/image-manager.component.ts index bfacad47..e6e99452 100644 --- a/src/app/components/image-manager/image-manager.component.ts +++ b/src/app/components/image-manager/image-manager.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { ServerService } from '../../services/server.service'; +import { ControllerService } from '../../services/controller.service'; import { VersionService } from '../../services/version.service'; import { ProgressService } from 'app/common/progress/progress.service'; import { Image } from '../../models/images'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { ImageManagerService } from "../../services/image-manager.service"; import { DataSource, SelectionModel } from '@angular/cdk/collections'; import { AddImageDialogComponent } from './add-image-dialog/add-image-dialog.component'; @@ -19,7 +19,7 @@ import { imageDataSource, imageDatabase } from "./image-database-file"; styleUrls: ['./image-manager.component.scss'] }) export class ImageManagerComponent implements OnInit { - controller: Server; + controller:Controller ; public version: string; dataSource: imageDataSource; imageDatabase = new imageDatabase(); @@ -32,7 +32,7 @@ export class ImageManagerComponent implements OnInit { private imageService: ImageManagerService, private progressService: ProgressService, private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private versionService: VersionService, private dialog: MatDialog, private toasterService: ToasterService, @@ -41,7 +41,7 @@ export class ImageManagerComponent implements OnInit { ngOnInit(): void { let controller_id = parseInt(this.route.snapshot.paramMap.get('controller_id')); - this.serverService.get(controller_id).then((controller: Server) => { + this.serverService.get(controller_id).then((controller:Controller ) => { this.controller = controller; if (controller.authToken) { this.getImages() diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts index 50a31707..be9b40e5 100644 --- a/src/app/components/login/login.component.ts +++ b/src/app/components/login/login.component.ts @@ -2,11 +2,11 @@ import { Component, DoCheck, OnInit, ViewEncapsulation } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { AuthResponse } from '../../models/authResponse'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { Version } from '../../models/version'; import { LoginService } from '../../services/login.service'; -import { ServerDatabase } from '../../services/server.database'; -import { ServerService } from '../../services/server.service'; +import { ControllerDatabase } from '../../services/controller.database'; +import { ControllerService } from '../../services/controller.service'; import { ThemeService } from '../../services/theme.service'; import { ToasterService } from '../../services/toaster.service'; import { VersionService } from '../../services/version.service'; @@ -18,7 +18,7 @@ import { VersionService } from '../../services/version.service'; encapsulation: ViewEncapsulation.None, }) export class LoginComponent implements OnInit, DoCheck { - private controller: Server; + private controller:Controller ; public version: string; public isLightThemeEnabled: boolean = false; public loginError: boolean = false; @@ -33,8 +33,8 @@ export class LoginComponent implements OnInit, DoCheck { constructor( private loginService: LoginService, - private serverService: ServerService, - private serverDatabase: ServerDatabase, + private serverService: ControllerService, + private serverDatabase: ControllerDatabase, private route: ActivatedRoute, private router: Router, private toasterService: ToasterService, @@ -45,7 +45,7 @@ export class LoginComponent implements OnInit, DoCheck { async ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/'; - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; if (controller.authToken) { diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts index d8467cf1..ec732096 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts @@ -10,12 +10,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { CloudTemplate } from '../../../../../models/templates/cloud-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ComputeService } from '../../../../../services/compute.service'; -import { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -24,7 +24,7 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { CloudNodesAddTemplateComponent } from './cloud-nodes-add-template.component'; export class MockedBuiltInTemplatesService { - public addTemplate(controller: Server, cloudTemplate: CloudTemplate) { + public addTemplate(controller:Controller , cloudTemplate: CloudTemplate) { return of(cloudTemplate); } } @@ -56,7 +56,7 @@ describe('CloudNodesAddTemplateComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: ComputeService, useValue: mockedComputeService }, @@ -80,7 +80,7 @@ describe('CloudNodesAddTemplateComponent', () => { it('should call add template', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as CloudTemplate)); component.templateName = 'sample name'; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.formGroup.controls['templateName'].setValue('template name'); component.addTemplate(); @@ -92,7 +92,7 @@ describe('CloudNodesAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as CloudTemplate)); spyOn(mockedToasterService, 'error'); component.templateName = ''; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts index 04c499b9..2dc9b2c3 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts @@ -3,11 +3,11 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; import { Compute } from '../../../../../models/compute'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { CloudTemplate } from '../../../../../models/templates/cloud-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ComputeService } from '../../../../../services/compute.service'; -import { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { TemplateMocksService } from '../../../../../services/template-mocks.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -17,14 +17,14 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['./cloud-nodes-add-template.component.scss', '../../../preferences.component.scss'], }) export class CloudNodesAddTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; templateName: string = ''; formGroup: FormGroup; isLocalComputerChosen: boolean = true; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private builtInTemplatesService: BuiltInTemplatesService, private router: Router, private toasterService: ToasterService, @@ -39,7 +39,7 @@ export class CloudNodesAddTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts index 32e425c7..5d761cc8 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts @@ -11,23 +11,23 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; 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 { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } from '../../../../../services/controller.service.spec'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { CloudNodesTemplateDetailsComponent } from './cloud-nodes-template-details.component'; export class MockedBuiltInTemplatesService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({ ports_mapping: [] } as CloudTemplate); } - public saveTemplate(controller: Server, cloudTemplate: CloudTemplate) { + public saveTemplate(controller:Controller , cloudTemplate: CloudTemplate) { return of(cloudTemplate); } } @@ -60,7 +60,7 @@ describe('CloudNodesTemplateDetailsComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: BuiltInTemplatesConfigurationService, useClass: BuiltInTemplatesConfigurationService }, diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts index 646d9b20..0b2cce7c 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { PortsMappingEntity } from '../../../../../models/ethernetHub/ports-mapping-enity'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; 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 { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { ToasterService } from '../../../../../services/toaster.service'; @Component({ @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['./cloud-nodes-template-details.component.scss', '../../../preferences.component.scss'], }) export class CloudNodesTemplateDetailsComponent implements OnInit { - controller: Server; + controller:Controller ; cloudNodeTemplate: CloudTemplate; isSymbolSelectionOpened: boolean = false; @@ -34,7 +34,7 @@ export class CloudNodesTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private builtInTemplatesService: BuiltInTemplatesService, private toasterService: ToasterService, private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService, @@ -49,7 +49,7 @@ export class CloudNodesTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts index d33b4f0e..f8d84642 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { CloudTemplate } from '../../../../../models/templates/cloud-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } from '../../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { CloudNodesTemplatesComponent } from './cloud-nodes-templates.component'; export class MockedBuiltInTemplatesService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as CloudTemplate]); } } @@ -47,7 +47,7 @@ describe('CloudNodesTemplatesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, ], declarations: [CloudNodesTemplatesComponent], diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts index c25f763f..d0b92334 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { CloudTemplate } from '../../../../../models/templates/cloud-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { DeleteTemplateComponent } from '../../../common/delete-template-component/delete-template.component'; @Component({ @@ -12,19 +12,19 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone styleUrls: ['./cloud-nodes-templates.component.scss', '../../../preferences.component.scss'], }) export class CloudNodesTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; cloudNodesTemplates: CloudTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private builtInTemplatesService: BuiltInTemplatesService ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts index 02325958..219cd37f 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts @@ -10,12 +10,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ComputeService } from '../../../../../services/compute.service'; -import { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -24,7 +24,7 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetHubsAddTemplateComponent } from './ethernet-hubs-add-template.component'; export class MockedBuiltInTemplatesService { - public addTemplate(controller: Server, ethernetHubTemplate: EthernetHubTemplate) { + public addTemplate(controller:Controller , ethernetHubTemplate: EthernetHubTemplate) { return of(ethernetHubTemplate); } } @@ -59,7 +59,7 @@ describe('EthernetHubsAddTemplateComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: ComputeService, useValue: mockedComputeService }, @@ -83,7 +83,7 @@ describe('EthernetHubsAddTemplateComponent', () => { it('should call add template', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); component.templateName = 'sample name'; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.formGroup.controls['templateName'].setValue('template name'); component.formGroup.controls['numberOfPorts'].setValue('1'); @@ -96,7 +96,7 @@ describe('EthernetHubsAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); spyOn(mockedToasterService, 'error'); component.templateName = ''; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -108,7 +108,7 @@ describe('EthernetHubsAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); spyOn(mockedToasterService, 'error'); component.templateName = 'sample name'; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts index 4a7dc04d..8d6a79cd 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts @@ -3,11 +3,11 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; import { Compute } from '../../../../../models/compute'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ComputeService } from '../../../../../services/compute.service'; -import { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { TemplateMocksService } from '../../../../../services/template-mocks.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -17,14 +17,14 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['./ethernet-hubs-add-template.component.scss', '../../../preferences.component.scss'], }) export class EthernetHubsAddTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; templateName: string = ''; formGroup: FormGroup; isLocalComputerChosen: boolean = true; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private builtInTemplatesService: BuiltInTemplatesService, private router: Router, private toasterService: ToasterService, @@ -40,7 +40,7 @@ export class EthernetHubsAddTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts index ad099226..a652174a 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts @@ -11,23 +11,23 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } from '../../../../../services/controller.service.spec'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetHubsTemplateDetailsComponent } from './ethernet-hubs-template-details.component'; export class MockedBuiltInTemplatesService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({ ports_mapping: [] } as EthernetHubTemplate); } - public saveTemplate(controller: Server, cloudTemplate: EthernetHubTemplate) { + public saveTemplate(controller:Controller , cloudTemplate: EthernetHubTemplate) { return of(cloudTemplate); } } @@ -60,7 +60,7 @@ describe('EthernetHubsTemplateDetailsComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: BuiltInTemplatesConfigurationService, useClass: BuiltInTemplatesConfigurationService }, diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts index f9769dd3..8505d067 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { ToasterService } from '../../../../../services/toaster.service'; @Component({ @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['./ethernet-hubs-template-details.component.scss', '../../../preferences.component.scss'], }) export class EthernetHubsTemplateDetailsComponent implements OnInit { - controller: Server; + controller:Controller ; ethernetHubTemplate: EthernetHubTemplate; numberOfPorts: number; inputForm: FormGroup; @@ -24,7 +24,7 @@ export class EthernetHubsTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private builtInTemplatesService: BuiltInTemplatesService, private toasterService: ToasterService, private formBuilder: FormBuilder, @@ -41,7 +41,7 @@ export class EthernetHubsTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.categories = this.builtInTemplatesConfigurationService.getCategoriesForEthernetHubs(); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts index 344ba992..723c2236 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } from '../../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetHubsTemplatesComponent } from './ethernet-hubs-templates.component'; export class MockedBuiltInTemplatesService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as EthernetHubTemplate]); } } @@ -47,7 +47,7 @@ describe('EthernetHubsTemplatesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, ], declarations: [EthernetHubsTemplatesComponent], diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts index 67d4e982..496c0958 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { DeleteTemplateComponent } from '../../../common/delete-template-component/delete-template.component'; @Component({ @@ -12,19 +12,19 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone styleUrls: ['./ethernet-hubs-templates.component.scss', '../../../preferences.component.scss'], }) export class EthernetHubsTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; ethernetHubsTemplates: EthernetHubTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private builtInTemplatesService: BuiltInTemplatesService ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts index 30bc120b..fbc4101c 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts @@ -10,12 +10,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ComputeService } from '../../../../../services/compute.service'; -import { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -24,7 +24,7 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetSwitchesAddTemplateComponent } from './ethernet-switches-add-template.component'; export class MockedBuiltInTemplatesService { - public addTemplate(controller: Server, ethernetHubTemplate: EthernetSwitchTemplate) { + public addTemplate(controller:Controller , ethernetHubTemplate: EthernetSwitchTemplate) { return of(ethernetHubTemplate); } } @@ -59,7 +59,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: ComputeService, useValue: mockedComputeService }, @@ -83,7 +83,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => { it('should call add template', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); component.templateName = 'sample name'; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.formGroup.controls['templateName'].setValue('template name'); component.formGroup.controls['numberOfPorts'].setValue('1'); @@ -96,7 +96,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); spyOn(mockedToasterService, 'error'); component.formGroup.controls['numberOfPorts'].setValue('1'); - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -108,7 +108,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); spyOn(mockedToasterService, 'error'); component.formGroup.controls['templateName'].setValue('template name'); - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts index 89d49349..c1086c06 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts @@ -3,11 +3,11 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; import { Compute } from '../../../../../models/compute'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { ComputeService } from '../../../../../services/compute.service'; -import { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { TemplateMocksService } from '../../../../../services/template-mocks.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -17,14 +17,14 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['./ethernet-switches-add-template.component.scss', '../../../preferences.component.scss'], }) export class EthernetSwitchesAddTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; templateName: string = ''; formGroup: FormGroup; isLocalComputerChosen: boolean = true; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private builtInTemplatesService: BuiltInTemplatesService, private router: Router, private toasterService: ToasterService, @@ -40,7 +40,7 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts index 80c68ff6..2aa6a7bc 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts @@ -11,12 +11,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -24,11 +24,11 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetSwitchesTemplateDetailsComponent } from './ethernet-switches-template-details.component'; export class MockedBuiltInTemplatesService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({ ports_mapping: [] } as EthernetSwitchTemplate); } - public saveTemplate(controller: Server, cloudTemplate: EthernetSwitchTemplate) { + public saveTemplate(controller:Controller , cloudTemplate: EthernetSwitchTemplate) { return of(cloudTemplate); } } @@ -61,7 +61,7 @@ describe('EthernetSwitchesTemplateDetailsComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: BuiltInTemplatesConfigurationService, useClass: BuiltInTemplatesConfigurationService }, diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts index 02fc0b84..d1634532 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { PortsComponent } from '../../../common/ports/ports.component'; @@ -16,7 +16,7 @@ import { PortsComponent } from '../../../common/ports/ports.component'; }) export class EthernetSwitchesTemplateDetailsComponent implements OnInit { @ViewChild(PortsComponent) portsComponent: PortsComponent; - controller: Server; + controller:Controller ; ethernetSwitchTemplate: EthernetSwitchTemplate; inputForm: FormGroup; isSymbolSelectionOpened: boolean = false; @@ -25,7 +25,7 @@ export class EthernetSwitchesTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private builtInTemplatesService: BuiltInTemplatesService, private toasterService: ToasterService, private formBuilder: FormBuilder, @@ -42,7 +42,7 @@ export class EthernetSwitchesTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts index efd35670..ca1fa45a 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } from '../../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetSwitchesTemplatesComponent } from './ethernet-switches-templates.component'; export class MockedBuiltInTemplatesService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as EthernetSwitchTemplate]); } } @@ -47,7 +47,7 @@ describe('EthernetSwitchesTemplatesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, ], declarations: [EthernetSwitchesTemplatesComponent], diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts index 9675fa67..b6919ef9 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template'; import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; -import { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { DeleteTemplateComponent } from '../../../common/delete-template-component/delete-template.component'; @Component({ @@ -12,19 +12,19 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone styleUrls: ['./ethernet-switches-templates.component.scss', '../../../preferences.component.scss'], }) export class EthernetSwitchesTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; ethernetSwitchesTemplates: EthernetSwitchTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private builtInTemplatesService: BuiltInTemplatesService ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts index 66a2dab7..ae222c57 100644 --- a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts +++ b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { TemplateService } from '../../../../services/template.service'; import { ToasterService } from '../../../../services/toaster.service'; import { DeleteConfirmationDialogComponent } from '../delete-confirmation-dialog/delete-confirmation-dialog.component'; @@ -11,7 +11,7 @@ import { DeleteConfirmationDialogComponent } from '../delete-confirmation-dialog styleUrls: ['./delete-template.component.scss'], }) export class DeleteTemplateComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Output() deleteEvent = new EventEmitter(); constructor( diff --git a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts index c19cca68..1db2a26a 100644 --- a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts +++ b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; @Component({ selector: 'app-symbols-menu', @@ -7,7 +7,7 @@ import { Server } from '../../../../models/server'; styleUrls: ['./symbols-menu.component.scss', '../../preferences.component.scss'], }) export class SymbolsMenuComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() symbol: string; @Output() symbolChangedEmitter = new EventEmitter(); diff --git a/src/app/components/preferences/common/symbols/symbols.component.ts b/src/app/components/preferences/common/symbols/symbols.component.ts index 3738bd9e..0e82e324 100644 --- a/src/app/components/preferences/common/symbols/symbols.component.ts +++ b/src/app/components/preferences/common/symbols/symbols.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { environment } from 'environments/environment'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { Symbol } from '../../../../models/symbol'; import { SymbolService } from '../../../../services/symbol.service'; @@ -10,7 +10,7 @@ import { SymbolService } from '../../../../services/symbol.service'; styleUrls: ['./symbols.component.scss'], }) export class SymbolsComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() symbol: string; @Output() symbolChanged = new EventEmitter(); diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts index 09e6c04b..b6902eeb 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts @@ -18,12 +18,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerConfigurationService } from '../../../../services/docker-configuration.service'; import { DockerService } from '../../../../services/docker.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -31,7 +31,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddDockerTemplateComponent } from './add-docker-template.component'; export class MockedDockerService { - public addTemplate(controller: Server, dockerTemplate: DockerTemplate) { + public addTemplate(controller:Controller , dockerTemplate: DockerTemplate) { return of(dockerTemplate); } } @@ -72,7 +72,7 @@ xdescribe('AddDockerTemplateComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: DockerService, useValue: mockedDockerService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: TemplateMocksService, useClass: TemplateMocksService }, diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts index 3c852646..435c0ff8 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts @@ -4,12 +4,12 @@ import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; import { Compute } from '../../../../models/compute'; import { DockerImage } from '../../../../models/docker/docker-image'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { DockerTemplate } from '../../../../models/templates/docker-template'; import { ComputeService } from '../../../../services/compute.service'; import { DockerConfigurationService } from '../../../../services/docker-configuration.service'; import { DockerService } from '../../../../services/docker.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; @@ -19,7 +19,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./add-docker-template.component.scss', '../../preferences.component.scss'], }) export class AddDockerTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; dockerTemplate: DockerTemplate; consoleTypes: string[] = []; isRemoteComputerChosen: boolean = false; @@ -34,7 +34,7 @@ export class AddDockerTemplateComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private dockerService: DockerService, private toasterService: ToasterService, private router: Router, @@ -60,7 +60,7 @@ export class AddDockerTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.consoleTypes = this.configurationService.getConsoleTypes(); diff --git a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts index 6a244d8b..7f111601 100644 --- a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts +++ b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts @@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerService } from '../../../../services/docker.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; @Component({ @@ -14,14 +14,14 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./copy-docker-template.component.scss', '../../preferences.component.scss'], }) export class CopyDockerTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; templateName: string = ''; dockerTemplate: DockerTemplate; templateNameForm: FormGroup; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private dockerService: DockerService, private toasterService: ToasterService, private router: Router, @@ -35,7 +35,7 @@ export class CopyDockerTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.dockerService.getTemplate(this.controller, template_id).subscribe((dockerTemplate: DockerTemplate) => { diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts index 8c39f9ba..d5c3086b 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts @@ -10,23 +10,23 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerConfigurationService } from '../../../../services/docker-configuration.service'; import { DockerService } from '../../../../services/docker.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { DockerTemplateDetailsComponent } from './docker-template-details.component'; export class MockedDockerService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({} as DockerTemplate); } - public saveTemplate(controller: Server, dockerTemplate: DockerTemplate) { + public saveTemplate(controller:Controller , dockerTemplate: DockerTemplate) { return of(dockerTemplate); } } @@ -58,7 +58,7 @@ describe('DockerTemplateDetailsComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: DockerService, useValue: mockedDockerService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: DockerConfigurationService, useClass: DockerConfigurationService }, diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts index 522fbec4..fdb4a757 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts @@ -2,11 +2,11 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerConfigurationService } from '../../../../services/docker-configuration.service'; import { DockerService } from '../../../../services/docker.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; @Component({ @@ -15,7 +15,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./docker-template-details.component.scss', '../../preferences.component.scss'], }) export class DockerTemplateDetailsComponent implements OnInit { - controller: Server; + controller:Controller ; dockerTemplate: DockerTemplate; isSymbolSelectionOpened: boolean = false; @@ -30,7 +30,7 @@ export class DockerTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private dockerService: DockerService, private toasterService: ToasterService, private configurationService: DockerConfigurationService, @@ -48,7 +48,7 @@ export class DockerTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts index 27f863e2..66c86de7 100644 --- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts +++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerService } from '../../../../services/docker.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { DockerTemplatesComponent } from './docker-templates.component'; export class MockedDockerService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as DockerTemplate]); } } @@ -44,7 +44,7 @@ describe('DockerTemplatesComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: DockerService, useValue: mockedDockerService }, ], declarations: [DockerTemplatesComponent], diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts index 6d313dbc..ab9df347 100644 --- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts +++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerService } from '../../../../services/docker.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; @Component({ @@ -12,20 +12,20 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./docker-templates.component.scss', '../../preferences.component.scss'], }) export class DockerTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; dockerTemplates: DockerTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private dockerService: DockerService, private router: Router ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts index c3abd2a7..6d683835 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts @@ -16,12 +16,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosConfigurationService } from '../../../../services/ios-configuration.service'; import { IosService } from '../../../../services/ios.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -29,7 +29,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddIosTemplateComponent } from './add-ios-template.component'; export class MockedIosService { - public addTemplate(controller: Server, iosTemplate: IosTemplate) { + public addTemplate(controller:Controller , iosTemplate: IosTemplate) { return of(iosTemplate); } } @@ -67,7 +67,7 @@ xdescribe('AddIosTemplateComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: IosService, useValue: mockedIosService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: TemplateMocksService, useClass: TemplateMocksService }, @@ -95,7 +95,7 @@ xdescribe('AddIosTemplateComponent', () => { component.iosNameForm.controls['platform'].setValue('platform'); component.iosNameForm.controls['chassis'].setValue('chassis'); component.iosMemoryForm.controls['memory'].setValue(0); - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -109,7 +109,7 @@ xdescribe('AddIosTemplateComponent', () => { component.iosNameForm.controls['platform'].setValue('platform'); component.iosNameForm.controls['chassis'].setValue('chassis'); component.iosMemoryForm.controls['memory'].setValue(0); - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -122,7 +122,7 @@ xdescribe('AddIosTemplateComponent', () => { component.iosNameForm.controls['platform'].setValue('platform'); component.iosNameForm.controls['chassis'].setValue('chassis'); component.iosMemoryForm.controls['memory'].setValue(0); - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -135,7 +135,7 @@ xdescribe('AddIosTemplateComponent', () => { component.iosNameForm.controls['templateName'].setValue('template name'); component.iosNameForm.controls['platform'].setValue('platform'); component.iosNameForm.controls['chassis'].setValue('chassis'); - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts index 4444d1d7..af30f6a2 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts @@ -10,12 +10,12 @@ import { Subscription } from 'rxjs'; import { v4 as uuid } from 'uuid'; import { Compute } from '../../../../models/compute'; import { IosImage } from '../../../../models/images/ios-image'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IosTemplate } from '../../../../models/templates/ios-template'; import { ComputeService } from '../../../../services/compute.service'; import { IosConfigurationService } from '../../../../services/ios-configuration.service'; import { IosService } from '../../../../services/ios.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; @@ -25,7 +25,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./add-ios-template.component.scss', '../../preferences.component.scss'], }) export class AddIosTemplateComponent implements OnInit, OnDestroy { - controller: Server; + controller:Controller ; iosTemplate: IosTemplate; isEtherSwitchRouter: boolean = false; @@ -56,7 +56,7 @@ export class AddIosTemplateComponent implements OnInit, OnDestroy { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private iosService: IosService, private toasterService: ToasterService, private formBuilder: FormBuilder, @@ -113,7 +113,7 @@ export class AddIosTemplateComponent implements OnInit, OnDestroy { }) const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getImages(); diff --git a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts index 6b9a37e7..b3cae709 100644 --- a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts +++ b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts @@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosService } from '../../../../services/ios.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; @Component({ @@ -14,14 +14,14 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./copy-ios-template.component.scss', '../../preferences.component.scss'], }) export class CopyIosTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; templateName: string = ''; iosTemplate: IosTemplate; formGroup: FormGroup; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private iosService: IosService, private toasterService: ToasterService, private router: Router, @@ -35,7 +35,7 @@ export class CopyIosTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.iosService.getTemplate(this.controller, template_id).subscribe((iosTemplate: IosTemplate) => { diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts index 8ece3229..4bf212c0 100644 --- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts +++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts @@ -9,10 +9,10 @@ import { MatToolbarModule } from '@angular/material/toolbar'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { ServerSettingsService } from '../../../../services/server-settings.service'; -import { MockedServerSettingsService } from '../../../../services/server-settings.service.spec'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +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 { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; @@ -24,7 +24,7 @@ describe('DynamipsPreferencesComponent', () => { let mockedServerService = new MockedServerService(); let activatedRoute = new MockedActivatedRoute().get(); - let mockedServerSettingsService = new MockedServerSettingsService(); + let mockedServerSettingsService = new MockedControllerSettingsService(); let mockedToasterService = new MockedToasterService(); beforeEach(async() => { @@ -44,8 +44,8 @@ describe('DynamipsPreferencesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, - { provide: ServerSettingsService, useValue: mockedServerSettingsService }, + { provide: ControllerService, useValue: mockedServerService }, + { provide: ControllerSettingsService, useValue: mockedServerSettingsService }, { provide: ToasterService, useValue: mockedToasterService }, ], declarations: [DynamipsPreferencesComponent], diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts index d655411a..fafbc70f 100644 --- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts +++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../models/server'; -import { ServerSettingsService } from '../../../../services/server-settings.service'; -import { ServerService } from '../../../../services/server.service'; +import{ Controller } from '../../../../models/controller'; +import { ControllerSettingsService } from '../../../../services/controller-settings.service'; +import { ControllerService } from '../../../../services/controller.service'; @Component({ selector: 'app-dynamips-preferences', @@ -10,18 +10,18 @@ import { ServerService } from '../../../../services/server.service'; styleUrls: ['./dynamips-preferences.component.scss'], }) export class DynamipsPreferencesComponent implements OnInit { - controller: Server; + controller:Controller ; dynamipsPath: string; constructor( private route: ActivatedRoute, - private serverService: ServerService, - private serverSettingsService: ServerSettingsService + private serverService: ControllerService, + private controllerSettingsService: ControllerSettingsService ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts index 38993854..35a59d44 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts @@ -10,23 +10,23 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosConfigurationService } from '../../../../services/ios-configuration.service'; import { IosService } from '../../../../services/ios.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IosTemplateDetailsComponent } from './ios-template-details.component'; export class MockedIosService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({} as IosTemplate); } - public saveTemplate(controller: Server, iosTemplate: IosTemplate) { + public saveTemplate(controller:Controller , iosTemplate: IosTemplate) { return of(iosTemplate); } } @@ -58,7 +58,7 @@ describe('IosTemplateDetailsComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: IosService, useValue: mockedIosService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: IosConfigurationService, useClass: IosConfigurationService }, diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts index 076a1903..c8f46af3 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosConfigurationService } from '../../../../services/ios-configuration.service'; import { IosService } from '../../../../services/ios.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; @Component({ @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./ios-template-details.component.scss', '../../preferences.component.scss'], }) export class IosTemplateDetailsComponent implements OnInit { - controller: Server; + controller:Controller ; iosTemplate: IosTemplate; isSymbolSelectionOpened: boolean = false; @@ -37,7 +37,7 @@ export class IosTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private iosService: IosService, private toasterService: ToasterService, private formBuilder: FormBuilder, @@ -71,7 +71,7 @@ export class IosTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts index 08710928..5865eeff 100644 --- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts +++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosService } from '../../../../services/ios.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IosTemplatesComponent } from './ios-templates.component'; export class MockedIosService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as IosTemplate]); } } @@ -47,7 +47,7 @@ describe('IosTemplatesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: IosService, useValue: mockedIosService }, ], declarations: [IosTemplatesComponent], diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts index d14677b9..c87c8e8c 100644 --- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts +++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IosTemplate } from '../../../../models/templates/ios-template'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; import { IosService } from '../../../../services/ios.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; @Component({ @@ -13,20 +13,20 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./ios-templates.component.scss', '../../preferences.component.scss'], }) export class IosTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; iosTemplates: IosTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private iosService: IosService, private router: Router ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts index 4dddccb5..b587917f 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts @@ -16,12 +16,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouConfigurationService } from '../../../../services/iou-configuration.service'; import { IouService } from '../../../../services/iou.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -29,7 +29,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddIouTemplateComponent } from './add-iou-template.component'; export class MockedIouService { - public addTemplate(controller: Server, iouTemplate: IouTemplate) { + public addTemplate(controller:Controller , iouTemplate: IouTemplate) { return of(iouTemplate); } } @@ -67,7 +67,7 @@ xdescribe('AddIouTemplateComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: IouService, useValue: mockedIouService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: TemplateMocksService, useClass: TemplateMocksService }, @@ -93,7 +93,7 @@ xdescribe('AddIouTemplateComponent', () => { component.templateNameForm.controls['templateName'].setValue('sample name'); component.imageForm.controls['imageName'].setValue('sample name'); component.newImageSelected = true; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -104,7 +104,7 @@ xdescribe('AddIouTemplateComponent', () => { spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); component.imageForm.controls['imageName'].setValue('sample name'); component.newImageSelected = true; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -115,7 +115,7 @@ xdescribe('AddIouTemplateComponent', () => { spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); component.templateNameForm.controls['templateName'].setValue('sample name'); component.newImageSelected = true; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts index 8e376ceb..af2b2f06 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts @@ -9,11 +9,11 @@ import { Subscription } from 'rxjs'; import { v4 as uuid } from 'uuid'; import { Compute } from '../../../../models/compute'; import { IouImage } from '../../../../models/iou/iou-image'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IouTemplate } from '../../../../models/templates/iou-template'; import { ComputeService } from '../../../../services/compute.service'; import { IouService } from '../../../../services/iou.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; @@ -23,7 +23,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./add-iou-template.component.scss', '../../preferences.component.scss'], }) export class AddIouTemplateComponent implements OnInit, OnDestroy { - controller: Server; + controller:Controller ; iouTemplate: IouTemplate; isRemoteComputerChosen: boolean = false; newImageSelected: boolean = false; @@ -40,7 +40,7 @@ export class AddIouTemplateComponent implements OnInit, OnDestroy { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private iouService: IouService, private toasterService: ToasterService, private router: Router, @@ -85,7 +85,7 @@ export class AddIouTemplateComponent implements OnInit, OnDestroy { }; const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getImages(); this.templateMocksService.getIouTemplate().subscribe((iouTemplate: IouTemplate) => { diff --git a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts index 8c89d7ed..d9573459 100644 --- a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts +++ b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts @@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouService } from '../../../../services/iou.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; @Component({ @@ -14,14 +14,14 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./copy-iou-template.component.scss', '../../preferences.component.scss'], }) export class CopyIouTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; templateName: string = ''; iouTemplate: IouTemplate; templateNameForm: FormGroup; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private qemuService: IouService, private toasterService: ToasterService, private router: Router, @@ -35,7 +35,7 @@ export class CopyIouTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.qemuService.getTemplate(this.controller, template_id).subscribe((iouTemplate: IouTemplate) => { diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts index b2d62455..210cfa79 100644 --- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts @@ -10,23 +10,23 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouConfigurationService } from '../../../../services/iou-configuration.service'; import { IouService } from '../../../../services/iou.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IouTemplateDetailsComponent } from './iou-template-details.component'; export class MockedIouService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({} as IouTemplate); } - public saveTemplate(controller: Server, iouTemplate: IouTemplate) { + public saveTemplate(controller:Controller , iouTemplate: IouTemplate) { return of(iouTemplate); } } @@ -55,7 +55,7 @@ describe('IouTemplateDetailsComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: IouService, useValue: mockedIouService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: IouConfigurationService, useClass: IouConfigurationService }, diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts index 0be93573..f5101c17 100644 --- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts +++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouConfigurationService } from '../../../../services/iou-configuration.service'; import { IouService } from '../../../../services/iou.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; @Component({ @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./iou-template-details.component.scss', '../../preferences.component.scss'], }) export class IouTemplateDetailsComponent implements OnInit { - controller: Server; + controller:Controller ; iouTemplate: IouTemplate; isSymbolSelectionOpened: boolean = false; @@ -29,7 +29,7 @@ export class IouTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private iouService: IouService, private toasterService: ToasterService, private configurationService: IouConfigurationService, @@ -53,7 +53,7 @@ export class IouTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts index 7925dffc..89be60ca 100644 --- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouService } from '../../../../services/iou.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IouTemplatesComponent } from './iou-templates.component'; export class MockedIouService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as IouTemplate]); } } @@ -44,7 +44,7 @@ describe('IouTemplatesComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: IouService, useValue: mockedIouService }, ], declarations: [IouTemplatesComponent], diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts index acd07431..4353a529 100644 --- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts +++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouService } from '../../../../services/iou.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; @Component({ @@ -12,20 +12,20 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./iou-templates.component.scss', '../../preferences.component.scss'], }) export class IouTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; iouTemplates: IouTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private iouService: IouService, private router: Router ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts index b8ce77d0..234b4c03 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts @@ -15,12 +15,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuConfigurationService } from '../../../../services/qemu-configuration.service'; import { QemuService } from '../../../../services/qemu.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -28,15 +28,15 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddQemuVmTemplateComponent } from './add-qemu-vm-template.component'; export class MockedQemuService { - public addTemplate(controller: Server, qemuTemplate: QemuTemplate) { + public addTemplate(controller:Controller , qemuTemplate: QemuTemplate) { return of(qemuTemplate); } - public getBinaries(controller: Server) { + public getBinaries(controller:Controller ) { return of([]); } - public getImages(controller: Server) { + public getImages(controller:Controller ) { return of([]); } } @@ -77,7 +77,7 @@ xdescribe('AddQemuVmTemplateComponent', () => { providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, { provide: Router, useValue: router }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: QemuService, useValue: mockedQemuService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: TemplateMocksService, useClass: TemplateMocksService }, @@ -110,7 +110,7 @@ xdescribe('AddQemuVmTemplateComponent', () => { version: 'version', }; component.newImageSelected = true; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -129,7 +129,7 @@ xdescribe('AddQemuVmTemplateComponent', () => { version: 'version', }; component.newImageSelected = true; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -147,7 +147,7 @@ xdescribe('AddQemuVmTemplateComponent', () => { version: 'version', }; component.newImageSelected = true; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts index d237e858..9fb0643f 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts @@ -9,12 +9,12 @@ import { v4 as uuid } from 'uuid'; import { Compute } from '../../../../models/compute'; import { QemuBinary } from '../../../../models/qemu/qemu-binary'; import { QemuImage } from '../../../../models/qemu/qemu-image'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { ComputeService } from '../../../../services/compute.service'; import { QemuConfigurationService } from '../../../../services/qemu-configuration.service'; import { QemuService } from '../../../../services/qemu.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; @@ -24,7 +24,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./add-qemu-vm-template.component.scss', '../../preferences.component.scss'], }) export class AddQemuVmTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; qemuBinaries: QemuBinary[] = []; selectPlatform: string[] = []; selectedPlatform: string; @@ -47,7 +47,7 @@ export class AddQemuVmTemplateComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private qemuService: QemuService, private toasterService: ToasterService, private router: Router, @@ -101,7 +101,7 @@ export class AddQemuVmTemplateComponent implements OnInit { }; const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.templateMocksService.getQemuTemplate().subscribe((qemuTemplate: QemuTemplate) => { diff --git a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts index a98d4c81..492c710d 100644 --- a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts +++ b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts @@ -3,10 +3,10 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; import { QemuBinary } from '../../../../models/qemu/qemu-binary'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuService } from '../../../../services/qemu.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; @Component({ @@ -15,7 +15,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./copy-qemu-vm-template.component.scss', '../../preferences.component.scss'], }) export class CopyQemuVmTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; qemuBinaries: QemuBinary[] = []; templateName: string = ''; qemuTemplate: QemuTemplate; @@ -23,7 +23,7 @@ export class CopyQemuVmTemplateComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private qemuService: QemuService, private toasterService: ToasterService, private router: Router, @@ -37,7 +37,7 @@ export class CopyQemuVmTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.qemuService.getTemplate(this.controller, template_id).subscribe((qemuTemplate: QemuTemplate) => { diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts index e93cfae8..2c541f15 100644 --- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts @@ -10,10 +10,10 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { ServerSettingsService } from '../../../../services/server-settings.service'; -import { MockedServerSettingsService } from '../../../../services/server-settings.service.spec'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +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 { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; @@ -25,7 +25,7 @@ describe('QemuPreferencesComponent', () => { let mockedServerService = new MockedServerService(); let activatedRoute = new MockedActivatedRoute().get(); - let mockedServerSettingsService = new MockedServerSettingsService(); + let mockedServerSettingsService = new MockedControllerSettingsService(); let mockedToasterService = new MockedToasterService(); beforeEach(async() => { @@ -45,8 +45,8 @@ describe('QemuPreferencesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, - { provide: ServerSettingsService, useValue: mockedServerSettingsService }, + { provide: ControllerService, useValue: mockedServerService }, + { provide: ControllerSettingsService, useValue: mockedServerSettingsService }, { provide: ToasterService, useValue: mockedToasterService }, ], declarations: [QemuPreferencesComponent], diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts index 11638f9f..5142f6ef 100644 --- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts +++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { QemuSettings } from '../../../../models/settings/qemu-settings'; -import { ServerSettingsService } from '../../../../services/server-settings.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerSettingsService } from '../../../../services/controller-settings.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; @Component({ @@ -12,22 +12,22 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./qemu-preferences.component.scss'], }) export class QemuPreferencesComponent implements OnInit { - controller: Server; + controller:Controller ; settings: QemuSettings; constructor( private route: ActivatedRoute, - private serverService: ServerService, - private serverSettingsService: ServerSettingsService, + private serverService: ControllerService, + private controllerSettingsService: ControllerSettingsService, private toasterService: ToasterService ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; - this.serverSettingsService.getSettingsForQemu(this.controller).subscribe((settings: QemuSettings) => { + this.controllerSettingsService.getSettingsForQemu(this.controller).subscribe((settings: QemuSettings) => { this.settings = settings; }); }); @@ -38,7 +38,7 @@ export class QemuPreferencesComponent implements OnInit { this.settings.require_hardware_acceleration = false; } - this.serverSettingsService + this.controllerSettingsService .updateSettingsForQemu(this.controller, this.settings) .subscribe((qemuSettings: QemuSettings) => { this.toasterService.success(`Changes applied`); @@ -51,7 +51,7 @@ export class QemuPreferencesComponent implements OnInit { require_hardware_acceleration: true, }; - this.serverSettingsService + this.controllerSettingsService .updateSettingsForQemu(this.controller, defaultSettings) .subscribe((qemuSettings: QemuSettings) => { this.settings = qemuSettings; diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts index 7b504a6c..168491bd 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts @@ -11,31 +11,31 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuConfigurationService } from '../../../../services/qemu-configuration.service'; import { QemuService } from '../../../../services/qemu.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedToasterService } from '../../../../services/toaster.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { QemuVmTemplateDetailsComponent } from './qemu-vm-template-details.component'; export class MockedQemuService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({} as QemuTemplate); } - public saveTemplate(controller: Server, qemuTemplate: QemuTemplate) { + public saveTemplate(controller:Controller , qemuTemplate: QemuTemplate) { return of(qemuTemplate); } - public getBinaries(controller: Server) { + public getBinaries(controller:Controller ) { return of([]); } - public getImages(controller: Server) { + public getImages(controller:Controller ) { return of([]); } } @@ -65,7 +65,7 @@ describe('QemuVmTemplateDetailsComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: QemuService, useValue: mockedQemuService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: QemuConfigurationService, useClass: QemuConfigurationService }, diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts index 0d7dc41a..7660ad82 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts @@ -3,11 +3,11 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router'; import { QemuBinary } from '../../../../models/qemu/qemu-binary'; import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuConfigurationService } from '../../../../services/qemu-configuration.service'; import { QemuService } from '../../../../services/qemu.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-adapters.component'; @@ -17,7 +17,7 @@ import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-ada styleUrls: ['./qemu-vm-template-details.component.scss', '../../preferences.component.scss'], }) export class QemuVmTemplateDetailsComponent implements OnInit { - controller: Server; + controller:Controller ; qemuTemplate: QemuTemplate; isSymbolSelectionOpened: boolean = false; consoleTypes: string[] = []; @@ -38,7 +38,7 @@ export class QemuVmTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private qemuService: QemuService, private toasterService: ToasterService, private configurationService: QemuConfigurationService, @@ -55,7 +55,7 @@ export class QemuVmTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts index 3a82f381..07a17ffa 100644 --- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuService } from '../../../../services/qemu.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { QemuVmTemplatesComponent } from './qemu-vm-templates.component'; export class MockedQemuService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as QemuTemplate]); } } @@ -47,7 +47,7 @@ describe('QemuTemplatesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: QemuService, useValue: mockedQemuService }, ], declarations: [QemuVmTemplatesComponent], diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts index 506e2af3..be7404ea 100644 --- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts +++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuService } from '../../../../services/qemu.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; @Component({ @@ -12,20 +12,20 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./qemu-vm-templates.component.scss', '../../preferences.component.scss'], }) export class QemuVmTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; qemuTemplates: QemuTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private qemuService: QemuService, private router: Router ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts index 8daca04e..3685e18c 100644 --- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts +++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts @@ -10,10 +10,10 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -22,11 +22,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddVirtualBoxTemplateComponent } from './add-virtual-box-template.component'; export class MockedVirtualBoxService { - public addTemplate(controller: Server, virtualBoxTemplate: VirtualBoxTemplate) { + public addTemplate(controller:Controller , virtualBoxTemplate: VirtualBoxTemplate) { return of(virtualBoxTemplate); } - public getVirtualMachines(controller: Server) { + public getVirtualMachines(controller:Controller ) { return of([]); } } @@ -57,7 +57,7 @@ describe('AddVirtualBoxTemplateComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: VirtualBoxService, useValue: mockedVirtualBoxService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: TemplateMocksService, useClass: TemplateMocksService }, @@ -106,7 +106,7 @@ describe('AddVirtualBoxTemplateComponent', () => { }; component.virtualBoxTemplate = {} as VirtualBoxTemplate; component.selectedVM = template; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.vmForm.controls['vm'].setValue('virtual machine'); component.addTemplate(); @@ -116,7 +116,7 @@ describe('AddVirtualBoxTemplateComponent', () => { it('should not call save template when virtual machine is not selected', () => { spyOn(mockedVirtualBoxService, 'addTemplate').and.returnValue(of({} as VirtualBoxTemplate)); - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts index 47bfcb30..9ce04233 100644 --- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts +++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts @@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template'; import { VirtualBoxVm } from '../../../../models/virtualBox/virtual-box-vm'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { VirtualBoxService } from '../../../../services/virtual-box.service'; @@ -16,7 +16,7 @@ import { VirtualBoxService } from '../../../../services/virtual-box.service'; styleUrls: ['./add-virtual-box-template.component.scss', '../../preferences.component.scss'], }) export class AddVirtualBoxTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; virtualMachines: VirtualBoxVm[]; selectedVM: VirtualBoxVm; virtualBoxTemplate: VirtualBoxTemplate; @@ -24,7 +24,7 @@ export class AddVirtualBoxTemplateComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private virtualBoxService: VirtualBoxService, private toasterService: ToasterService, private templateMocksService: TemplateMocksService, @@ -38,7 +38,7 @@ export class AddVirtualBoxTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.virtualBoxService.getVirtualMachines(this.controller).subscribe((virtualMachines: VirtualBoxVm[]) => { diff --git a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts index fdbefaf8..9789679c 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../models/server'; -import { ServerService } from '../../../../services/server.service'; +import{ Controller } from '../../../../models/controller'; +import { ControllerService } from '../../../../services/controller.service'; @Component({ selector: 'app-virtual-box-preferences', @@ -9,14 +9,14 @@ import { ServerService } from '../../../../services/server.service'; styleUrls: ['./virtual-box-preferences.component.scss'], }) export class VirtualBoxPreferencesComponent implements OnInit { - controller: Server; + controller:Controller ; vboxManagePath: string; - constructor(private route: ActivatedRoute, private serverService: ServerService) {} + constructor(private route: ActivatedRoute, private serverService: ControllerService) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts index 39236dfc..35a0a94d 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts @@ -8,8 +8,8 @@ import { MatToolbarModule } from '@angular/material/toolbar'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VirtualBoxPreferencesComponent } from './virtual-box-preferences.component'; @@ -36,7 +36,7 @@ describe('VirtualBoxPreferencesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, ], declarations: [VirtualBoxPreferencesComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts index acca24d8..a5794141 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts @@ -11,10 +11,10 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -23,11 +23,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VirtualBoxTemplateDetailsComponent } from './virtual-box-template-details.component'; export class MockedVirtualBoxService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({} as VirtualBoxTemplate); } - public saveTemplate(controller: Server, virtualBoxTemplate: VirtualBoxTemplate) { + public saveTemplate(controller:Controller , virtualBoxTemplate: VirtualBoxTemplate) { return of(virtualBoxTemplate); } } @@ -60,7 +60,7 @@ describe('VirtualBoxTemplateDetailsComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: VirtualBoxService, useValue: mockedVirtualBoxService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: VirtualBoxConfigurationService, useClass: VirtualBoxConfigurationService }, diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts index 6094f951..f3a83c5e 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts @@ -2,9 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; import { VirtualBoxConfigurationService } from '../../../../services/virtual-box-configuration.service'; import { VirtualBoxService } from '../../../../services/virtual-box.service'; @@ -16,7 +16,7 @@ import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-ada styleUrls: ['./virtual-box-template-details.component.scss', '../../preferences.component.scss'], }) export class VirtualBoxTemplateDetailsComponent implements OnInit { - controller: Server; + controller:Controller ; virtualBoxTemplate: VirtualBoxTemplate; isSymbolSelectionOpened: boolean = false; consoleTypes: string[] = []; @@ -33,7 +33,7 @@ export class VirtualBoxTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private virtualBoxService: VirtualBoxService, private toasterService: ToasterService, private formBuilder: FormBuilder, @@ -57,7 +57,7 @@ export class VirtualBoxTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts index bf61d06e..0d91fc5d 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; export class MockedVirtualBoxService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as VirtualBoxTemplate]); } } @@ -47,7 +47,7 @@ describe('VirtualBoxTemplatesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: VirtualBoxService, useValue: mockedVirtualBoxService }, ], declarations: [VirtualBoxTemplatesComponent], diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts index 8249ae0b..71dd8ac1 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { VirtualBoxService } from '../../../../services/virtual-box.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; @@ -13,19 +13,19 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./virtual-box-templates.component.scss', '../../preferences.component.scss'], }) export class VirtualBoxTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; virtualBoxTemplates: VirtualBoxTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private virtualBoxService: VirtualBoxService ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts index c1134d1a..1a472290 100644 --- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts +++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts @@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VmwareTemplate } from '../../../../models/templates/vmware-template'; import { VmwareVm } from '../../../../models/vmware/vmware-vm'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { VmwareService } from '../../../../services/vmware.service'; @@ -16,7 +16,7 @@ import { VmwareService } from '../../../../services/vmware.service'; styleUrls: ['./add-vmware-template.component.scss', '../../preferences.component.scss'], }) export class AddVmwareTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; virtualMachines: VmwareVm[]; selectedVM: VmwareVm; vmwareTemplate: VmwareTemplate; @@ -24,7 +24,7 @@ export class AddVmwareTemplateComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private vmwareService: VmwareService, private toasterService: ToasterService, private templateMocksService: TemplateMocksService, @@ -38,7 +38,7 @@ export class AddVmwareTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.vmwareService.getVirtualMachines(this.controller).subscribe((virtualMachines: VmwareVm[]) => { diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts index 88f7c76b..dbcef221 100644 --- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts +++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts @@ -10,11 +10,11 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VmwareTemplate } from '../../../../models/templates/vmware-template'; import { VmwareVm } from '../../../../models/vmware/vmware-vm'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -23,11 +23,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddVmwareTemplateComponent } from './add-vmware-template.component'; export class MockedVmwareService { - public addTemplate(controller: Server, vmwareTemplate: VmwareTemplate) { + public addTemplate(controller:Controller , vmwareTemplate: VmwareTemplate) { return of(vmwareTemplate); } - public getVirtualMachines(controller: Server) { + public getVirtualMachines(controller:Controller ) { return of([]); } } @@ -58,7 +58,7 @@ describe('AddVmwareTemplateComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: VmwareService, useValue: mockedVmwareService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: TemplateMocksService, useClass: TemplateMocksService }, @@ -87,7 +87,7 @@ describe('AddVmwareTemplateComponent', () => { component.vmwareTemplate = {} as VmwareTemplate; component.selectedVM = template; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.templateNameForm.controls['templateName'].setValue('template name'); component.addTemplate(); @@ -97,7 +97,7 @@ describe('AddVmwareTemplateComponent', () => { it('should not call save template when virtual machine is not selected', () => { spyOn(mockedVmwareService, 'addTemplate').and.returnValue(of({} as VmwareTemplate)); - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts index 35283640..30de44ed 100644 --- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts @@ -8,8 +8,8 @@ import { MatToolbarModule } from '@angular/material/toolbar'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VmwarePreferencesComponent } from './vmware-preferences.component'; @@ -36,7 +36,7 @@ describe('VmwarePreferencesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, ], declarations: [VmwarePreferencesComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts index c4b56d8d..7cb49909 100644 --- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts +++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../models/server'; -import { ServerService } from '../../../../services/server.service'; +import{ Controller } from '../../../../models/controller'; +import { ControllerService } from '../../../../services/controller.service'; @Component({ selector: 'app-vmware-preferences', @@ -9,15 +9,15 @@ import { ServerService } from '../../../../services/server.service'; styleUrls: ['./vmware-preferences.component.scss'], }) export class VmwarePreferencesComponent implements OnInit { - controller: Server; + controller:Controller ; vmrunPath: string; - constructor(private route: ActivatedRoute, private serverService: ServerService) {} + constructor(private route: ActivatedRoute, private serverService: ControllerService) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts index 30d05dba..6384a835 100644 --- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts @@ -11,10 +11,10 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VmwareTemplate } from '../../../../models/templates/vmware-template'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -23,11 +23,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VmwareTemplateDetailsComponent } from './vmware-template-details.component'; export class MockedVmwareService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({} as VmwareTemplate); } - public saveTemplate(controller: Server, vmwareTemplate: VmwareTemplate) { + public saveTemplate(controller:Controller , vmwareTemplate: VmwareTemplate) { return of(vmwareTemplate); } } @@ -60,7 +60,7 @@ describe('VmwareTemplateDetailsComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: VmwareService, useValue: mockedVmwareService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: VmwareConfigurationService, useClass: VmwareConfigurationService }, diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts index c8d6eb52..53eb3eab 100644 --- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts +++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts @@ -2,9 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VmwareTemplate } from '../../../../models/templates/vmware-template'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; import { VmwareConfigurationService } from '../../../../services/vmware-configuration.service'; import { VmwareService } from '../../../../services/vmware.service'; @@ -16,7 +16,7 @@ import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-ada styleUrls: ['./vmware-template-details.component.scss', '../../preferences.component.scss'], }) export class VmwareTemplateDetailsComponent implements OnInit { - controller: Server; + controller:Controller ; vmwareTemplate: VmwareTemplate; generalSettingsForm: FormGroup; displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; @@ -32,7 +32,7 @@ export class VmwareTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private vmwareService: VmwareService, private toasterService: ToasterService, private formBuilder: FormBuilder, @@ -49,7 +49,7 @@ export class VmwareTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts index 5d2e8386..424e725a 100644 --- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VmwareTemplate } from '../../../../models/templates/vmware-template'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { VmwareService } from '../../../../services/vmware.service'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VmwareTemplatesComponent } from './vmware-templates.component'; export class MockedVmwareService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as VmwareTemplate]); } } @@ -47,7 +47,7 @@ describe('VmwareTemplatesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: VmwareService, useValue: mockedVmwareService }, ], declarations: [VmwareTemplatesComponent], diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts index 940142c4..7b960b71 100644 --- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts +++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VmwareTemplate } from '../../../../models/templates/vmware-template'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { VmwareService } from '../../../../services/vmware.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; @@ -12,19 +12,19 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./vmware-templates.component.scss', '../../preferences.component.scss'], }) export class VmwareTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; vmwareTemplates: VmwareTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private vmwareService: VmwareService ) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts index 60a30505..5da6b23c 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts @@ -10,11 +10,11 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; import { ComputeService } from '../../../../services/compute.service'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -23,13 +23,13 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddVpcsTemplateComponent } from './add-vpcs-template.component'; export class MockedComputeService { - getComputes(controller: Server) { + getComputes(controller:Controller ) { return of([]); } } export class MockedVpcsService { - public addTemplate(controller: Server, vpcsTemplate: VpcsTemplate) { + public addTemplate(controller:Controller , vpcsTemplate: VpcsTemplate) { return of(vpcsTemplate); } } @@ -61,7 +61,7 @@ describe('AddVpcsTemplateComponent', () => { ], providers: [ { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: VpcsService, useValue: mockedVpcsService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: ComputeService, useValue: mockedComputeService }, @@ -86,7 +86,7 @@ describe('AddVpcsTemplateComponent', () => { spyOn(mockedVpcsService, 'addTemplate').and.returnValue(of({} as VpcsTemplate)); component.templateName = 'sample name'; component.templateNameForm.controls['templateName'].setValue('template name'); - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); @@ -97,7 +97,7 @@ describe('AddVpcsTemplateComponent', () => { spyOn(mockedVpcsService, 'addTemplate').and.returnValue(of({} as VpcsTemplate)); spyOn(mockedToasterService, 'error'); component.templateName = ' '; - component.controller = { id: 1 } as Server; + component.controller = { id: 1 } as Controller ; component.addTemplate(); diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts index e87b9bac..b4e930ed 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts @@ -3,10 +3,10 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; import { Compute } from '../../../../models/compute'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; import { ComputeService } from '../../../../services/compute.service'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { TemplateMocksService } from '../../../../services/template-mocks.service'; import { ToasterService } from '../../../../services/toaster.service'; import { VpcsService } from '../../../../services/vpcs.service'; @@ -17,14 +17,14 @@ import { VpcsService } from '../../../../services/vpcs.service'; styleUrls: ['./add-vpcs-template.component.scss', '../../preferences.component.scss'], }) export class AddVpcsTemplateComponent implements OnInit { - controller: Server; + controller:Controller ; templateName: string = ''; templateNameForm: FormGroup; isLocalComputerChosen: boolean = true; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private vpcsService: VpcsService, private router: Router, private toasterService: ToasterService, @@ -39,7 +39,7 @@ export class AddVpcsTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts index 3afcf9f3..27cd2a53 100644 --- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts @@ -8,8 +8,8 @@ import { MatToolbarModule } from '@angular/material/toolbar'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VpcsPreferencesComponent } from './vpcs-preferences.component'; @@ -36,7 +36,7 @@ describe('VpcsPreferencesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, ], declarations: [VpcsPreferencesComponent], schemas: [NO_ERRORS_SCHEMA], diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts index 8dc6bfe5..b39b0dcf 100644 --- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts +++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../models/server'; -import { ServerService } from '../../../../services/server.service'; +import{ Controller } from '../../../../models/controller'; +import { ControllerService } from '../../../../services/controller.service'; @Component({ selector: 'app-vpcs-preferences', @@ -9,15 +9,15 @@ import { ServerService } from '../../../../services/server.service'; styleUrls: ['./vpcs-preferences.component.scss'], }) export class VpcsPreferencesComponent implements OnInit { - controller: Server; + controller:Controller ; vpcsExecutable: string; - constructor(private route: ActivatedRoute, private serverService: ServerService) {} + constructor(private route: ActivatedRoute, private serverService: ControllerService) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts index 255c9c9a..a55a733d 100644 --- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts @@ -10,10 +10,10 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } 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'; @@ -22,11 +22,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VpcsTemplateDetailsComponent } from './vpcs-template-details.component'; export class MockedVpcsService { - public getTemplate(controller: Server, template_id: string) { + public getTemplate(controller:Controller , template_id: string) { return of({} as VpcsTemplate); } - public saveTemplate(controller: Server, vpcsTemplate: VpcsTemplate) { + public saveTemplate(controller:Controller , vpcsTemplate: VpcsTemplate) { return of(vpcsTemplate); } } @@ -58,7 +58,7 @@ describe('VpcsTemplateDetailsComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: VpcsService, useValue: mockedVpcsService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: VpcsConfigurationService, useClass: VpcsConfigurationService }, diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts index 38fa0005..6ede0ef6 100644 --- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts +++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { ToasterService } from '../../../../services/toaster.service'; import { VpcsConfigurationService } from '../../../../services/vpcs-configuration.service'; import { VpcsService } from '../../../../services/vpcs.service'; @@ -14,7 +14,7 @@ import { VpcsService } from '../../../../services/vpcs.service'; styleUrls: ['./vpcs-template-details.component.scss', '../../preferences.component.scss'], }) export class VpcsTemplateDetailsComponent implements OnInit { - controller: Server; + controller:Controller ; vpcsTemplate: VpcsTemplate; inputForm: FormGroup; isSymbolSelectionOpened: boolean = false; @@ -23,7 +23,7 @@ export class VpcsTemplateDetailsComponent implements OnInit { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private vpcsService: VpcsService, private toasterService: ToasterService, private formBuilder: FormBuilder, @@ -41,7 +41,7 @@ export class VpcsTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts index c4c8d962..c1a13905 100644 --- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts @@ -9,16 +9,16 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; -import { ServerService } from '../../../../services/server.service'; -import { MockedServerService } from '../../../../services/server.service.spec'; +import { ControllerService } from '../../../../services/controller.service'; +import { MockedServerService } from '../../../../services/controller.service.spec'; import { VpcsService } from '../../../../services/vpcs.service'; import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VpcsTemplatesComponent } from './vpcs-templates.component'; export class MockedVpcsService { - public getTemplates(controller: Server) { + public getTemplates(controller:Controller ) { return of([{} as VpcsTemplate]); } } @@ -47,7 +47,7 @@ describe('VpcsTemplatesComponent', () => { provide: ActivatedRoute, useValue: activatedRoute, }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: VpcsService, useValue: mockedVpcsService }, ], declarations: [VpcsTemplatesComponent], diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts index aeff4a77..e6e989af 100644 --- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts +++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; -import { ServerService } from '../../../../services/server.service'; +import { ControllerService } from '../../../../services/controller.service'; import { VpcsService } from '../../../../services/vpcs.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; @@ -12,15 +12,15 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./vpcs-templates.component.scss', '../../preferences.component.scss'], }) export class VpcsTemplatesComponent implements OnInit { - controller: Server; + controller:Controller ; vpcsTemplates: VpcsTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor(private route: ActivatedRoute, private serverService: ServerService, private vpcsService: VpcsService) {} + constructor(private route: ActivatedRoute, private serverService: ControllerService, private vpcsService: VpcsService) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts index 5647a0d1..1f0f6487 100644 --- a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts +++ b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../cartography/models/node'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { NodeService } from '../../../services/node.service'; import { ToasterService } from '../../../services/toaster.service'; @@ -12,7 +12,7 @@ import { ToasterService } from '../../../services/toaster.service'; styleUrls: ['./change-hostname-dialog.component.scss'], }) export class ChangeHostnameDialogComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; inputForm: FormGroup; name: string; diff --git a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts index 62684016..5778932b 100644 --- a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts +++ b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../cartography/models/node'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { NodeService } from '../../../services/node.service'; @Component({ @@ -10,7 +10,7 @@ import { NodeService } from '../../../services/node.service'; styleUrls: ['./change-symbol-dialog.component.scss'], }) export class ChangeSymbolDialogComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; symbol: string; diff --git a/src/app/components/project-map/console-wrapper/console-wrapper.component.ts b/src/app/components/project-map/console-wrapper/console-wrapper.component.ts index 5091fa75..e604a4f9 100644 --- a/src/app/components/project-map/console-wrapper/console-wrapper.component.ts +++ b/src/app/components/project-map/console-wrapper/console-wrapper.component.ts @@ -3,7 +3,7 @@ import { FormControl } from '@angular/forms'; import { ResizeEvent } from 'angular-resizable-element'; import { Node } from '../../../cartography/models/node'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { MapSettingsService } from '../../../services/mapsettings.service'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; import { ThemeService } from '../../../services/theme.service'; @@ -14,7 +14,7 @@ import { ThemeService } from '../../../services/theme.service'; styleUrls: ['./console-wrapper.component.scss'], }) export class ConsoleWrapperComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Output() closeConsole = new EventEmitter(); diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts b/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts index 895b0679..ac9c4e66 100644 --- a/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts +++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts @@ -6,7 +6,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { ElectronService } from 'ngx-electron'; import { Node } from '../../../cartography/models/node'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { MapSettingsService } from '../../../services/mapsettings.service'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; import { ProjectService } from '../../../services/project.service'; @@ -62,7 +62,7 @@ describe('ContextConsoleMenuComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ContextConsoleMenuComponent); component = fixture.componentInstance; - component.controller = { location: 'local' } as Server; + component.controller = { location: 'local' } as Controller ; fixture.detectChanges(); }); diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.ts b/src/app/components/project-map/context-console-menu/context-console-menu.component.ts index efc96731..ce0ca024 100644 --- a/src/app/components/project-map/context-console-menu/context-console-menu.component.ts +++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.ts @@ -15,7 +15,7 @@ import { Router } from '@angular/router'; import { ElectronService } from 'ngx-electron'; import { Node } from '../../../cartography/models/node'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { MapSettingsService } from '../../../services/mapsettings.service'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; import { ToasterService } from '../../../services/toaster.service'; @@ -29,7 +29,7 @@ import { ConsoleDeviceActionComponent } from '../context-menu/actions/console-de }) export class ContextConsoleMenuComponent implements OnInit { @Input() project: Project; - @Input() controller: Server; + @Input() controller:Controller ; @ViewChild(MatMenuTrigger) contextConsoleMenu: MatMenuTrigger; @ViewChild('container', { read: ViewContainerRef }) container; componentRef: ComponentRef; diff --git a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts index 85928e3c..3970d900 100644 --- a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts +++ b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; @Component({ @@ -9,7 +9,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './align-horizontally.component.html', }) export class AlignHorizontallyActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; constructor(private nodesDataSource: NodesDataSource, private nodeService: NodeService) {} diff --git a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts index 6c411e07..1e8acebe 100644 --- a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts +++ b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; @Component({ @@ -9,7 +9,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './align-vertically.component.html', }) export class AlignVerticallyActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; constructor(private nodesDataSource: NodesDataSource, private nodeService: NodeService) {} diff --git a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts index effb1213..9b0ade8e 100644 --- a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts @@ -3,7 +3,7 @@ import { DrawingsDataSource } from '../../../../../cartography/datasources/drawi import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource'; import { Drawing } from '../../../../../cartography/models/drawing'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { DrawingService } from '../../../../../services/drawing.service'; import { NodeService } from '../../../../../services/node.service'; @@ -12,7 +12,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './bring-to-front-action.component.html', }) export class BringToFrontActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; @Input() drawings: Drawing[]; diff --git a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts index 886d4ebf..b39db155 100644 --- a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { ChangeHostnameDialogComponent } from '../../../change-hostname-dialog/change-hostname-dialog.component'; @Component({ @@ -9,7 +9,7 @@ import { ChangeHostnameDialogComponent } from '../../../change-hostname-dialog/c templateUrl: './change-hostname-action.component.html', }) export class ChangeHostnameActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; constructor(private dialog: MatDialog) {} diff --git a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts index f1298392..b354f71e 100644 --- a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { ChangeSymbolDialogComponent } from '../../../change-symbol-dialog/change-symbol-dialog.component'; @Component({ @@ -9,7 +9,7 @@ import { ChangeSymbolDialogComponent } from '../../../change-symbol-dialog/chang templateUrl: './change-symbol-action.component.html', }) export class ChangeSymbolActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; constructor(private dialog: MatDialog) {} diff --git a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts index 36b521ff..81f5932f 100644 --- a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { ConfiguratorDialogAtmSwitchComponent } from '../../../node-editors/configurator/atm_switch/configurator-atm-switch.component'; import { ConfiguratorDialogCloudComponent } from '../../../node-editors/configurator/cloud/configurator-cloud.component'; import { ConfiguratorDialogDockerComponent } from '../../../node-editors/configurator/docker/configurator-docker.component'; @@ -21,7 +21,7 @@ import { ConfiguratorDialogVpcsComponent } from '../../../node-editors/configura templateUrl: './config-action.component.html', }) export class ConfigActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; private conf = { autoFocus: false, diff --git a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts index 18fc2a29..b2db1704 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -9,7 +9,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './console-device-action-browser.component.html', }) export class ConsoleDeviceActionBrowserComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; constructor(private toasterService: ToasterService, private nodeService: NodeService) {} diff --git a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts index ffefb674..9022762e 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts @@ -2,10 +2,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatIconModule } from '@angular/material/icon'; import { ElectronService } from 'ngx-electron'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; -import { ServerService } from '../../../../../services/server.service'; -import { MockedServerService } from '../../../../../services/server.service.spec'; +import { ControllerService } from '../../../../../services/controller.service'; +import { MockedServerService } from '../../../../../services/controller.service.spec'; import { SettingsService } from '../../../../../services/settings.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; @@ -16,7 +16,7 @@ describe('ConsoleDeviceActionComponent', () => { let component: ConsoleDeviceActionComponent; let fixture: ComponentFixture; let electronService; - let controller: Server; + let controller:Controller ; let settingsService: SettingsService; let mockedServerService: MockedServerService; let mockedToaster: MockedToasterService; @@ -37,14 +37,14 @@ describe('ConsoleDeviceActionComponent', () => { mockedServerService = new MockedServerService(); mockedToaster = new MockedToasterService(); - controller = { host: 'localhost', port: 222 } as Server; + controller = { host: 'localhost', port: 222 } as Controller ; }); beforeEach(async() => { await TestBed.configureTestingModule({ providers: [ { provide: ElectronService, useValue: electronService }, - { provide: ServerService, useValue: mockedServerService }, + { provide: ControllerService, useValue: mockedServerService }, { provide: SettingsService }, { provide: ToasterService, useValue: mockedToaster }, { provide: NodeService, useValue: mockedNodeService }, diff --git a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts index f133ce4c..b03261b6 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; import { ElectronService } from 'ngx-electron'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; -import { ServerService } from '../../../../../services/server.service'; +import { ControllerService } from '../../../../../services/controller.service'; import { SettingsService } from '../../../../../services/settings.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -12,12 +12,12 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './console-device-action.component.html', }) export class ConsoleDeviceActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; constructor( private electronService: ElectronService, - private serverService: ServerService, + private serverService: ControllerService, private settingsService: SettingsService, private toasterService: ToasterService, private nodeService: NodeService diff --git a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts index ffc5ff29..af9ace23 100644 --- a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts @@ -7,7 +7,7 @@ import { NodesDataSource } from '../../../../../cartography/datasources/nodes-da import { Drawing } from '../../../../../cartography/models/drawing'; import { Node } from '../../../../../cartography/models/node'; import { Link } from '../../../../../models/link'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { DrawingService } from '../../../../../services/drawing.service'; import { LinkService } from '../../../../../services/link.service'; import { NodeService } from '../../../../../services/node.service'; @@ -17,7 +17,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './delete-action.component.html', }) export class DeleteActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; @Input() drawings: Drawing[]; @Input() links: Link[]; diff --git a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts index 1d7dba38..acf9f2e8 100644 --- a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts @@ -4,7 +4,7 @@ import { NodesDataSource } from '../../../../../cartography/datasources/nodes-da import { Drawing } from '../../../../../cartography/models/drawing'; import { Node } from '../../../../../cartography/models/node'; import { Project } from '../../../../../models/project'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { DrawingService } from '../../../../../services/drawing.service'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './duplicate-action.component.html', }) export class DuplicateActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Input() drawings: Drawing[]; @Input() nodes: Node[]; diff --git a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts index 1b0ea670..2f2686e7 100644 --- a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; import { Project } from '../../../../../models/project'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { ConfigEditorDialogComponent } from '../../../node-editors/config-editor/config-editor.component'; @Component({ @@ -10,7 +10,7 @@ import { ConfigEditorDialogComponent } from '../../../node-editors/config-editor templateUrl: './edit-config-action.component.html', }) export class EditConfigActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Input() node: Node; diff --git a/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts index b7aca5fa..66a0f2fc 100644 --- a/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnChanges } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Link } from '../../../../../models/link'; import { Project } from '../../../../../models/project'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { LinkStyleEditorDialogComponent } from '../../../drawings-editors/link-style-editor/link-style-editor.component'; @Component({ @@ -11,7 +11,7 @@ import { LinkStyleEditorDialogComponent } from '../../../drawings-editors/link-s templateUrl: './edit-link-style-action.component.html', }) export class EditLinkStyleActionComponent implements OnChanges { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Input() link: Link; diff --git a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts index e58dd36a..ed57c983 100644 --- a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts @@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog'; import { Drawing } from '../../../../../cartography/models/drawing'; import { ImageElement } from '../../../../../cartography/models/drawings/image-element'; import { Project } from '../../../../../models/project'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { StyleEditorDialogComponent } from '../../../drawings-editors/style-editor/style-editor.component'; @Component({ @@ -11,7 +11,7 @@ import { StyleEditorDialogComponent } from '../../../drawings-editors/style-edit templateUrl: './edit-style-action.component.html', }) export class EditStyleActionComponent implements OnChanges { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Input() drawing: Drawing; isImageDrawing: boolean = false; diff --git a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts index bd4f3b34..2f738947 100644 --- a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts @@ -6,7 +6,7 @@ import { Node } from '../../../../../cartography/models/node'; import { Link } from '../../../../../models/link'; import { LinkNode } from '../../../../../models/link-node'; import { Project } from '../../../../../models/project'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { TextEditorDialogComponent } from '../../../drawings-editors/text-editor/text-editor.component'; @Component({ @@ -14,7 +14,7 @@ import { TextEditorDialogComponent } from '../../../drawings-editors/text-editor templateUrl: './edit-text-action.component.html', }) export class EditTextActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Input() drawing: Drawing; @Input() node: Node; diff --git a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts index 278ed363..2d506ba4 100644 --- a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog.component'; @@ -10,7 +10,7 @@ import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog templateUrl: './export-config-action.component.html', }) export class ExportConfigActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; constructor(private nodeService: NodeService, private dialog: MatDialog) {} diff --git a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts index c73f5983..d09da927 100644 --- a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts @@ -1,14 +1,14 @@ import { Component, Input, OnInit } from '@angular/core'; import { NodeConsoleService } from '../../../../../services/nodeConsole.service'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; @Component({ selector: 'app-http-console-new-tab-action', templateUrl: './http-console-new-tab-action.component.html', }) export class HttpConsoleNewTabActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; constructor(private nodeConsoleService: NodeConsoleService) {} diff --git a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts index c79022c6..e29d63a9 100644 --- a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeConsoleService } from '../../../../../services/nodeConsole.service'; @Component({ @@ -8,7 +8,7 @@ import { NodeConsoleService } from '../../../../../services/nodeConsole.service' templateUrl: './http-console-action.component.html', }) export class HttpConsoleActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; constructor(private nodeConsoleService: NodeConsoleService) {} diff --git a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts index c3c1e136..fb02fe16 100644 --- a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts @@ -1,7 +1,7 @@ import { Component, ElementRef, Input, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog.component'; @@ -12,7 +12,7 @@ import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog styleUrls: ['./import-config-action.component.scss'], }) export class ImportConfigActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; @ViewChild('fileInput') fileInput: ElementRef; configType: string; diff --git a/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts b/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts index a3fbe0cf..a4133000 100644 --- a/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -9,7 +9,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './isolate-node-action.component.html', }) export class IsolateNodeActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; constructor(private nodeService: NodeService, private toasterService: ToasterService) {} diff --git a/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.ts b/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.ts index 3c003b1d..195b7e30 100644 --- a/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.ts @@ -3,7 +3,7 @@ import { DrawingsDataSource } from '../../../../../cartography/datasources/drawi import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource'; import { Drawing } from '../../../../../cartography/models/drawing'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { DrawingService } from '../../../../../services/drawing.service'; import { NodeService } from '../../../../../services/node.service'; @@ -12,7 +12,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './lock-action.component.html', }) export class LockActionComponent implements OnChanges { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; @Input() drawings: Drawing[]; command: string; diff --git a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts index 8d7518e2..ed63ec20 100644 --- a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts @@ -3,7 +3,7 @@ import { DrawingsDataSource } from '../../../../../cartography/datasources/drawi import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource'; import { Drawing } from '../../../../../cartography/models/drawing'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { DrawingService } from '../../../../../services/drawing.service'; import { NodeService } from '../../../../../services/node.service'; @@ -12,7 +12,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './move-layer-down-action.component.html', }) export class MoveLayerDownActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; @Input() drawings: Drawing[]; diff --git a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts index 4eb86a80..625dc110 100644 --- a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts @@ -3,7 +3,7 @@ import { DrawingsDataSource } from '../../../../../cartography/datasources/drawi import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource'; import { Drawing } from '../../../../../cartography/models/drawing'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { DrawingService } from '../../../../../services/drawing.service'; import { NodeService } from '../../../../../services/node.service'; @@ -12,7 +12,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './move-layer-up-action.component.html', }) export class MoveLayerUpActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; @Input() drawings: Drawing[]; diff --git a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts index 8678eef7..0416dd9c 100644 --- a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts @@ -1,14 +1,14 @@ import { Component, Input, OnInit } from '@angular/core'; import { ElectronService } from 'ngx-electron'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; @Component({ selector: 'app-open-file-explorer-action', templateUrl: './open-file-explorer-action.component.html', }) export class OpenFileExplorerActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; constructor(private electronService: ElectronService) {} diff --git a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts index c9e8629e..bf10db5a 100644 --- a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Link } from '../../../../../models/link'; import { Project } from '../../../../../models/project'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { PacketFiltersDialogComponent } from '../../../packet-capturing/packet-filters/packet-filters.component'; @Component({ @@ -10,7 +10,7 @@ import { PacketFiltersDialogComponent } from '../../../packet-capturing/packet-f templateUrl: './packet-filters-action.component.html', }) export class PacketFiltersActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Input() link: Link; diff --git a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts index 59ce63b4..2754620c 100644 --- a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; @Component({ @@ -8,7 +8,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './reload-node-action.component.html', }) export class ReloadNodeActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; filteredNodes: Node[] = []; diff --git a/src/app/components/project-map/context-menu/actions/reset-link/reset-link-action.component.ts b/src/app/components/project-map/context-menu/actions/reset-link/reset-link-action.component.ts index eae3c147..3b7684a4 100644 --- a/src/app/components/project-map/context-menu/actions/reset-link/reset-link-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/reset-link/reset-link-action.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/server'; import { Link } from '../../../../../models/link'; import { LinkService } from '../../../../../services/link.service'; @@ -8,7 +8,7 @@ import { LinkService } from '../../../../../services/link.service'; templateUrl: './reset-link-action.component.html' }) export class ResetLinkActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() link: Link; constructor( diff --git a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts index 3a1e93f7..908a4685 100644 --- a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { Link } from '../../../../../models/link'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { LinkService } from '../../../../../services/link.service'; @Component({ @@ -8,7 +8,7 @@ import { LinkService } from '../../../../../services/link.service'; templateUrl: './resume-link-action.component.html', }) export class ResumeLinkActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() link: Link; constructor(private linkService: LinkService) {} diff --git a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts index de6b9280..1509cda7 100644 --- a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { InfoDialogComponent } from '../../../info-dialog/info-dialog.component'; @Component({ @@ -10,7 +10,7 @@ import { InfoDialogComponent } from '../../../info-dialog/info-dialog.component' }) export class ShowNodeActionComponent { @Input() node: Node; - @Input() controller: Server; + @Input() controller:Controller ; constructor(private dialog: MatDialog) {} diff --git a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts index 16f15b61..442d267e 100644 --- a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { Link } from '../../../../../models/link'; import { Project } from '../../../../../models/project'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { PacketCaptureService } from '../../../../../services/packet-capture.service'; @Component({ @@ -9,7 +9,7 @@ import { PacketCaptureService } from '../../../../../services/packet-capture.ser templateUrl: './start-capture-on-started-link.component.html', }) export class StartCaptureOnStartedLinkActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Input() link: Link; diff --git a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts index 547fd0d8..e68461cf 100644 --- a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Link } from '../../../../../models/link'; import { Project } from '../../../../../models/project'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { StartCaptureDialogComponent } from '../../../packet-capturing/start-capture/start-capture.component'; @Component({ @@ -10,7 +10,7 @@ import { StartCaptureDialogComponent } from '../../../packet-capturing/start-cap templateUrl: './start-capture-action.component.html', }) export class StartCaptureActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Input() link: Link; diff --git a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts index 7386b6fb..e46cd6c1 100644 --- a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -9,7 +9,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './start-node-action.component.html', }) export class StartNodeActionComponent implements OnInit, OnChanges { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; isNodeWithStoppedStatus: boolean; diff --git a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts index e4d72adc..e9bf2c53 100644 --- a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { Link } from '../../../../../models/link'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { LinkService } from '../../../../../services/link.service'; @Component({ @@ -8,7 +8,7 @@ import { LinkService } from '../../../../../services/link.service'; templateUrl: './stop-capture-action.component.html', }) export class StopCaptureActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() link: Link; constructor(private linkService: LinkService) {} diff --git a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts index c1a4c0af..56106f09 100644 --- a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; @Component({ @@ -8,7 +8,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './stop-node-action.component.html', }) export class StopNodeActionComponent implements OnInit, OnChanges { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; isNodeWithStartedStatus: boolean; diff --git a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts index 347b1bb3..50690cc8 100644 --- a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { Link } from '../../../../../models/link'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { LinkService } from '../../../../../services/link.service'; @Component({ @@ -8,7 +8,7 @@ import { LinkService } from '../../../../../services/link.service'; templateUrl: './suspend-link-action.component.html', }) export class SuspendLinkActionComponent { - @Input() controller: Server; + @Input() controller:Controller ; @Input() link: Link; constructor(private linkService: LinkService) {} diff --git a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts index f8a8a2ab..9ba7109d 100644 --- a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; @Component({ @@ -8,7 +8,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './suspend-node-action.component.html', }) export class SuspendNodeActionComponent implements OnInit, OnChanges { - @Input() controller: Server; + @Input() controller:Controller ; @Input() nodes: Node[]; isNodeWithStartedStatus: boolean; diff --git a/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts b/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts index 278137e3..2793077f 100644 --- a/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -9,7 +9,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './unisolate-node-action.component.html', }) export class UnisolateNodeActionComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; constructor(private nodeService: NodeService, private toasterService: ToasterService) {} diff --git a/src/app/components/project-map/context-menu/context-menu.component.spec.ts b/src/app/components/project-map/context-menu/context-menu.component.spec.ts index 5d91b674..55673af6 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.spec.ts +++ b/src/app/components/project-map/context-menu/context-menu.component.spec.ts @@ -6,7 +6,7 @@ import { ElectronService } from 'ngx-electron'; import { Drawing } from '../../../cartography/models/drawing'; import { RectElement } from '../../../cartography/models/drawings/rect-element'; import { TextElement } from '../../../cartography/models/drawings/text-element'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ProjectService } from '../../../services/project.service'; import { MockedProjectService } from '../../projects/add-blank-project-dialog/add-blank-project-dialog.component.spec'; import { ContextMenuComponent } from './context-menu.component'; @@ -35,7 +35,7 @@ describe('ContextMenuComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ContextMenuComponent); component = fixture.componentInstance; - component.controller = { location: 'local' } as Server; + component.controller = { location: 'local' } as Controller ; fixture.detectChanges(); }); diff --git a/src/app/components/project-map/context-menu/context-menu.component.ts b/src/app/components/project-map/context-menu/context-menu.component.ts index c00c1259..cbc2eb1a 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.ts +++ b/src/app/components/project-map/context-menu/context-menu.component.ts @@ -9,7 +9,7 @@ import { Node } from '../../../cartography/models/node'; import { Link } from '../../../models/link'; import { LinkNode } from '../../../models/link-node'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ProjectService } from '../../../services/project.service'; @Component({ @@ -19,7 +19,7 @@ import { ProjectService } from '../../../services/project.service'; }) export class ContextMenuComponent implements OnInit { @Input() project: Project; - @Input() controller: Server; + @Input() controller:Controller ; @ViewChild(MatMenuTrigger) contextMenu: MatMenuTrigger; diff --git a/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts b/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts index 897a7ccc..735a1872 100644 --- a/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts +++ b/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { MatDialogRef } from '@angular/material/dialog'; import { Link } from '../../../../models/link'; import { Project } from '../../../../models/project'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { ToasterService } from '../../../../services/toaster.service'; import { NonNegativeValidator } from '../../../../validators/non-negative-validator'; import { LinkService } from '../../../../services/link.service'; @@ -17,7 +17,7 @@ import { LinkToMapLinkConverter } from '../../../../cartography/converters/map/l styleUrls: ['./link-style-editor.component.scss'], }) export class LinkStyleEditorDialogComponent implements OnInit { - controller: Server; + controller:Controller ; project: Project; link: Link; formGroup: FormGroup; diff --git a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts index 33c439a3..1c324e6b 100644 --- a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts +++ b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts @@ -9,7 +9,7 @@ import { EllipseElement } from '../../../../cartography/models/drawings/ellipse- import { LineElement } from '../../../../cartography/models/drawings/line-element'; import { RectElement } from '../../../../cartography/models/drawings/rect-element'; import { Project } from '../../../../models/project'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { DrawingService } from '../../../../services/drawing.service'; import { ToasterService } from '../../../../services/toaster.service'; import { NonNegativeValidator } from '../../../../validators/non-negative-validator'; @@ -21,7 +21,7 @@ import { RotationValidator } from '../../../../validators/rotation-validator'; styleUrls: ['./style-editor.component.scss'], }) export class StyleEditorDialogComponent implements OnInit { - controller: Server; + controller:Controller ; project: Project; drawing: Drawing; element: ElementData; diff --git a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts index c094779d..938d6387 100644 --- a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts +++ b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts @@ -15,7 +15,7 @@ import { Node } from '../../../../cartography/models/node'; import { Link } from '../../../../models/link'; import { LinkNode } from '../../../../models/link-node'; import { Project } from '../../../../models/project'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { DrawingService } from '../../../../services/drawing.service'; import { LinkService } from '../../../../services/link.service'; import { NodeService } from '../../../../services/node.service'; @@ -30,7 +30,7 @@ import { RotationValidator } from '../../../../validators/rotation-validator'; export class TextEditorDialogComponent implements OnInit { @ViewChild('textArea', { static: true }) textArea: ElementRef; - controller: Server; + controller:Controller ; project: Project; drawing: Drawing; node: Node; diff --git a/src/app/components/project-map/import-appliance/import-appliance.component.ts b/src/app/components/project-map/import-appliance/import-appliance.component.ts index c7d6baf4..e5ae84b8 100644 --- a/src/app/components/project-map/import-appliance/import-appliance.component.ts +++ b/src/app/components/project-map/import-appliance/import-appliance.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { environment } from 'environments/environment'; import { FileItem, FileUploader, ParsedResponseHeaders } from 'ng2-file-upload'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { DockerTemplate } from '../../../models/templates/docker-template'; import { IosTemplate } from '../../../models/templates/ios-template'; import { IouTemplate } from '../../../models/templates/iou-template'; @@ -20,7 +20,7 @@ import { ToasterService } from '../../../services/toaster.service'; }) export class ImportApplianceComponent implements OnInit { @Input('project') project: Project; - @Input('controller') controller: Server; + @Input('controller') controller:Controller ; uploader: FileUploader; template; @@ -149,7 +149,7 @@ export class ImportApplianceComponent implements OnInit { fileReader.readAsText(file); } - private getUploadPath(controller: Server, emulator: string, filename: string) { + private getUploadPath(controller:Controller , emulator: string, filename: string) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/${emulator}/images/${filename}`; } } diff --git a/src/app/components/project-map/info-dialog/info-dialog.component.ts b/src/app/components/project-map/info-dialog/info-dialog.component.ts index a741fa6f..56a10ad3 100644 --- a/src/app/components/project-map/info-dialog/info-dialog.component.ts +++ b/src/app/components/project-map/info-dialog/info-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../cartography/models/node'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { InfoService } from '../../../services/info.service'; @Component({ @@ -10,7 +10,7 @@ import { InfoService } from '../../../services/info.service'; styleUrls: ['./info-dialog.component.scss'], }) export class InfoDialogComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() node: Node; infoList: string[] = []; usage: string = ''; diff --git a/src/app/components/project-map/log-console/log-console.component.spec.ts b/src/app/components/project-map/log-console/log-console.component.spec.ts index 43fb77d8..3f42461b 100644 --- a/src/app/components/project-map/log-console/log-console.component.spec.ts +++ b/src/app/components/project-map/log-console/log-console.component.spec.ts @@ -9,7 +9,7 @@ import { ToasterService } from '../../../services/toaster.service'; import { of } from 'rxjs'; import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource'; import { ProjectWebServiceHandler, WebServiceMessage } from '../../../handlers/project-web-service-handler'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { HttpServer, ServerErrorHandler } from '../../../services/http-server.service'; import { NodeService } from '../../../services/node.service'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; @@ -66,7 +66,7 @@ describe('LogConsoleComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(LogConsoleComponent); component = fixture.componentInstance; - component.controller = { location: 'local' } as Server; + component.controller = { location: 'local' } as Controller ; fixture.detectChanges(); }); diff --git a/src/app/components/project-map/log-console/log-console.component.ts b/src/app/components/project-map/log-console/log-console.component.ts index 216bec9a..c6d8e01e 100644 --- a/src/app/components/project-map/log-console/log-console.component.ts +++ b/src/app/components/project-map/log-console/log-console.component.ts @@ -19,7 +19,7 @@ import { Link } from '../../../models/link'; import { LogEvent } from '../../../models/logEvent'; import { Port } from '../../../models/port'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { HttpServer } from '../../../services/http-server.service'; import { NodeService } from '../../../services/node.service'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; @@ -34,7 +34,7 @@ import { LogEventsDataSource } from './log-events-datasource'; styleUrls: ['./log-console.component.scss'], }) export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @ViewChild('console') console: ElementRef; diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts index 98e22f00..f6ca5bf7 100644 --- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts +++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts @@ -15,7 +15,7 @@ import { InformationDialogComponent } from '../../../components/dialogs/informat import { Appliance, Image, Version } from '../../../models/appliance'; import { Project } from '../../../models/project'; import { QemuBinary } from '../../../models/qemu/qemu-binary'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { Template } from '../../../models/template'; import { DockerTemplate } from '../../../models/templates/docker-template'; import { IosTemplate } from '../../../models/templates/ios-template'; @@ -47,7 +47,7 @@ import { environment } from 'environments/environment'; ], }) export class NewTemplateDialogComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; uploader: FileUploader; diff --git a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts index f5308135..d99cf647 100644 --- a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts +++ b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Router } from '@angular/router'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { Template } from '../../../../models/template'; import { TemplateService } from '../../../../services/template.service'; import { ToasterService } from '../../../../services/toaster.service'; @@ -16,7 +16,7 @@ import { ProjectNameValidator } from '../../../projects/models/projectNameValida providers: [ProjectNameValidator], }) export class TemplateNameDialogComponent implements OnInit { - controller: Server; + controller:Controller ; templateNameForm: FormGroup; constructor( diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts b/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts index 626a69fb..82205692 100644 --- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts +++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts @@ -7,7 +7,7 @@ import { MatTabsModule } from '@angular/material/tabs'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs/internal/observable/of'; import { Node } from '../../../../cartography/models/node'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { NodeService } from '../../../../services/node.service'; import { ToasterService } from '../../../../services/toaster.service'; import { MockedNodeService } from '../../project-map.component.spec'; @@ -16,7 +16,7 @@ import { ConfigEditorDialogComponent } from './config-editor.component'; describe('ConfigEditorDialogComponent', () => { let component: ConfigEditorDialogComponent; let fixture: ComponentFixture; - let controller: Server; + let controller:Controller ; let node: Node; let toaster = { success: jasmine.createSpy('success'), @@ -45,7 +45,7 @@ describe('ConfigEditorDialogComponent', () => { declarations: [ConfigEditorDialogComponent], }).compileComponents(); - controller = new Server(); + controller = new Controller (); controller.host = 'localhost'; controller.port = 80; diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts index 527288b2..b069c724 100644 --- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts +++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../cartography/models/node'; import { Project } from '../../../../models/project'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { NodeService } from '../../../../services/node.service'; import { ToasterService } from '../../../../services/toaster.service'; @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./config-editor.component.scss'], }) export class ConfigEditorDialogComponent implements OnInit { - controller: Server; + controller:Controller ; project: Project; node: Node; diff --git a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts index c25d738e..faebe160 100644 --- a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss', '../../../../preferences/preferences.component.scss'], }) export class ConfiguratorDialogAtmSwitchComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; nameForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts index e5415dd8..215fcc1f 100644 --- a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts +++ b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts @@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node'; import { UdpTunnelsComponent } from '../../../../../components/preferences/common/udp-tunnels/udp-tunnels.component'; import { PortsMappingEntity } from '../../../../../models/ethernetHub/ports-mapping-enity'; import { QemuBinary } from '../../../../../models/qemu/qemu-binary'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -16,7 +16,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogCloudComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; generalSettingsForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts index 8a4963f6..f2cc016b 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { DockerConfigurationService } from '../../../../../services/docker-configuration.service'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -16,7 +16,7 @@ import { NonNegativeValidator } from '../../../../../validators/non-negative-val styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogDockerComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; generalSettingsForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts index 7d331188..1bf8e408 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../../cartography/models/node'; -import { Server } from '../../../../../../models/server'; +import{ Controller } from '../../../../../../models/controller'; import { DockerConfigurationService } from '../../../../../../services/docker-configuration.service'; import { NodeService } from '../../../../../../services/node.service'; import { ToasterService } from '../../../../../../services/toaster.service'; @@ -13,7 +13,7 @@ import { ToasterService } from '../../../../../../services/toaster.service'; styleUrls: ['./configure-custom-adapters.component.scss'], }) export class ConfigureCustomAdaptersDialogComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; displayedColumns: string[] = ['adapter_number', 'port_name']; adapters: CustomAdapter[] = []; diff --git a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts index 096219c1..0984400a 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../../cartography/models/node'; -import { Server } from '../../../../../../models/server'; +import{ Controller } from '../../../../../../models/controller'; import { NodeService } from '../../../../../../services/node.service'; import { ToasterService } from '../../../../../../services/toaster.service'; @@ -11,7 +11,7 @@ import { ToasterService } from '../../../../../../services/toaster.service'; styleUrls: ['./edit-network-configuration.component.scss'], }) export class EditNetworkConfigurationDialogComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; configuration: string; diff --git a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts index 6018ad4c..b8dddd80 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; import { PortsComponent } from '../../../../../components/preferences/common/ports/ports.component'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -15,7 +15,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; }) export class ConfiguratorDialogEthernetSwitchComponent implements OnInit { @ViewChild(PortsComponent) portsComponent: PortsComponent; - controller: Server; + controller:Controller ; node: Node; name: string; inputForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts index 6e62bd50..4876c3ce 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { VpcsConfigurationService } from '../../../../../services/vpcs-configuration.service'; @@ -13,7 +13,7 @@ import { VpcsConfigurationService } from '../../../../../services/vpcs-configura styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogEthernetHubComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; numberOfPorts: number; inputForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts index 2a436f65..6765e585 100644 --- a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { IosConfigurationService } from '../../../../../services/ios-configuration.service'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -13,7 +13,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogIosComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; generalSettingsForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts index 7d544857..f56450e5 100644 --- a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts +++ b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { IouConfigurationService } from '../../../../../services/iou-configuration.service'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -13,7 +13,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogIouComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; generalSettingsForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts index 610ca170..0cc3f868 100644 --- a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts +++ b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogNatComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; generalSettingsForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts index 3a6016a5..246804aa 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts +++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts @@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node'; import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component'; import { QemuBinary } from '../../../../../models/qemu/qemu-binary'; import { QemuImage } from '../../../../../models/qemu/qemu-image'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { QemuConfigurationService } from '../../../../../services/qemu-configuration.service'; import { QemuService } from '../../../../../services/qemu.service'; @@ -18,7 +18,7 @@ import { QemuImageCreatorComponent } from './qemu-image-creator/qemu-image-creat styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogQemuComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; generalSettingsForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts index 5bd624e4..031f8e5c 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts +++ b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { QemuImg } from '../../../../../../models/qemu/qemu-img'; -import { Server } from '../../../../../../models/server'; +import{ Controller } from '../../../../../../models/controller'; import { NodeService } from '../../../../../../services/node.service'; import { QemuService } from '../../../../../../services/qemu.service'; import { ToasterService } from '../../../../../../services/toaster.service'; @@ -13,7 +13,7 @@ import { ToasterService } from '../../../../../../services/toaster.service'; styleUrls: ['../../configurator.component.scss'], }) export class QemuImageCreatorComponent implements OnInit { - controller: Server; + controller:Controller ; qemuImg: QemuImg; formatOptions: string[] = ['qcow2', 'qcow', 'vhd', 'vdi', 'vmdk', 'raw']; diff --git a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts index 2b0e4667..84aea58b 100644 --- a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss', '../../../../preferences/preferences.component.scss'], }) export class ConfiguratorDialogSwitchComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; nameForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts index 40655f85..b84592be 100644 --- a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts +++ b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { VirtualBoxConfigurationService } from '../../../../../services/virtual-box-configuration.service'; @@ -14,7 +14,7 @@ import { VirtualBoxConfigurationService } from '../../../../../services/virtual- styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogVirtualBoxComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; generalSettingsForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts index daac3c2f..a48809e0 100644 --- a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts +++ b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { VmwareConfigurationService } from '../../../../../services/vmware-configuration.service'; @@ -14,7 +14,7 @@ import { VmwareConfigurationService } from '../../../../../services/vmware-confi styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogVmwareComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; generalSettingsForm: FormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts index 041108a4..0ed4ffcf 100644 --- a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts +++ b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Node } from '../../../../../cartography/models/node'; -import { Server } from '../../../../../models/server'; +import{ Controller } from '../../../../../models/controller'; import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { VpcsConfigurationService } from '../../../../../services/vpcs-configuration.service'; @@ -13,7 +13,7 @@ import { VpcsConfigurationService } from '../../../../../services/vpcs-configura styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogVpcsComponent implements OnInit { - controller: Server; + controller:Controller ; node: Node; name: string; inputForm: FormGroup; diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.spec.ts b/src/app/components/project-map/nodes-menu/nodes-menu.component.spec.ts index 81378b9c..bf5e1952 100644 --- a/src/app/components/project-map/nodes-menu/nodes-menu.component.spec.ts +++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.spec.ts @@ -8,7 +8,7 @@ import { ElectronService } from 'ngx-electron'; import { of } from 'rxjs'; import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource'; import { NodeService } from '../../../services/node.service'; -import { ServerService } from '../../../services/server.service'; +import { ControllerService } from '../../../services/controller.service'; import { SettingsService } from '../../../services/settings.service'; import { ToasterService } from '../../../services/toaster.service'; import { MockedToasterService } from '../../../services/toaster.service.spec'; @@ -29,7 +29,7 @@ xdescribe('NodesMenuComponent', () => { { provide: NodeService, useValue: mockedNodeService }, { provide: ToasterService, useValue: mockedToasterService }, { provide: NodesDataSource, useValue: mockedNodesDataSource }, - { provide: ServerService }, + { provide: ControllerService }, { provide: SettingsService }, { provide: ElectronService }, ], diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts index a7e543a6..9d82a4de 100644 --- a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts +++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts @@ -3,11 +3,11 @@ import { MatDialog } from '@angular/material/dialog'; import { ElectronService } from 'ngx-electron'; import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { MapSettingsService } from '../../../services/mapsettings.service'; import { NodeService } from '../../../services/node.service'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; -import { ServerService } from '../../../services/server.service'; +import { ControllerService } from '../../../services/controller.service'; import { SettingsService } from '../../../services/settings.service'; import { ToasterService } from '../../../services/toaster.service'; import { NodesMenuConfirmationDialogComponent } from './nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component'; @@ -20,14 +20,14 @@ import { NodesMenuConfirmationDialogComponent } from './nodes-menu-confirmation- }) export class NodesMenuComponent { @Input('project') project: Project; - @Input('controller') controller: Server; + @Input('controller') controller:Controller ; constructor( private nodeService: NodeService, private nodeConsoleService: NodeConsoleService, private nodesDataSource: NodesDataSource, private toasterService: ToasterService, - private serverService: ServerService, + private serverService: ControllerService, private settingsService: SettingsService, private mapSettingsService: MapSettingsService, private electronService: ElectronService, diff --git a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts index 03dd1b36..ed86dc8d 100644 --- a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts +++ b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts @@ -5,7 +5,7 @@ import { FilterDescription } from '../../../../models/filter-description'; import { Link } from '../../../../models/link'; import { Message } from '../../../../models/message'; import { Project } from '../../../../models/project'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { LinkService } from '../../../../services/link.service'; import { HelpDialogComponent } from '../../help-dialog/help-dialog.component'; @@ -15,7 +15,7 @@ import { HelpDialogComponent } from '../../help-dialog/help-dialog.component'; styleUrls: ['./packet-filters.component.scss'], }) export class PacketFiltersDialogComponent implements OnInit { - controller: Server; + controller:Controller ; project: Project; link: Link; filters: Filter; diff --git a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts index 967ad236..5ad30d26 100644 --- a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts +++ b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts @@ -6,7 +6,7 @@ import { CapturingSettings } from '../../../../models/capturingSettings'; import { Link } from '../../../../models/link'; import { LinkNode } from '../../../../models/link-node'; import { Project } from '../../../../models/project'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { LinkService } from '../../../../services/link.service'; import { PacketCaptureService } from '../../../../services/packet-capture.service'; import { ToasterService } from '../../../../services/toaster.service'; @@ -18,7 +18,7 @@ import { PacketFiltersDialogComponent } from '../packet-filters/packet-filters.c styleUrls: ['./start-capture.component.scss'], }) export class StartCaptureDialogComponent implements OnInit { - controller: Server; + controller:Controller ; project: Project; link: Link; linkTypes = []; diff --git a/src/app/components/project-map/project-map-menu/project-map-menu.component.ts b/src/app/components/project-map/project-map-menu/project-map-menu.component.ts index 1435d255..f016b900 100644 --- a/src/app/components/project-map/project-map-menu/project-map-menu.component.ts +++ b/src/app/components/project-map/project-map-menu/project-map-menu.component.ts @@ -4,7 +4,7 @@ import { select } from 'd3-selection'; import * as svg from 'save-svg-as-png'; import downloadSvg from 'svg-crowbar'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { DrawingService } from '../../../services/drawing.service'; import { MapSettingsService } from '../../../services/mapsettings.service'; import { SymbolService } from '../../../services/symbol.service'; @@ -20,7 +20,7 @@ import { Screenshot, ScreenshotDialogComponent } from '../screenshot-dialog/scre }) export class ProjectMapMenuComponent implements OnInit, OnDestroy { @Input() project: Project; - @Input() controller: Server; + @Input() controller:Controller ; public selectedDrawing: string; public drawTools = { diff --git a/src/app/components/project-map/project-map.component.spec.ts b/src/app/components/project-map/project-map.component.spec.ts index e5fd0c17..24497636 100644 --- a/src/app/components/project-map/project-map.component.spec.ts +++ b/src/app/components/project-map/project-map.component.spec.ts @@ -46,7 +46,7 @@ import { ProjectWebServiceHandler } from '../../handlers/project-web-service-han import { CapturingSettings } from '../../models/capturingSettings'; import { Link } from '../../models/link'; import { Project } from '../../models/project'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { DrawingService } from '../../services/drawing.service'; import { LinkService } from '../../services/link.service'; import { MapScaleService } from '../../services/mapScale.service'; @@ -56,8 +56,8 @@ import { NotificationService } from '../../services/notification.service'; import { ProjectService } from '../../services/project.service'; import { MockedProjectService } from '../../services/project.service.spec'; import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service'; -import { ServerService } from '../../services/server.service'; -import { MockedServerService } from '../../services/server.service.spec'; +import { ControllerService } from '../../services/controller.service'; +import { MockedServerService } from '../../services/controller.service.spec'; import { SettingsService } from '../../services/settings.service'; import { ToasterService } from '../../services/toaster.service'; import { MockedToasterService } from '../../services/toaster.service.spec'; @@ -89,55 +89,55 @@ export class MockedNodeService { return of(this.node); } - delete(controller: Server, node: Node) { + delete(controller:Controller , node: Node) { return of(); } - startAll(controller: Server, project: Project) { + startAll(controller:Controller , project: Project) { return of(); } - stopAll(controller: Server, project: Project) { + stopAll(controller:Controller , project: Project) { return of(); } - suspendAll(controller: Server, project: Project) { + suspendAll(controller:Controller , project: Project) { return of(); } - reloadAll(controller: Server, project: Project) { + reloadAll(controller:Controller , project: Project) { return of(); } - start(controller: Server, node: Node) { + start(controller:Controller , node: Node) { return of(); } - stop(controller: Server, node: Node) { + stop(controller:Controller , node: Node) { return of(); } - suspend(controller: Server, node: Node) { + suspend(controller:Controller , node: Node) { return of(); } - reload(controller: Server, node: Node) { + reload(controller:Controller , node: Node) { return of(); } - duplicate(controller: Server, node: Node) { + duplicate(controller:Controller , node: Node) { return of(node); } - getStartupConfiguration(controller: Server, node: Node) { + getStartupConfiguration(controller:Controller , node: Node) { return of('sample config'); } - saveConfiguration(controller: Server, node: Node, configuration: string) { + saveConfiguration(controller:Controller , node: Node, configuration: string) { return of(configuration); } - update(controller: Server, node: Node) { + update(controller:Controller , node: Node) { return of(node); } } @@ -146,31 +146,31 @@ export class MockedDrawingService { public drawing = {} as Drawing; constructor() {} - add(_server: Server, _project_id: string, _x: number, _y: number, _svg: string) { + add(_server:Controller , _project_id: string, _x: number, _y: number, _svg: string) { return of(this.drawing); } - duplicate(controller: Server, project_id: string, drawing: Drawing) { + duplicate(controller:Controller , project_id: string, drawing: Drawing) { return of(drawing); } - updatePosition(_server: Server, _project: Project, _drawing: Drawing, _x: number, _y: number) { + updatePosition(_server:Controller , _project: Project, _drawing: Drawing, _x: number, _y: number) { return of(this.drawing); } - updateSizeAndPosition(_server: Server, _drawing: Drawing, _x: number, _y: number, _svg: string) { + updateSizeAndPosition(_server:Controller , _drawing: Drawing, _x: number, _y: number, _svg: string) { return of(this.drawing); } - update(_server: Server, _drawing: Drawing) { + update(_server:Controller , _drawing: Drawing) { return of(this.drawing); } - delete(_server: Server, _drawing: Drawing) { + delete(_server:Controller , _drawing: Drawing) { return of(this.drawing); } - updateText(_server: Server, _drawing: Drawing, _svg: string): Observable { + updateText(_server:Controller , _drawing: Drawing, _svg: string): Observable { return of(this.drawing); } } @@ -178,15 +178,15 @@ export class MockedDrawingService { export class MockedLinkService { constructor() {} - getLink(controller: Server, projectId: string, linkId: string) { + getLink(controller:Controller , projectId: string, linkId: string) { return of({}); } - deleteLink(_server: Server, link: Link) { + deleteLink(_server:Controller , link: Link) { return of({}); } - updateLink(controller: Server, link: Link) { + updateLink(controller:Controller , link: Link) { return of({}); } @@ -198,11 +198,11 @@ export class MockedLinkService { return of({}); } - startCaptureOnLink(controller: Server, link: Link, settings: CapturingSettings) { + startCaptureOnLink(controller:Controller , link: Link, settings: CapturingSettings) { return of({}); } - getAvailableFilters(controller: Server, link: Link) { + getAvailableFilters(controller:Controller , link: Link) { return of({}); } } @@ -276,7 +276,7 @@ xdescribe('ProjectMapComponent', () => { ], providers: [ { provide: ActivatedRoute }, - { provide: ServerService, useClass: MockedServerService }, + { provide: ControllerService, useClass: MockedServerService }, { provide: ProjectService, useClass: MockedProjectService }, { provide: NodeService }, { provide: LinkService }, diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts index 41430293..bc16f63f 100644 --- a/src/app/components/project-map/project-map.component.ts +++ b/src/app/components/project-map/project-map.component.ts @@ -62,7 +62,7 @@ import { ProgressService } from '../../common/progress/progress.service'; import { ProjectWebServiceHandler } from '../../handlers/project-web-service-handler'; import { Link } from '../../models/link'; import { Project } from '../../models/project'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { Symbol } from '../../models/symbol'; import { DrawingService } from '../../services/drawing.service'; import { MapScaleService } from '../../services/mapScale.service'; @@ -72,7 +72,7 @@ import { NodeConsoleService } from '../../services/nodeConsole.service'; import { NotificationService } from '../../services/notification.service'; import { ProjectService } from '../../services/project.service'; import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service'; -import { ServerService } from '../../services/server.service'; +import { ControllerService } from '../../services/controller.service'; import { Settings, SettingsService } from '../../services/settings.service'; import { SymbolService } from '../../services/symbol.service'; import { ThemeService } from '../../services/theme.service'; @@ -104,7 +104,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { public drawings: Drawing[] = []; public symbols: Symbol[] = []; public project: Project; - public controller: Server; + public controller:Controller ; public projectws: WebSocket; public ws: WebSocket; public isProjectMapMenuVisible: boolean = false; @@ -142,7 +142,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private projectService: ProjectService, private nodeService: NodeService, public drawingService: DrawingService, @@ -333,7 +333,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { from(this.serverService.get(controller_id)) .pipe( - mergeMap((controller: Server) => { + mergeMap((controller:Controller ) => { if (!controller) this.router.navigate(['/controllers']); this.controller = controller; return this.projectService.get(controller, paramMap.get('project_id')).pipe( diff --git a/src/app/components/project-map/project-readme/project-readme.component.ts b/src/app/components/project-map/project-readme/project-readme.component.ts index bc6a1afc..646c9d25 100644 --- a/src/app/components/project-map/project-readme/project-readme.component.ts +++ b/src/app/components/project-map/project-readme/project-readme.component.ts @@ -1,6 +1,6 @@ import { Component, AfterViewInit } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { Project } from '../../../models/project'; import { ProjectService } from '../../../services/project.service'; import * as marked from 'marked'; @@ -14,7 +14,7 @@ import { ViewChild } from '@angular/core'; styleUrls: ['./project-readme.component.scss'] }) export class ProjectReadmeComponent implements AfterViewInit { - controller: Server; + controller:Controller ; project: Project; @ViewChild('text', {static: false}) text: ElementRef; diff --git a/src/app/components/project-map/web-console/web-console.component.ts b/src/app/components/project-map/web-console/web-console.component.ts index b43e3e44..c3df43a3 100644 --- a/src/app/components/project-map/web-console/web-console.component.ts +++ b/src/app/components/project-map/web-console/web-console.component.ts @@ -4,7 +4,7 @@ import { AttachAddon } from 'xterm-addon-attach'; import { FitAddon } from 'xterm-addon-fit'; import { Node } from '../../../cartography/models/node'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; import { ThemeService } from '../../../services/theme.service'; @@ -15,7 +15,7 @@ import { ThemeService } from '../../../services/theme.service'; styleUrls: ['../../../../../node_modules/xterm/css/xterm.css', './web-console.component.scss'], }) export class WebConsoleComponent implements OnInit, AfterViewInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Input() node: Node; diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts index 70a38a44..349730a1 100644 --- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts +++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts @@ -8,7 +8,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { Router } from '@angular/router'; import { of } from 'rxjs/internal/observable/of'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ProjectService } from '../../../services/project.service'; import { ToasterService } from '../../../services/toaster.service'; import { AddBlankProjectDialogComponent } from './add-blank-project-dialog.component'; @@ -53,7 +53,7 @@ export class MockedProjectService { describe('AddBlankProjectDialogComponent', () => { let component: AddBlankProjectDialogComponent; let fixture: ComponentFixture; - let controller: Server; + let controller:Controller ; let router = { navigate: jasmine.createSpy('navigate'), }; @@ -85,7 +85,7 @@ describe('AddBlankProjectDialogComponent', () => { declarations: [AddBlankProjectDialogComponent], }).compileComponents(); - controller = new Server(); + controller = new Controller (); controller.host = 'localhost'; controller.port = 80; }); diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts index 280f5652..c53079ff 100644 --- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts +++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts @@ -4,7 +4,7 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { v4 as uuid } from 'uuid'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ProjectService } from '../../../services/project.service'; import { ToasterService } from '../../../services/toaster.service'; import { projectNameAsyncValidator } from '../../../validators/project-name-async-validator'; @@ -18,7 +18,7 @@ import { ProjectNameValidator } from '../models/projectNameValidator'; providers: [ProjectNameValidator], }) export class AddBlankProjectDialogComponent implements OnInit { - controller: Server; + controller:Controller ; projectNameForm: FormGroup; uuid: string; onAddProject = new EventEmitter(); diff --git a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts index 91d32664..7d7e408b 100644 --- a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts +++ b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ProjectService } from '../../../services/project.service'; @Component({ @@ -10,7 +10,7 @@ import { ProjectService } from '../../../services/project.service'; styleUrls: ['./choose-name-dialog.component.scss'], }) export class ChooseNameDialogComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; name: string; diff --git a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts index 166b9fb6..26c2acd7 100644 --- a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts +++ b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, Injectable, ViewChild } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { Project, ProjectVariable } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ProjectService } from '../../../services/project.service'; import { ToasterService } from '../../../services/toaster.service'; import { NonNegativeValidator } from '../../../validators/non-negative-validator'; @@ -16,7 +16,7 @@ import { ReadmeEditorComponent } from './readme-editor/readme-editor.component'; export class EditProjectDialogComponent implements OnInit { @ViewChild('editor') editor: ReadmeEditorComponent; - controller: Server; + controller:Controller ; project: Project; formGroup: FormGroup; variableFormGroup: FormGroup; diff --git a/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts b/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts index 56cb74f9..c61a9ddf 100644 --- a/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts +++ b/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewEncapsulation, Input } from '@angular/core'; import * as marked from 'marked'; import { ProjectService } from '../../../../services/project.service'; -import { Server } from '../../../../models/server'; +import{ Controller } from '../../../../models/controller'; import { Project } from '../../../../models/project'; @Component({ @@ -11,7 +11,7 @@ import { Project } from '../../../../models/project'; styleUrls: ['./readme-editor.component.scss'] }) export class ReadmeEditorComponent implements OnInit { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; public markdown = ``; diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts index 907b882d..ed8f3e06 100644 --- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts +++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts @@ -15,7 +15,7 @@ import { environment } from 'environments/environment'; import { FileItem, FileSelectDirective, FileUploadModule } from 'ng2-file-upload'; import { of } from 'rxjs/internal/observable/of'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ProjectService } from '../../../services/project.service'; import { ImportProjectDialogComponent } from './import-project-dialog.component'; import { ToasterService } from '../../../services/toaster.service'; @@ -51,11 +51,11 @@ export class MockedProjectService { return of(this.projects); } - getUploadPath(controller: Server, uuid: string, project_name: string) { + getUploadPath(controller:Controller , uuid: string, project_name: string) { return `http://${controller.host}:${controller.port}/${environment.current_version}/projects/${uuid}/import?name=${project_name}`; } - getExportPath(controller: Server, project: Project) { + getExportPath(controller:Controller , project: Project) { return `http://${controller.host}:${controller.port}/${environment.current_version}/projects/${project.project_id}/export`; } } @@ -63,7 +63,7 @@ export class MockedProjectService { describe('ImportProjectDialogComponent', () => { let component: ImportProjectDialogComponent; let fixture: ComponentFixture; - let controller: Server; + let controller:Controller ; let debugElement: DebugElement; let fileSelectDirective: FileSelectDirective; let mockedToasterService = new MockedToasterService() @@ -99,7 +99,7 @@ describe('ImportProjectDialogComponent', () => { declarations: [ImportProjectDialogComponent], }).compileComponents(); - controller = new Server(); + controller = new Controller (); controller.host = 'localhost'; controller.port = 80; }); diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts index f05edc2c..61dd151a 100644 --- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts +++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts @@ -5,7 +5,7 @@ import { ToasterService } from '../../../services/toaster.service'; import { FileItem, FileUploader, ParsedResponseHeaders } from 'ng2-file-upload'; import { v4 as uuid } from 'uuid'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ServerResponse } from '../../../models/serverResponse'; import { ProjectService } from '../../../services/project.service'; import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; @@ -23,7 +23,7 @@ import { MatSnackBar } from '@angular/material/snack-bar'; export class ImportProjectDialogComponent implements OnInit { uploader: FileUploader; uploadProgress: number = 0; - controller: Server; + controller:Controller ; isImportEnabled: boolean = false; isFinishEnabled: boolean = false; isDeleteVisible: boolean = false; diff --git a/src/app/components/projects/projects.component.spec.ts b/src/app/components/projects/projects.component.spec.ts index f9fc9d77..1ba94600 100644 --- a/src/app/components/projects/projects.component.spec.ts +++ b/src/app/components/projects/projects.component.spec.ts @@ -17,11 +17,11 @@ import { of } from 'rxjs'; import { ProgressService } from '../../common/progress/progress.service'; import { ProjectsFilter } from '../../filters/projectsFilter.pipe'; import { Project } from '../../models/project'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { ProjectService } from '../../services/project.service'; import { MockedProjectService } from '../../services/project.service.spec'; -import { ServerService } from '../../services/server.service'; -import { MockedServerService } from '../../services/server.service.spec'; +import { ControllerService } from '../../services/controller.service'; +import { MockedServerService } 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'; @@ -32,8 +32,8 @@ xdescribe('ProjectsComponent', () => { let fixture: ComponentFixture; let settingsService: SettingsService; let projectService: ProjectService; - let serverService: ServerService; - let controller: Server; + let serverService: ControllerService; + let controller:Controller ; let progressService: ProgressService; let mockedProjectService: MockedProjectService = new MockedProjectService(); let electronService; @@ -66,7 +66,7 @@ xdescribe('ProjectsComponent', () => { RouterTestingModule.withRoutes([]), ], providers: [ - { provide: ServerService, useClass: MockedServerService }, + { provide: ControllerService, useClass: MockedServerService }, { provide: ProjectService, useValue: mockedProjectService }, { provide: SettingsService }, { provide: ToasterService }, @@ -81,12 +81,12 @@ xdescribe('ProjectsComponent', () => { }) .compileComponents(); - serverService = TestBed.inject(ServerService); + serverService = TestBed.inject(ControllerService); settingsService = TestBed.inject(SettingsService); projectService = TestBed.inject(ProjectService); progressService = TestBed.inject(ProgressService); - controller = new Server(); + controller = new Controller (); controller.id = 99; const settings = {} as Settings; diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts index 28fa208e..0a1c15a0 100644 --- a/src/app/components/projects/projects.component.ts +++ b/src/app/components/projects/projects.component.ts @@ -9,7 +9,7 @@ import { BehaviorSubject, merge, Observable } from 'rxjs'; import { map } from 'rxjs//operators'; import { ProgressService } from '../../common/progress/progress.service'; import { Project } from '../../models/project'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { ProjectService } from '../../services/project.service'; import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service'; import { Settings, SettingsService } from '../../services/settings.service'; @@ -26,7 +26,7 @@ import { NavigationDialogComponent } from './navigation-dialog/navigation-dialog styleUrls: ['./projects.component.scss'], }) export class ProjectsComponent implements OnInit { - controller: Server; + controller:Controller ; projectDatabase = new ProjectDatabase(); dataSource: ProjectDataSource; displayedColumns = ['name', 'actions']; diff --git a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts index f188101c..cc23f61d 100644 --- a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts +++ b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { MatDialogRef } from '@angular/material/dialog'; import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ProjectService } from '../../../services/project.service'; import { ToasterService } from '../../../services/toaster.service'; import { ProjectNameValidator } from '../models/projectNameValidator'; @@ -15,7 +15,7 @@ import { ProjectNameValidator } from '../models/projectNameValidator'; providers: [ProjectNameValidator], }) export class SaveProjectDialogComponent implements OnInit { - controller: Server; + controller:Controller ; project: Project; projectNameForm: FormGroup; onAddProject = new EventEmitter(); diff --git a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts index ad617cb5..ba0674bd 100644 --- a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts +++ b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts @@ -4,7 +4,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource'; import { Node } from '../../../cartography/models/node'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { Snapshot } from '../../../models/snapshot'; import { SnapshotService } from '../../../services/snapshot.service'; import { ToasterService } from '../../../services/toaster.service'; @@ -15,7 +15,7 @@ import { ToasterService } from '../../../services/toaster.service'; styleUrls: ['./create-snapshot-dialog.component.scss'], }) export class CreateSnapshotDialogComponent { - controller: Server; + controller:Controller ; project: Project; snapshot: Snapshot = new Snapshot(); inputForm: FormGroup; diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts index 223df286..8078fa83 100644 --- a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts +++ b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts @@ -15,9 +15,9 @@ import { of } from 'rxjs'; import { ProgressDialogService } from '../../../common/progress-dialog/progress-dialog.service'; import { DateFilter } from '../../../filters/dateFilter.pipe'; import { NameFilter } from '../../../filters/nameFilter.pipe'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { Snapshot } from '../../../models/snapshot'; -import { ServerResolve } from '../../../resolvers/server-resolve'; +import { ControllerResolve } from '../../../resolvers/controller-resolve'; import { SnapshotService } from '../../../services/snapshot.service'; import { ToasterService } from '../../../services/toaster.service'; import { MockedToasterService } from '../../../services/toaster.service.spec'; @@ -39,7 +39,7 @@ export class MockedActivatedRoute { }, }, data: { - controller: new Server(), + controller: new Controller (), }, }, }; @@ -47,15 +47,15 @@ export class MockedActivatedRoute { } export class MockedSnapshotService { - public list(controller: Server, project_id: string) { + public list(controller:Controller , project_id: string) { return of([]); } - public delete(controller: Server, project_id: string, snapshot_id: string) { + public delete(controller:Controller , project_id: string, snapshot_id: string) { return of({}); } - public restore(controller: Server, project_id: string, snapshot_id: string) { + public restore(controller:Controller , project_id: string, snapshot_id: string) { return of({}); } } @@ -82,7 +82,7 @@ describe('ListOfSnapshotsComponent', () => { { path: 'controller/:controller_id/project/:project_id/snapshots', component: ListOfSnapshotsComponent, - resolve: { controller: ServerResolve }, + resolve: { controller: ControllerResolve }, }, ]), ], diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts index bff62be1..f1e4754b 100644 --- a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts +++ b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Sort } from '@angular/material/sort'; import { ActivatedRoute } from '@angular/router'; -import { Server } from '../../..//models/server'; +import{ Controller } from '../../../models/controller'; import { ProgressDialogComponent } from '../../../common/progress-dialog/progress-dialog.component'; import { ProgressDialogService } from '../../../common/progress-dialog/progress-dialog.service'; import { Project } from '../../../models/project'; @@ -15,7 +15,7 @@ import { ToasterService } from '../../../services/toaster.service'; styleUrls: ['./list-of-snapshots.component.scss'], }) export class ListOfSnapshotsComponent implements OnInit { - controller: Server; + controller:Controller ; projectId: string; snapshots: Snapshot[]; displayedColumns = ['name', 'creationDate', 'actions']; diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts index 6e9ffa57..1a6c4ac8 100644 --- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts +++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts @@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog'; import { ProgressDialogComponent } from '../../../common/progress-dialog/progress-dialog.component'; import { ProgressDialogService } from '../../../common/progress-dialog/progress-dialog.service'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { Snapshot } from '../../../models/snapshot'; import { SnapshotService } from '../../../services/snapshot.service'; import { ToasterService } from '../../../services/toaster.service'; @@ -16,7 +16,7 @@ import { CreateSnapshotDialogComponent } from '../create-snapshot-dialog/create- }) export class SnapshotMenuItemComponent implements OnInit { @Input('project') project: Project; - @Input('controller') controller: Server; + @Input('controller') controller:Controller ; constructor( private dialog: MatDialog, diff --git a/src/app/components/system-status/status-info/status-info.component.ts b/src/app/components/system-status/status-info/status-info.component.ts index 8a432a49..b45d241e 100644 --- a/src/app/components/system-status/status-info/status-info.component.ts +++ b/src/app/components/system-status/status-info/status-info.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { ComputeStatistics } from '../../../models/computeStatistics'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { ComputeService } from '../../../services/compute.service'; -import { ServerService } from '../../../services/server.service'; +import { ControllerService } from '../../../services/controller.service'; import { ToasterService } from '../../../services/toaster.service'; @Component({ @@ -19,7 +19,7 @@ export class StatusInfoComponent implements OnInit { constructor( private route: ActivatedRoute, private computeService: ComputeService, - private serverService: ServerService, + private serverService: ControllerService, private toasterService: ToasterService ) {} @@ -29,7 +29,7 @@ export class StatusInfoComponent implements OnInit { } getStatistics() { - this.serverService.get(Number(this.controllerId)).then((controller: Server) => { + this.serverService.get(Number(this.controllerId)).then((controller:Controller ) => { this.computeService.getStatistics(controller).subscribe((statistics: ComputeStatistics[]) => { this.computeStatistics = statistics; setTimeout(() => { diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts index 16f09c2e..d18494fc 100644 --- a/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts +++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts @@ -4,7 +4,7 @@ import { FormBuilder, FormsModule, ReactiveFormsModule, Validators } from '@angu import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpServer } from 'app/services/http-server.service'; -import { MockedServerService } from 'app/services/server.service.spec'; +import { MockedServerService } 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'; diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts index 77b4b68d..5bd6343d 100644 --- a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts +++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts @@ -5,7 +5,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { BehaviorSubject, merge, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Project } from '../../../models/project'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; import { Template } from '../../../models/template'; import { TemplateService } from '../../../services/template.service'; import { ToasterService } from '../../../services/toaster.service'; @@ -17,7 +17,7 @@ import { NonNegativeValidator } from '../../../validators/non-negative-validator styleUrls: ['./template-list-dialog.component.scss'], }) export class TemplateListDialogComponent implements OnInit { - controller: Server; + controller:Controller ; project: Project; templateTypes: string[] = [ 'cloud', @@ -136,7 +136,7 @@ export class TemplateDatabase { return this.dataChange.value; } - constructor(private controller: Server, private templateService: TemplateService) { + constructor(private controller:Controller , private templateService: TemplateService) { this.templateService.list(this.controller).subscribe((templates) => { this.dataChange.next(templates); }); diff --git a/src/app/components/template/template.component.ts b/src/app/components/template/template.component.ts index f4bcf0d7..a7e1bf95 100644 --- a/src/app/components/template/template.component.ts +++ b/src/app/components/template/template.component.ts @@ -4,7 +4,7 @@ import { MatDialog } from '@angular/material/dialog'; import { ThemeService } from '../../services/theme.service'; import { Subscription } from 'rxjs'; import { Project } from '../../models/project'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { Template } from '../../models/template'; import { MapScaleService } from '../../services/mapScale.service'; import { SymbolService } from '../../services/symbol.service'; @@ -18,7 +18,7 @@ import { DomSanitizer } from '@angular/platform-browser'; styleUrls: ['./template.component.scss'], }) export class TemplateComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Output() onNodeCreation = new EventEmitter(); overlay; diff --git a/src/app/components/topology-summary/topology-summary.component.html b/src/app/components/topology-summary/topology-summary.component.html index 652d5deb..0637fb89 100644 --- a/src/app/components/topology-summary/topology-summary.component.html +++ b/src/app/components/topology-summary/topology-summary.component.html @@ -70,7 +70,7 @@ - +
diff --git a/src/app/components/topology-summary/topology-summary.component.spec.ts b/src/app/components/topology-summary/topology-summary.component.spec.ts index 913cdec0..0df56648 100644 --- a/src/app/components/topology-summary/topology-summary.component.spec.ts +++ b/src/app/components/topology-summary/topology-summary.component.spec.ts @@ -12,7 +12,7 @@ import { LinksDataSource } from '../../cartography/datasources/links-datasource' import { NodesDataSource } from '../../cartography/datasources/nodes-datasource'; import { Node } from '../../cartography/models/node'; import { Project } from '../../models/project'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { ComputeService } from '../../services/compute.service'; import { ProjectService } from '../../services/project.service'; import { MockedProjectService } from '../../services/project.service.spec'; @@ -20,7 +20,7 @@ import { MockedLinksDataSource, MockedNodesDataSource } from '../project-map/pro import { TopologySummaryComponent } from './topology-summary.component'; export class MockedComputeService { - getComputes(controller: Server) { + getComputes(controller:Controller ) { return of([]); } } diff --git a/src/app/components/topology-summary/topology-summary.component.ts b/src/app/components/topology-summary/topology-summary.component.ts index f3202095..f5e783c4 100644 --- a/src/app/components/topology-summary/topology-summary.component.ts +++ b/src/app/components/topology-summary/topology-summary.component.ts @@ -7,7 +7,7 @@ import { Node } from '../../cartography/models/node'; import { Compute } from '../../models/compute'; import { Project } from '../../models/project'; import { ProjectStatistics } from '../../models/project-statistics'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { ComputeService } from '../../services/compute.service'; import { ProjectService } from '../../services/project.service'; import { ThemeService } from '../../services/theme.service'; @@ -19,7 +19,7 @@ import { ThemeService } from '../../services/theme.service'; changeDetection: ChangeDetectionStrategy.Default, }) export class TopologySummaryComponent implements OnInit, OnDestroy { - @Input() controller: Server; + @Input() controller:Controller ; @Input() project: Project; @Output() closeTopologySummary = new EventEmitter(); diff --git a/src/app/components/users/logged-user/logged-user.component.ts b/src/app/components/users/logged-user/logged-user.component.ts index d79659e2..69173a56 100644 --- a/src/app/components/users/logged-user/logged-user.component.ts +++ b/src/app/components/users/logged-user/logged-user.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { ServerService } from '../../../services/server.service'; +import { ControllerService } from '../../../services/controller.service'; import { UserService } from '../../../services/user.service'; import { ToasterService } from '../../../services/toaster.service'; import { User } from '../../../models/users/user'; -import { Server } from '../../../models/server'; +import{ Controller } from '../../../models/controller'; @Component({ selector: 'app-logged-user', @@ -13,18 +13,18 @@ import { Server } from '../../../models/server'; }) export class LoggedUserComponent implements OnInit { public user: User; - public controller: Server; + public controller:Controller ; constructor( private route: ActivatedRoute, - private serverService: ServerService, + private serverService: ControllerService, private userService: UserService, private toasterService: ToasterService ) {} ngOnInit() { let controllerId = this.route.snapshot.paramMap.get('controller_id'); - this.serverService.get(+controllerId).then((controller: Server) => { + this.serverService.get(+controllerId).then((controller:Controller ) => { this.controller = controller; this.userService.getInformationAboutLoggedUser(controller).subscribe((response: any) => { this.user = response; diff --git a/src/app/components/web-console-full-window/web-console-full-window.component.ts b/src/app/components/web-console-full-window/web-console-full-window.component.ts index eb22b0a8..24bfcae0 100644 --- a/src/app/components/web-console-full-window/web-console-full-window.component.ts +++ b/src/app/components/web-console-full-window/web-console-full-window.component.ts @@ -6,10 +6,10 @@ import { Terminal } from 'xterm'; import { AttachAddon } from 'xterm-addon-attach'; import { FitAddon } from 'xterm-addon-fit'; import { Node } from '../../cartography/models/node'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; import { NodeService } from '../../services/node.service'; import { NodeConsoleService } from '../../services/nodeConsole.service'; -import { ServerService } from '../../services/server.service'; +import { ControllerService } from '../../services/controller.service'; @Component({ encapsulation: ViewEncapsulation.None, @@ -22,7 +22,7 @@ export class WebConsoleFullWindowComponent implements OnInit { private projectId: string; private nodeId: string; private subscriptions: Subscription = new Subscription(); - private controller: Server; + private controller:Controller ; private node: Node; public term: Terminal = new Terminal(); @@ -32,7 +32,7 @@ export class WebConsoleFullWindowComponent implements OnInit { constructor( private consoleService: NodeConsoleService, - private serverService: ServerService, + private serverService: ControllerService, private route: ActivatedRoute, private title: Title, private nodeService: NodeService @@ -59,7 +59,7 @@ export class WebConsoleFullWindowComponent implements OnInit { this.fitAddon.fit(); }); - this.serverService.get(+this.controllerId).then((controller: Server) => { + this.serverService.get(+this.controllerId).then((controller:Controller ) => { this.controller = controller; this.nodeService.getNodeById(this.controller, this.projectId, this.nodeId).subscribe((node: Node) => { this.node = node; diff --git a/src/app/filters/authImageFilter.ts b/src/app/filters/authImageFilter.ts index 80f2c8d6..4752c1bd 100644 --- a/src/app/filters/authImageFilter.ts +++ b/src/app/filters/authImageFilter.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; import { Console } from 'console'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from '../services/http-server.service'; import { DomSanitizer } from '@angular/platform-browser'; import { environment } from 'environments/environment'; @@ -15,7 +15,7 @@ export class AuthImageFilter implements PipeTransform { private domSanitizer: DomSanitizer ) { } - async transform(src: string, controller: Server) { + async transform(src: string, controller:Controller ) { let url = src.split(`${environment.current_version}`)[1]; const imageBlob: Blob = await this.httpServer.getBlob(controller, url).toPromise(); const reader = new FileReader(); diff --git a/src/app/guards/login-guard.ts b/src/app/guards/login-guard.ts index 6c92f430..247be264 100644 --- a/src/app/guards/login-guard.ts +++ b/src/app/guards/login-guard.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; import { LoginService } from '@services/login.service'; -import { Server } from '../models/server'; -import { ServerService } from '../services/server.service'; +import{ Controller } from '../models/controller'; +import { ControllerService } from '../services/controller.service'; @Injectable() export class LoginGuard implements CanActivate { - constructor(private serverService: ServerService, private loginService: LoginService, private router: Router) {} + constructor(private serverService: ControllerService, private loginService: LoginService, private router: Router) {} async canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot) { const controller_id = next.paramMap.get('controller_id'); @@ -15,7 +15,7 @@ export class LoginGuard implements CanActivate { try { await this.loginService.getLoggedUser(controller); } catch (e) {} - return this.serverService.get(parseInt(controller_id, 10)).then((controller: Server) => { + return this.serverService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { if (controller.authToken && !controller.tokenExpired) { return true; } diff --git a/src/app/interceptors/http.interceptor.ts b/src/app/interceptors/http.interceptor.ts index 649e8625..0bd5c076 100644 --- a/src/app/interceptors/http.interceptor.ts +++ b/src/app/interceptors/http.interceptor.ts @@ -1,13 +1,13 @@ import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { LoginService } from '@services/login.service'; -import { ServerService } from '@services/server.service'; +import { LoginService } from '../services/login.service'; +import { ControllerService } from '../services/controller.service'; import { Observable, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; @Injectable() export class HttpRequestsInterceptor implements HttpInterceptor { - constructor(private serverService: ServerService, private loginService: LoginService) {} + constructor(private serverService: ControllerService, private loginService: LoginService) {} intercept(httpRequest: HttpRequest, next: HttpHandler): Observable> { return next.handle(httpRequest).pipe( catchError((err) => { diff --git a/src/app/layouts/default-layout/default-layout.component.spec.ts b/src/app/layouts/default-layout/default-layout.component.spec.ts index 173c28c6..71d622b0 100644 --- a/src/app/layouts/default-layout/default-layout.component.spec.ts +++ b/src/app/layouts/default-layout/default-layout.component.spec.ts @@ -4,13 +4,13 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatToolbarModule } from '@angular/material/toolbar'; import { RouterTestingModule } from '@angular/router/testing'; -import { ServerService } from '../../services/server.service'; +import { ControllerService } from '../../services/controller.service'; import { ElectronService } from 'ngx-electron'; 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 { ServerManagementService, ServerStateEvent } from '../../services/server-management.service'; +import { ControllerManagementService, ServerStateEvent } from '../../services/controller-management.service'; import { ToasterService } from '../../services/toaster.service'; import { MockedToasterService } from '../../services/toaster.service.spec'; import { DefaultLayoutComponent } from './default-layout.component'; @@ -31,13 +31,13 @@ describe('DefaultLayoutComponent', () => { let fixture: ComponentFixture; let electronServiceMock: ElectronServiceMock; let serverManagementService = new MockedServerManagementService(); - let serverService: ServerService; + let serverService: ControllerService; let httpServer: HttpServer; let errorHandler: ServerErrorHandler; beforeEach(async() => { electronServiceMock = new ElectronServiceMock(); - serverManagementService.serverStatusChanged = new Subject(); + serverManagementService.controllerStatusChanged = new Subject(); await TestBed.configureTestingModule({ declarations: [DefaultLayoutComponent, ProgressComponent], @@ -48,7 +48,7 @@ describe('DefaultLayoutComponent', () => { useValue: electronServiceMock, }, { - provide: ServerManagementService, + provide: ControllerManagementService, useValue: serverManagementService, }, { @@ -59,7 +59,7 @@ describe('DefaultLayoutComponent', () => { provide: RecentlyOpenedProjectService, useClass: RecentlyOpenedProjectService, }, - { provide: ServerService }, + { provide: ControllerService }, { provide: HttpServer }, { provide: ServerErrorHandler }, ProgressService, @@ -68,7 +68,7 @@ describe('DefaultLayoutComponent', () => { errorHandler = TestBed.inject(ServerErrorHandler); httpServer = TestBed.inject(HttpServer); - serverService = TestBed.inject(ServerService); + serverService = TestBed.inject(ControllerService); }); beforeEach(() => { @@ -95,7 +95,7 @@ describe('DefaultLayoutComponent', () => { it('should show error when server management service throw event', () => { const toaster: MockedToasterService = TestBed.get(ToasterService); - serverManagementService.serverStatusChanged.next({ + serverManagementService.controllerStatusChanged.next({ status: 'errored', message: 'Message', }); @@ -105,7 +105,7 @@ describe('DefaultLayoutComponent', () => { it('should not show error when server management service throw event', () => { component.ngOnDestroy(); const toaster: MockedToasterService = TestBed.get(ToasterService); - serverManagementService.serverStatusChanged.next({ + serverManagementService.controllerStatusChanged.next({ status: 'errored', message: 'Message', }); diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts index 2073b94c..56b3962d 100644 --- a/src/app/layouts/default-layout/default-layout.component.ts +++ b/src/app/layouts/default-layout/default-layout.component.ts @@ -1,15 +1,15 @@ import { Component, HostListener, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { NavigationEnd } from '@angular/router'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; -import { ServerService } from '../../services/server.service'; +import { ControllerService } from '../../services/controller.service'; import { ElectronService } from 'ngx-electron'; import { Subscription } from 'rxjs'; import { ProgressService } from '../../common/progress/progress.service'; import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service'; -import { ServerManagementService } from '../../services/server-management.service'; +import { ControllerManagementService } from '../../services/controller-management.service'; import { ToasterService } from '../../services/toaster.service'; import { version } from './../../version'; -import { Server } from '../../models/server'; +import{ Controller } from '../../models/controller'; @Component({ selector: 'app-default-layout', @@ -33,11 +33,11 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy { constructor( private electronService: ElectronService, private recentlyOpenedProjectService: RecentlyOpenedProjectService, - private serverManagement: ServerManagementService, + private serverManagement: ControllerManagementService, private toasterService: ToasterService, private progressService: ProgressService, public router: Router, - private serverService: ServerService + private serverService: ControllerService ) {} ngOnInit() { @@ -54,7 +54,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy { this.isInstalledSoftwareAvailable = this.electronService.isElectronApp; // attach to notification stream when any of running local servers experienced issues - this.serverStatusSubscription = this.serverManagement.serverStatusChanged.subscribe((serverStatus) => { + this.serverStatusSubscription = this.serverManagement.controllerStatusChanged.subscribe((serverStatus) => { if (serverStatus.status === 'errored') { console.error(serverStatus.message); this.toasterService.error(serverStatus.message); @@ -71,14 +71,14 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy { goToUserInfo() { let controllerId = this.router.url.split("/controller/")[1].split("/")[0]; - this.serverService.get(+controllerId).then((controller: Server) => { + this.serverService.get(+controllerId).then((controller:Controller ) => { this.router.navigate(['/controller', controller.id, 'loggeduser']); }); } goToDocumentation() { let controllerId = this.router.url.split("/controller/")[1].split("/")[0]; - this.serverService.get(+controllerId).then((controller: Server) => { + this.serverService.get(+controllerId).then((controller:Controller ) => { (window as any).open(`http://${controller.host}:${controller.port}/docs`); }); } @@ -93,7 +93,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy { logout() { let controllerId = this.router.url.split("/controller/")[1].split("/")[0]; - this.serverService.get(+controllerId).then((controller: Server) => { + this.serverService.get(+controllerId).then((controller:Controller ) => { controller.authToken = null; this.serverService.update(controller).then(val => this.router.navigate(['/controller', controller.id, 'login'])); }); diff --git a/src/app/models/server.ts b/src/app/models/controller.ts similarity index 94% rename from src/app/models/server.ts rename to src/app/models/controller.ts index 67d50d2b..97e71b7e 100644 --- a/src/app/models/server.ts +++ b/src/app/models/controller.ts @@ -2,7 +2,7 @@ export type ServerLocation = 'local' | 'remote' | 'bundled'; export type ServerStatus = 'stopped' | 'starting' | 'running'; export type ServerProtocol = 'http:' | 'https:'; -export class Server { +export class Controller { authToken: string; id: number; name: string; diff --git a/src/app/resolvers/server-resolve.ts b/src/app/resolvers/controller-resolve.ts similarity index 51% rename from src/app/resolvers/server-resolve.ts rename to src/app/resolvers/controller-resolve.ts index 142e6545..33e9a309 100644 --- a/src/app/resolvers/server-resolve.ts +++ b/src/app/resolvers/controller-resolve.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; -import { Server } from '../models/server'; -import { ServerService } from '../services/server.service'; +import{ Controller } from '../models/controller'; +import { ControllerService } from '../services/controller.service'; @Injectable() -export class ServerResolve implements Resolve { - constructor(private serverService: ServerService) {} +export class ControllerResolve implements Resolve { + constructor(private serverService: ControllerService) {} resolve(route: ActivatedRouteSnapshot) { return this.serverService.get(parseInt(route.params['controller_id'])); diff --git a/src/app/services/appliances.service.ts b/src/app/services/appliances.service.ts index 4204d332..326460b5 100644 --- a/src/app/services/appliances.service.ts +++ b/src/app/services/appliances.service.ts @@ -2,26 +2,26 @@ import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { Observable } from 'rxjs'; import { Appliance } from '../models/appliance'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; @Injectable() export class ApplianceService { constructor(private httpServer: HttpServer) {} - getAppliances(controller: Server): Observable { + getAppliances(controller:Controller ): Observable { return this.httpServer.get(controller, '/appliances') as Observable; } - getAppliance(controller: Server, url): Observable { + getAppliance(controller:Controller , url): Observable { return this.httpServer.get(controller, url) as Observable; } - getUploadPath(controller: Server, emulator: string, filename: string) { + getUploadPath(controller:Controller , emulator: string, filename: string) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/images/upload/${filename}`; } - updateAppliances(controller: Server): Observable { + updateAppliances(controller:Controller ): Observable { return this.httpServer.get(controller, '/appliances?update=yes') as Observable; } } diff --git a/src/app/services/built-in-templates.service.spec.ts b/src/app/services/built-in-templates.service.spec.ts index e29b04be..9e78de48 100644 --- a/src/app/services/built-in-templates.service.spec.ts +++ b/src/app/services/built-in-templates.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { CloudTemplate } from '../models/templates/cloud-template'; import { EthernetHubTemplate } from '../models/templates/ethernet-hub-template'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; @@ -14,7 +14,7 @@ describe('BuiltInTemplatesService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpServer: HttpServer; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/built-in-templates.service.ts b/src/app/services/built-in-templates.service.ts index b3a6fb8f..e1fa4dcb 100644 --- a/src/app/services/built-in-templates.service.ts +++ b/src/app/services/built-in-templates.service.ts @@ -1,25 +1,25 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; @Injectable() export class BuiltInTemplatesService { constructor(private httpServer: HttpServer) {} - getTemplates(controller: Server): Observable { + getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; } - getTemplate(controller: Server, template_id: string): Observable { + getTemplate(controller:Controller , template_id: string): Observable { return this.httpServer.get(controller, `/templates/${template_id}`) as Observable; } - addTemplate(controller: Server, builtInTemplate: any): Observable { + addTemplate(controller:Controller , builtInTemplate: any): Observable { return this.httpServer.post(controller, `/templates`, builtInTemplate) as Observable; } - saveTemplate(controller: Server, builtInTemplate: any): Observable { + saveTemplate(controller:Controller , builtInTemplate: any): Observable { return this.httpServer.put( controller, `/templates/${builtInTemplate.template_id}`, diff --git a/src/app/services/compute.service.ts b/src/app/services/compute.service.ts index 962a9ca1..aa919323 100644 --- a/src/app/services/compute.service.ts +++ b/src/app/services/compute.service.ts @@ -3,22 +3,22 @@ import { environment } from 'environments/environment'; import { Observable } from 'rxjs'; import { Compute } from '../models/compute'; import { ComputeStatistics } from '../models/computeStatistics'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; @Injectable() export class ComputeService { constructor(private httpServer: HttpServer) {} - getComputes(controller: Server): Observable { + getComputes(controller:Controller ): Observable { return this.httpServer.get(controller, '/computes') as Observable; } - getUploadPath(controller: Server, emulator: string, filename: string) { + getUploadPath(controller:Controller , emulator: string, filename: string) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/${emulator}/images/${filename}`; } - getStatistics(controller: Server): Observable { + getStatistics(controller:Controller ): Observable { return this.httpServer.get(controller, `/statistics`); } } diff --git a/src/app/services/server-management.service.spec.ts b/src/app/services/controller-management.service.spec.ts similarity index 69% rename from src/app/services/server-management.service.spec.ts rename to src/app/services/controller-management.service.spec.ts index 9c1a4fcf..c87d1997 100644 --- a/src/app/services/server-management.service.spec.ts +++ b/src/app/services/controller-management.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed } from '@angular/core/testing'; import { ElectronService } from 'ngx-electron'; -import { Server } from '../models/server'; -import { ServerManagementService } from './server-management.service'; +import{ Controller } from '../models/controller'; +import { ControllerManagementService } from './controller-management.service'; -describe('ServerManagementService', () => { +describe('ControllerManagementService', () => { let electronService; let callbacks; let removed; @@ -44,51 +44,51 @@ describe('ServerManagementService', () => { beforeEach(() => TestBed.configureTestingModule({ providers: [ - ServerManagementService, + ControllerManagementService, { provide: ElectronService, useValue: electronService }, ], }) ); it('should be created', () => { - const service: ServerManagementService = TestBed.get(ServerManagementService); + const service: ControllerManagementService = TestBed.get(ControllerManagementService); expect(service).toBeTruthy(); }); it('should attach when running as electron app', () => { - TestBed.get(ServerManagementService); + TestBed.get(ControllerManagementService); expect(callbacks.length).toEqual(1); expect(callbacks[0].channel).toEqual('local-controller-status-events'); }); it('should not attach when running as not electron app', () => { electronService.isElectronApp = false; - TestBed.get(ServerManagementService); + TestBed.get(ControllerManagementService); expect(callbacks.length).toEqual(0); }); it('should deattach when running as electron app', () => { - const service: ServerManagementService = TestBed.get(ServerManagementService); + const service: ControllerManagementService = TestBed.get(ControllerManagementService); service.ngOnDestroy(); expect(removed).toEqual(['local-controller-status-events']); }); it('should not deattach when running as not electron app', () => { electronService.isElectronApp = false; - const service: ServerManagementService = TestBed.get(ServerManagementService); + const service: ControllerManagementService = TestBed.get(ControllerManagementService); service.ngOnDestroy(); expect(removed).toEqual([]); }); it('should start local controller', async () => { - const service: ServerManagementService = TestBed.get(ServerManagementService); - await service.start({ name: 'test' } as Server); + const service: ControllerManagementService = TestBed.get(ControllerManagementService); + await service.start({ name: 'test' } as Controller ); expect(controller).toEqual({ name: 'test' }); }); it('should stop local controller', async () => { - const service: ServerManagementService = TestBed.get(ServerManagementService); - await service.stop({ name: 'test2' } as Server); + const service: ControllerManagementService = TestBed.get(ControllerManagementService); + await service.stop({ name: 'test2' } as Controller ); expect(controller).toEqual({ name: 'test2' }); }); }); diff --git a/src/app/services/server-management.service.ts b/src/app/services/controller-management.service.ts similarity index 74% rename from src/app/services/server-management.service.ts rename to src/app/services/controller-management.service.ts index b7f0257e..78749beb 100644 --- a/src/app/services/server-management.service.ts +++ b/src/app/services/controller-management.service.ts @@ -1,22 +1,22 @@ import { Injectable, OnDestroy } from '@angular/core'; import { ElectronService } from 'ngx-electron'; import { Subject } from 'rxjs'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; -export interface ServerStateEvent { +export interface ControllerStateEvent { serverName: string; status: 'starting' | 'started' | 'errored' | 'stopped' | 'stderr'; message: string; } @Injectable() -export class ServerManagementService implements OnDestroy { - serverStatusChanged = new Subject(); +export class ControllerManagementService implements OnDestroy { + controllerStatusChanged = new Subject(); constructor(private electronService: ElectronService) { if (this.electronService.isElectronApp) { this.electronService.ipcRenderer.on(this.statusChannel, (event, data) => { - this.serverStatusChanged.next(data); + this.controllerStatusChanged.next(data); }); } } @@ -25,17 +25,17 @@ export class ServerManagementService implements OnDestroy { return 'local-controller-status-events'; } - async start(controller: Server) { - var startingEvent: ServerStateEvent = { + async start(controller:Controller ) { + var startingEvent: ControllerStateEvent = { serverName: controller.name, status: 'starting', message: '', }; - this.serverStatusChanged.next(startingEvent); + this.controllerStatusChanged.next(startingEvent); return await this.electronService.remote.require('./local-server.js').startLocalServer(controller); } - async stop(controller: Server) { + async stop(controller:Controller ) { return await this.electronService.remote.require('./local-server.js').stopLocalServer(controller); } diff --git a/src/app/services/server-settings.service.spec.ts b/src/app/services/controller-settings.service.spec.ts similarity index 56% rename from src/app/services/server-settings.service.spec.ts rename to src/app/services/controller-settings.service.spec.ts index c3fea9d5..4318af09 100644 --- a/src/app/services/server-settings.service.spec.ts +++ b/src/app/services/controller-settings.service.spec.ts @@ -1,35 +1,35 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; -import { Server } from '../models/server'; +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 { ServerSettingsService } from './server-settings.service'; +import { ControllerSettingsService } from './controller-settings.service'; -export class MockedServerSettingsService { - getSettingsForQemu(controller: Server) { +export class MockedControllerSettingsService { + getSettingsForQemu(controller:Controller ) { return of([]); } - updateSettingsForQemu(controller: Server, qemuSettings: QemuSettings) { + updateSettingsForQemu(controller:Controller , qemuSettings: QemuSettings) { return of([]); } } -describe('ServerSettingsService', () => { +describe('ControllerSettingsService', () => { let httpServer: HttpServer; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, ServerSettingsService], + providers: [HttpServer, ControllerSettingsService], }); httpServer = TestBed.get(HttpServer); }); - it('should be created', inject([ServerSettingsService], (service: ServerSettingsService) => { + it('should be created', inject([ControllerSettingsService], (service: ControllerSettingsService) => { expect(service).toBeTruthy(); })); }); diff --git a/src/app/services/server-settings.service.ts b/src/app/services/controller-settings.service.ts similarity index 71% rename from src/app/services/server-settings.service.ts rename to src/app/services/controller-settings.service.ts index 98f588cb..034e944b 100644 --- a/src/app/services/server-settings.service.ts +++ b/src/app/services/controller-settings.service.ts @@ -1,26 +1,26 @@ import { Injectable } from '@angular/core'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { ServerSettings } from '../models/serverSettings'; import { QemuSettings } from '../models/settings/qemu-settings'; import { HttpServer } from './http-server.service'; @Injectable() -export class ServerSettingsService { +export class ControllerSettingsService { constructor(private httpServer: HttpServer) {} - get(controller: Server) { + get(controller:Controller ) { return this.httpServer.get(controller, `/settings`); } - update(controller: Server, serverSettings: ServerSettings) { + update(controller:Controller , serverSettings: ServerSettings) { return this.httpServer.post(controller, `/settings`, serverSettings); } - getSettingsForQemu(controller: Server) { + getSettingsForQemu(controller:Controller ) { return this.httpServer.get(controller, `/settings/qemu`); } - updateSettingsForQemu(controller: Server, qemuSettings: QemuSettings) { + updateSettingsForQemu(controller:Controller , qemuSettings: QemuSettings) { return this.httpServer.put(controller, `/settings/qemu`, { enable_hardware_acceleration: qemuSettings.enable_hardware_acceleration, require_hardware_acceleration: qemuSettings.require_hardware_acceleration, diff --git a/src/app/services/controller.database.ts b/src/app/services/controller.database.ts new file mode 100644 index 00000000..6d63929e --- /dev/null +++ b/src/app/services/controller.database.ts @@ -0,0 +1,48 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; +import{ Controller } from '../models/controller'; + +@Injectable() +export class ControllerDatabase { + dataChange: BehaviorSubject< Controller[] > = new BehaviorSubject< Controller[] >([]); + + constructor() {} + + get data():Controller [] { + return this.dataChange.value; + } + + public addServer(controller:Controller ) { + const controllers = this.data.slice(); + controllers.push(controller); + this.dataChange.next(controllers); + } + + public addServers(controllers:Controller []) { + this.dataChange.next(controllers); + } + + public remove(controller:Controller ) { + const index = this.data.indexOf(controller); + if (index >= 0) { + this.data.splice(index, 1); + this.dataChange.next(this.data.slice()); + } + } + + public find(controllerName: string) { + return this.data.find((controller) => controller.name === controllerName); + } + + public findIndex(controllerName: string) { + return this.data.findIndex((controller) => controller.name === controllerName); + } + + public update(controller:Controller ) { + const index = this.findIndex(controller.name); + if (index >= 0) { + this.data[index] = controller; + this.dataChange.next(this.data.slice()); + } + } +} diff --git a/src/app/services/server.service.spec.ts b/src/app/services/controller.service.spec.ts similarity index 69% rename from src/app/services/server.service.spec.ts rename to src/app/services/controller.service.spec.ts index c4904020..f5717e66 100644 --- a/src/app/services/server.service.spec.ts +++ b/src/app/services/controller.service.spec.ts @@ -1,9 +1,9 @@ -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; export class MockedServerService { - public servers: Server[] = []; + public servers:Controller [] = []; - public create(controller: Server) { + public create(controller:Controller ) { return new Promise((resolve, reject) => { this.servers.push(controller); resolve(controller); @@ -11,14 +11,14 @@ export class MockedServerService { } public get(controller_id: number) { - const controller = new Server(); + const controller = new Controller (); controller.id = controller_id; return Promise.resolve(controller); } public getLocalServer(hostname: string, port: number) { return new Promise((resolve, reject) => { - const controller = new Server(); + const controller = new Controller (); controller.id = 99; resolve(controller); }); @@ -30,7 +30,7 @@ export class MockedServerService { }); } - public getServerUrl(controller: Server) { + public getServerUrl(controller:Controller ) { return `${controller.host}:${controller.port}`; } } diff --git a/src/app/services/server.service.ts b/src/app/services/controller.service.ts similarity index 75% rename from src/app/services/server.service.ts rename to src/app/services/controller.service.ts index 213eb9bc..92d5c97d 100644 --- a/src/app/services/server.service.ts +++ b/src/app/services/controller.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import { Server, ServerProtocol } from '../models/server'; +import {Controller , ServerProtocol } from '../models/controller'; import { HttpServer } from './http-server.service'; @Injectable() -export class ServerService { +export class ControllerService { private controllerIds: string[] = []; public serviceInitialized: Subject = new Subject(); public isServiceInitialized: boolean; @@ -28,42 +28,42 @@ export class ServerService { localStorage.setItem("controllerIds", this.controllerIds.toString()); } - public get(id: number): Promise { - let controller: Server = JSON.parse(localStorage.getItem(`controller-${id}`)); - let promise = new Promise((resolve) => { + public get(id: number): Promise { + let controller:Controller = JSON.parse(localStorage.getItem(`controller-${id}`)); + let promise = new Promise((resolve) => { resolve(controller); }); return promise; } - public create(controller: Server) { + public create(controller:Controller ) { controller.id = this.controllerIds.length + 1; localStorage.setItem(`controller-${controller.id}`, JSON.stringify(controller)); this.controllerIds.push(`controller-${controller.id}`); this.updatecontrollerIds(); - let promise = new Promise((resolve) => { + let promise = new Promise((resolve) => { resolve(controller); }); return promise; } - public update(controller: Server) { + public update(controller:Controller ) { localStorage.removeItem(`controller-${controller.id}`); localStorage.setItem(`controller-${controller.id}`, JSON.stringify(controller)); - let promise = new Promise((resolve) => { + let promise = new Promise((resolve) => { resolve(controller); }); return promise; } public findAll() { - let promise = new Promise((resolve) => { - let servers: Server[] = []; + let promise = new Promise((resolve) => { + let servers:Controller [] = []; this.controllerIds.forEach((n) => { - let controller: Server = JSON.parse(localStorage.getItem(n)); + let controller:Controller = JSON.parse(localStorage.getItem(n)); servers.push(controller); }); resolve(servers); @@ -71,7 +71,7 @@ export class ServerService { return promise; } - public delete(controller: Server) { + public delete(controller:Controller ) { localStorage.removeItem(`controller-${controller.id}`); this.controllerIds = this.controllerIds.filter((n) => n !== `controller-${controller.id}`); this.updatecontrollerIds(); @@ -82,17 +82,17 @@ export class ServerService { return promise; } - public getServerUrl(controller: Server) { + public getServerUrl(controller:Controller ) { return `${controller.protocol}//${controller.host}:${controller.port}/`; } - public checkServerVersion(controller: Server): Observable { + public checkServerVersion(controller:Controller ): Observable { return this.httpServer.get(controller, '/version'); } public getLocalServer(host: string, port: number) { const promise = new Promise((resolve, reject) => { - this.findAll().then((servers: Server[]) => { + this.findAll().then((servers:Controller []) => { const local = servers.find((controller) => controller.location === 'bundled'); if (local) { local.host = host; @@ -102,7 +102,7 @@ export class ServerService { resolve(updated); }, reject); } else { - const controller = new Server(); + const controller = new Controller (); controller.name = 'local'; controller.host = host; controller.port = port; diff --git a/src/app/services/docker.service.ts b/src/app/services/docker.service.ts index 0f782bb2..be5a8801 100644 --- a/src/app/services/docker.service.ts +++ b/src/app/services/docker.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { Observable } from 'rxjs'; import { DockerImage } from '../models/docker/docker-image'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { DockerTemplate } from '../models/templates/docker-template'; import { HttpServer } from './http-server.service'; @@ -10,23 +10,23 @@ import { HttpServer } from './http-server.service'; export class DockerService { constructor(private httpServer: HttpServer) {} - getTemplates(controller: Server): Observable { + getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; } - getTemplate(controller: Server, template_id: string): Observable { + getTemplate(controller:Controller , template_id: string): Observable { return this.httpServer.get(controller, `/templates/${template_id}`) as Observable; } - getImages(controller: Server): Observable { + getImages(controller:Controller ): Observable { return this.httpServer.get(controller, `/computes/${environment.compute_id}/docker/images`) as Observable; } - addTemplate(controller: Server, dockerTemplate: any): Observable { + addTemplate(controller:Controller , dockerTemplate: any): Observable { return this.httpServer.post(controller, `/templates`, dockerTemplate) as Observable; } - saveTemplate(controller: Server, dockerTemplate: any): Observable { + saveTemplate(controller:Controller , dockerTemplate: any): Observable { return this.httpServer.put( controller, `/templates/${dockerTemplate.template_id}`, diff --git a/src/app/services/drawing.service.spec.ts b/src/app/services/drawing.service.spec.ts index b6bc27c8..75905d60 100644 --- a/src/app/services/drawing.service.spec.ts +++ b/src/app/services/drawing.service.spec.ts @@ -5,7 +5,7 @@ import { environment } from 'environments/environment'; import { SvgToDrawingConverter } from '../cartography/helpers/svg-to-drawing-converter'; import { Drawing } from '../cartography/models/drawing'; import { Project } from '../models/project'; -import { Server } from '../models/server'; +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'; @@ -15,7 +15,7 @@ describe('DrawingService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpServer: HttpServer; - let controller: Server; + let controller:Controller ; let project: Project = new Project(); beforeEach(() => { diff --git a/src/app/services/drawing.service.ts b/src/app/services/drawing.service.ts index bfef6a05..369a0148 100644 --- a/src/app/services/drawing.service.ts +++ b/src/app/services/drawing.service.ts @@ -4,14 +4,14 @@ import 'rxjs/add/operator/map'; import { SvgToDrawingConverter } from '../cartography/helpers/svg-to-drawing-converter'; import { Drawing } from '../cartography/models/drawing'; import { Project } from '../models/project'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; @Injectable() export class DrawingService { constructor(private httpServer: HttpServer, private svgToDrawingConverter: SvgToDrawingConverter) {} - add(controller: Server, project_id: string, x: number, y: number, svg: string) { + add(controller:Controller , project_id: string, x: number, y: number, svg: string) { return this.httpServer.post(controller, `/projects/${project_id}/drawings`, { svg: svg, x: Math.round(x), @@ -20,7 +20,7 @@ export class DrawingService { }); } - duplicate(controller: Server, project_id: string, drawing: Drawing) { + duplicate(controller:Controller , project_id: string, drawing: Drawing) { return this.httpServer.post(controller, `/projects/${project_id}/drawings`, { svg: drawing.svg, rotation: drawing.rotation, @@ -30,7 +30,7 @@ export class DrawingService { }); } - updatePosition(controller: Server, project: Project, drawing: Drawing, x: number, y: number): Observable { + updatePosition(controller:Controller , project: Project, drawing: Drawing, x: number, y: number): Observable { let xPosition: number = Math.round(x); let yPosition: number = Math.round(y); @@ -52,7 +52,7 @@ export class DrawingService { }); } - updateSizeAndPosition(controller: Server, drawing: Drawing, x: number, y: number, svg: string): Observable { + updateSizeAndPosition(controller:Controller , drawing: Drawing, x: number, y: number, svg: string): Observable { return this.httpServer.put(controller, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, { svg: svg, x: Math.round(x), @@ -60,7 +60,7 @@ export class DrawingService { }); } - updateText(controller: Server, drawing: Drawing, svg: string): Observable { + updateText(controller:Controller , drawing: Drawing, svg: string): Observable { return this.httpServer.put(controller, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, { svg: svg, x: Math.round(drawing.x), @@ -69,7 +69,7 @@ export class DrawingService { }); } - update(controller: Server, drawing: Drawing): Observable { + update(controller:Controller , drawing: Drawing): Observable { return this.httpServer.put(controller, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, { locked: drawing.locked, svg: drawing.svg, @@ -80,7 +80,7 @@ export class DrawingService { }); } - delete(controller: Server, drawing: Drawing) { + delete(controller:Controller , drawing: Drawing) { return this.httpServer.delete(controller, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`); } } diff --git a/src/app/services/http-server.service.spec.ts b/src/app/services/http-server.service.spec.ts index 6b76da90..0d342edc 100644 --- a/src/app/services/http-server.service.spec.ts +++ b/src/app/services/http-server.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { HttpServer, ServerError, ServerErrorHandler } from './http-server.service'; import { getTestServer } from './testing'; @@ -55,7 +55,7 @@ describe('HttpServer', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let service: HttpServer; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/http-server.service.ts b/src/app/services/http-server.service.ts index 9d32f259..a2d7aec0 100644 --- a/src/app/services/http-server.service.ts +++ b/src/app/services/http-server.service.ts @@ -3,7 +3,7 @@ import { EventEmitter, Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { Observable, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; -import { Server, ServerProtocol } from '../models/server'; +import {Controller , ServerProtocol } from '../models/controller'; /* tslint:disable:interface-over-type-literal */ export type JsonOptions = { @@ -103,7 +103,7 @@ export class HttpServer { constructor(private http: HttpClient, private errorHandler: ServerErrorHandler) {} - get(controller: Server, url: string, options?: JsonOptions): Observable { + get(controller:Controller , url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForServer(controller, url, options); this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`); @@ -113,7 +113,7 @@ export class HttpServer { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - getText(controller: Server, url: string, options?: TextOptions): Observable { + getText(controller:Controller , url: string, options?: TextOptions): Observable { options = this.getTextOptions(options); const intercepted = this.getOptionsForServer(controller, url, options); this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`); @@ -123,7 +123,7 @@ export class HttpServer { .pipe(catchError(this.errorHandler.handleError)); } - getBlob(controller: Server, url: string, options?: BlobOptions): Observable { + getBlob(controller:Controller , url: string, options?: BlobOptions): Observable { options = this.getBlobOptions(options); const intercepted = this.getOptionsForServer(controller, url, options); this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`); @@ -133,7 +133,7 @@ export class HttpServer { .pipe(catchError(this.errorHandler.handleError)); } - post(controller: Server, url: string, body: any | null, options?: JsonOptions): Observable { + post(controller:Controller , url: string, body: any | null, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForServer(controller, url, options); this.requestsNotificationEmitter.emit(`POST ${intercepted.url}`); @@ -143,7 +143,7 @@ export class HttpServer { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - put(controller: Server, url: string, body: any, options?: JsonOptions): Observable { + put(controller:Controller , url: string, body: any, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForServer(controller, url, options); this.requestsNotificationEmitter.emit(`PUT ${intercepted.url}`); @@ -153,7 +153,7 @@ export class HttpServer { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - delete(controller: Server, url: string, options?: JsonOptions): Observable { + delete(controller:Controller , url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForServer(controller, url, options); this.requestsNotificationEmitter.emit(`DELETE ${intercepted.url}`); @@ -163,7 +163,7 @@ export class HttpServer { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - patch(controller: Server, url: string, body: any, options?: JsonOptions): Observable { + patch(controller:Controller , url: string, body: any, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForServer(controller, url, options); return this.http @@ -171,7 +171,7 @@ export class HttpServer { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - head(controller: Server, url: string, options?: JsonOptions): Observable { + head(controller:Controller , url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForServer(controller, url, options); return this.http @@ -179,7 +179,7 @@ export class HttpServer { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - options(controller: Server, url: string, options?: JsonOptions): Observable { + options(controller:Controller , url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForServer(controller, url, options); return this.http @@ -214,7 +214,7 @@ export class HttpServer { return options; } - private getOptionsForServer(controller: Server, url: string, options: T) { + private getOptionsForServer(controller:Controller , url: string, options: T) { if (controller && controller.host && controller.port) { if (!controller.protocol) { controller.protocol = location.protocol as ServerProtocol; diff --git a/src/app/services/image-manager.service.spec.ts b/src/app/services/image-manager.service.spec.ts index 4f59d9f0..b8f77590 100644 --- a/src/app/services/image-manager.service.spec.ts +++ b/src/app/services/image-manager.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { AppTestingModule } from 'app/testing/app-testing/app-testing.module'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; import { getTestServer } from './testing'; @@ -14,7 +14,7 @@ describe('ImageManagerService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpServer: HttpServer; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/image-manager.service.ts b/src/app/services/image-manager.service.ts index 242fba68..f71ca275 100644 --- a/src/app/services/image-manager.service.ts +++ b/src/app/services/image-manager.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; import { Observable } from 'rxjs'; import { Image } from "../models/images"; @@ -12,22 +12,22 @@ export class ImageManagerService { constructor(private httpServer: HttpServer) { } - getImages(controller: Server) { + getImages(controller:Controller ) { return this.httpServer.get(controller, '/images') as Observable; } - getImagePath(controller:Server, install_appliance, image_path){ + getImagePath(controller :Controller, install_appliance, image_path){ return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/images/upload/${image_path}?install_appliances=${install_appliance}`; } - getUploadPath(controller: Server, emulator: string, filename: string) { + getUploadPath(controller:Controller , emulator: string, filename: string) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/images/upload/${filename}`; } - uploadedImage(controller:Server, install_appliance, image_path, flie){ + uploadedImage(controller :Controller, install_appliance, image_path, flie){ return this.httpServer.post(controller, `/images/upload/${image_path}?install_appliances=${install_appliance}`,flie) as Observable; } - deleteFile(controller:Server, image_path){ + deleteFile(controller :Controller, image_path){ return this.httpServer.delete(controller, `/images/${image_path}`) as Observable; } } diff --git a/src/app/services/info.service.ts b/src/app/services/info.service.ts index 38713e0c..36995c4d 100644 --- a/src/app/services/info.service.ts +++ b/src/app/services/info.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { Node } from '../cartography/models/node'; import { Port } from '../models/port'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; @Injectable() export class InfoService { - getInfoAboutNode(node: Node, controller: Server): string[] { + getInfoAboutNode(node: Node, controller:Controller ): string[] { let infoList: string[] = []; if (node.node_type === 'cloud') { infoList.push(`Cloud ${node.name} is always on.`); diff --git a/src/app/services/ios.service.ts b/src/app/services/ios.service.ts index 364d7ec9..cb023311 100644 --- a/src/app/services/ios.service.ts +++ b/src/app/services/ios.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { Observable } from 'rxjs'; import { IosImage } from '../models/images/ios-image'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { IosTemplate } from '../models/templates/ios-template'; import { HttpServer } from './http-server.service'; @@ -10,27 +10,27 @@ import { HttpServer } from './http-server.service'; export class IosService { constructor(private httpServer: HttpServer) {} - getImages(controller: Server): Observable { + getImages(controller:Controller ): Observable { return this.httpServer.get(controller, '/images?image_type=ios') as Observable; } - getImagePath(controller: Server, filename: string): string { + getImagePath(controller:Controller , filename: string): string { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/images/upload/${filename}`; } - getTemplates(controller: Server): Observable { + getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; } - getTemplate(controller: Server, template_id: string): Observable { + getTemplate(controller:Controller , template_id: string): Observable { return this.httpServer.get(controller, `/templates/${template_id}`) as Observable; } - addTemplate(controller: Server, iosTemplate: IosTemplate): Observable { + addTemplate(controller:Controller , iosTemplate: IosTemplate): Observable { return this.httpServer.post(controller, `/templates`, iosTemplate) as Observable; } - saveTemplate(controller: Server, iosTemplate: IosTemplate): Observable { + saveTemplate(controller:Controller , iosTemplate: IosTemplate): Observable { return this.httpServer.put( controller, `/templates/${iosTemplate.template_id}`, diff --git a/src/app/services/iou.service.ts b/src/app/services/iou.service.ts index 9e87ec50..8917e2ab 100644 --- a/src/app/services/iou.service.ts +++ b/src/app/services/iou.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { Observable } from 'rxjs'; import { IouImage } from '../models/iou/iou-image'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { IouTemplate } from '../models/templates/iou-template'; import { HttpServer } from './http-server.service'; @@ -10,27 +10,27 @@ import { HttpServer } from './http-server.service'; export class IouService { constructor(private httpServer: HttpServer) {} - getTemplates(controller: Server): Observable { + getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; } - getTemplate(controller: Server, template_id: string): Observable { + getTemplate(controller:Controller , template_id: string): Observable { return this.httpServer.get(controller, `/templates/${template_id}`) as Observable; } - getImages(controller: Server): Observable { + getImages(controller:Controller ): Observable { return this.httpServer.get(controller, '/images?image_type=iou') as Observable; } - getImagePath(controller: Server, filename: string): string { + getImagePath(controller:Controller , filename: string): string { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/images/upload/${filename}`; } - addTemplate(controller: Server, iouTemplate: any): Observable { + addTemplate(controller:Controller , iouTemplate: any): Observable { return this.httpServer.post(controller, `/templates`, iouTemplate) as Observable; } - saveTemplate(controller: Server, iouTemplate: any): Observable { + saveTemplate(controller:Controller , iouTemplate: any): Observable { return this.httpServer.put( controller, `/templates/${iouTemplate.template_id}`, diff --git a/src/app/services/link.service.spec.ts b/src/app/services/link.service.spec.ts index 17e2bd27..38bc8357 100644 --- a/src/app/services/link.service.spec.ts +++ b/src/app/services/link.service.spec.ts @@ -4,7 +4,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; import { Node } from '../cartography/models/node'; import { Port } from '../models/port'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { HttpServer } from './http-server.service'; import { LinkService } from './link.service'; @@ -14,7 +14,7 @@ describe('LinkService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpServer: HttpServer; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/link.service.ts b/src/app/services/link.service.ts index a0590b59..535616a1 100644 --- a/src/app/services/link.service.ts +++ b/src/app/services/link.service.ts @@ -6,7 +6,7 @@ import { FilterDescription } from '../models/filter-description'; import { Link } from '../models/link'; import { LinkNode } from '../models/link-node'; import { Port } from '../models/port'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; @Injectable() @@ -14,7 +14,7 @@ export class LinkService { constructor(private httpServer: HttpServer) {} createLink( - controller: Server, + controller:Controller , source_node: Node, source_port: Port, target_node: Node, @@ -54,33 +54,33 @@ export class LinkService { }); } - getLink(controller: Server, projectId: string, linkId: string) { + getLink(controller:Controller , projectId: string, linkId: string) { return this.httpServer.get(controller, `/projects/${projectId}/links/${linkId}`); } - deleteLink(controller: Server, link: Link) { + deleteLink(controller:Controller , link: Link) { return this.httpServer.delete(controller, `/projects/${link.project_id}/links/${link.link_id}`); } - updateLink(controller: Server, link: Link) { + updateLink(controller:Controller , link: Link) { link.x = Math.round(link.x); link.y = Math.round(link.y); return this.httpServer.put(controller, `/projects/${link.project_id}/links/${link.link_id}`, link); } - updateLinkStyle(controller: Server, link: Link) { + updateLinkStyle(controller:Controller , link: Link) { return this.httpServer.put(controller, `/projects/${link.project_id}/links/${link.link_id}`, link); } - getAvailableFilters(controller: Server, link: Link) { + getAvailableFilters(controller:Controller , link: Link) { return this.httpServer.get( controller, `/projects/${link.project_id}/links/${link.link_id}/available_filters` ); } - updateNodes(controller: Server, link: Link, nodes: LinkNode[]) { + updateNodes(controller:Controller , link: Link, nodes: LinkNode[]) { const requestNodes = nodes.map((linkNode) => { return { node_id: linkNode.node_id, @@ -99,19 +99,19 @@ export class LinkService { return this.httpServer.put(controller, `/projects/${link.project_id}/links/${link.link_id}`, { nodes: requestNodes }); } - startCaptureOnLink(controller: Server, link: Link, settings: CapturingSettings) { + startCaptureOnLink(controller:Controller , link: Link, settings: CapturingSettings) { return this.httpServer.post(controller, `/projects/${link.project_id}/links/${link.link_id}/capture/start`, settings); } - stopCaptureOnLink(controller: Server, link: Link) { + stopCaptureOnLink(controller:Controller , link: Link) { return this.httpServer.post(controller, `/projects/${link.project_id}/links/${link.link_id}/capture/stop`, {}); } - resetLink(controller: Server, link: Link) { + resetLink(controller:Controller , link: Link) { return this.httpServer.post(controller, `/projects/${link.project_id}/links/${link.link_id}/reset`, {}); } - streamPcap(controller: Server, link: Link) { + streamPcap(controller:Controller , link: Link) { return this.httpServer.get(controller, `/projects/${link.project_id}/links/${link.link_id}/capture/stream`); } } diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts index 5ceb64bc..4a3d93cc 100644 --- a/src/app/services/login.service.ts +++ b/src/app/services/login.service.ts @@ -1,7 +1,7 @@ import { HttpHeaders, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; import 'rxjs/add/operator/map'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; import { AuthResponse } from '../models/authResponse'; @@ -10,7 +10,7 @@ export class LoginService { controller_id:string ='' constructor(private httpServer: HttpServer) {} - login(controller: Server, username: string, password: string) { + login(controller:Controller , username: string, password: string) { const payload = new HttpParams() .set('username', username) .set('password', password); @@ -22,10 +22,10 @@ export class LoginService { return this.httpServer.post(controller, '/users/login', payload, options); } - getLoggedUser(controller: Server) { + getLoggedUser(controller:Controller ) { return this.httpServer.get(controller, "/users/me").toPromise() } - async getLoggedUserRefToken(controller: Server,current_user):Promise { + async getLoggedUserRefToken(controller:Controller ,current_user):Promise { return await this.httpServer.post(controller, "/users/authenticate", {"username":current_user.username,"password":current_user.password}).toPromise() } } diff --git a/src/app/services/node.service.spec.ts b/src/app/services/node.service.spec.ts index d88f8034..8046a59b 100644 --- a/src/app/services/node.service.spec.ts +++ b/src/app/services/node.service.spec.ts @@ -5,7 +5,7 @@ import { environment } from 'environments/environment'; import { Label } from '../cartography/models/label'; import { Node } from '../cartography/models/node'; import { Project } from '../models/project'; -import { Server } from '../models/server'; +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'; @@ -17,7 +17,7 @@ describe('NodeService', () => { let httpTestingController: HttpTestingController; let httpServer: HttpServer; let service: NodeService; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts index e96fa2e8..15c93e3a 100644 --- a/src/app/services/node.service.ts +++ b/src/app/services/node.service.ts @@ -4,7 +4,7 @@ import 'rxjs/add/operator/map'; import { Label } from '../cartography/models/label'; import { Node } from '../cartography/models/node'; import { Project } from '../models/project'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { Template } from '../models/template'; import { HttpServer } from './http-server.service'; @@ -12,56 +12,56 @@ import { HttpServer } from './http-server.service'; export class NodeService { constructor(private httpServer: HttpServer) {} - getNodeById(controller: Server, projectId: string, nodeId: string) { + getNodeById(controller:Controller , projectId: string, nodeId: string) { return this.httpServer.get(controller, `/projects/${projectId}/nodes/${nodeId}`); } - isolate(controller: Server, node: Node) { + isolate(controller:Controller , node: Node) { return this.httpServer.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/isolate`, {}); } - unisolate(controller: Server, node: Node) { + unisolate(controller:Controller , node: Node) { return this.httpServer.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/unisolate`, {}); } - start(controller: Server, node: Node) { + start(controller:Controller , node: Node) { debugger return this.httpServer.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/start`, {}); } - startAll(controller: Server, project: Project) { + startAll(controller:Controller , project: Project) { return this.httpServer.post(controller, `/projects/${project.project_id}/nodes/start`, {}); } - stop(controller: Server, node: Node) { + stop(controller:Controller , node: Node) { return this.httpServer.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/stop`, {}); } - stopAll(controller: Server, project: Project) { + stopAll(controller:Controller , project: Project) { return this.httpServer.post(controller, `/projects/${project.project_id}/nodes/stop`, {}); } - suspend(controller: Server, node: Node) { + suspend(controller:Controller , node: Node) { return this.httpServer.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/suspend`, {}); } - suspendAll(controller: Server, project: Project) { + suspendAll(controller:Controller , project: Project) { return this.httpServer.post(controller, `/projects/${project.project_id}/nodes/suspend`, {}); } - reload(controller: Server, node: Node) { + reload(controller:Controller , node: Node) { return this.httpServer.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/reload`, {}); } - reloadAll(controller: Server, project: Project) { + reloadAll(controller:Controller , project: Project) { return this.httpServer.post(controller, `/projects/${project.project_id}/nodes/reload`, {}); } - resetAllNodes(controller: Server, project: Project) { + resetAllNodes(controller:Controller , project: Project) { return this.httpServer.post(controller, `/projects/${project.project_id}/nodes/console/reset`, {}); } createFromTemplate( - controller: Server, + controller:Controller , project: Project, template: Template, x: number, @@ -82,7 +82,7 @@ export class NodeService { }); } - updatePosition(controller: Server, project: Project, node: Node, x: number, y: number): Observable { + updatePosition(controller:Controller , project: Project, node: Node, x: number, y: number): Observable { let xPosition: number = Math.round(x); let yPosition: number = Math.round(y); @@ -100,7 +100,7 @@ export class NodeService { }); } - updateLabel(controller: Server, node: Node, label: Label): Observable { + updateLabel(controller:Controller , node: Node, label: Label): Observable { return this.httpServer.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { label: { rotation: label.rotation, @@ -112,13 +112,13 @@ export class NodeService { }); } - updateSymbol(controller: Server, node: Node, changedSymbol: string): Observable { + updateSymbol(controller:Controller , node: Node, changedSymbol: string): Observable { return this.httpServer.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { symbol: changedSymbol, }); } - update(controller: Server, node: Node): Observable { + update(controller:Controller , node: Node): Observable { return this.httpServer.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { x: Math.round(node.x), y: Math.round(node.y), @@ -126,7 +126,7 @@ export class NodeService { }); } - updateNode(controller: Server, node: Node): Observable { + updateNode(controller:Controller , node: Node): Observable { return this.httpServer.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { console_type: node.console_type, console_auto_start: node.console_auto_start, @@ -136,7 +136,7 @@ export class NodeService { }); } - updateNodeWithCustomAdapters(controller: Server, node: Node): Observable { + updateNodeWithCustomAdapters(controller:Controller , node: Node): Observable { return this.httpServer.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { console_type: node.console_type, console_auto_start: node.console_auto_start, @@ -146,11 +146,11 @@ export class NodeService { }); } - delete(controller: Server, node: Node) { + delete(controller:Controller , node: Node) { return this.httpServer.delete(controller, `/projects/${node.project_id}/nodes/${node.node_id}`); } - duplicate(controller: Server, node: Node) { + duplicate(controller:Controller , node: Node) { return this.httpServer.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/duplicate`, { x: node.x + 10, y: node.y + 10, @@ -158,7 +158,7 @@ export class NodeService { }); } - getNode(controller: Server, node: Node) { + getNode(controller:Controller , node: Node) { return this.httpServer.get(controller, `/projects/${node.project_id}/nodes/${node.node_id}`); } @@ -166,7 +166,7 @@ export class NodeService { return `putty.exe -telnet \%h \%p -wt \"\%d\" -gns3 5 -skin 4`; } - getNetworkConfiguration(controller: Server, node: Node) { + getNetworkConfiguration(controller:Controller , node: Node) { return this.httpServer.get( controller, `/projects/${node.project_id}/nodes/${node.node_id}/files/etc/network/interfaces`, @@ -174,7 +174,7 @@ export class NodeService { ); } - saveNetworkConfiguration(controller: Server, node: Node, configuration: string) { + saveNetworkConfiguration(controller:Controller , node: Node, configuration: string) { return this.httpServer.post( controller, `/projects/${node.project_id}/nodes/${node.node_id}/files/etc/network/interfaces`, @@ -182,7 +182,7 @@ export class NodeService { ); } - getStartupConfiguration(controller: Server, node: Node) { + getStartupConfiguration(controller:Controller , node: Node) { let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'vpcs') { @@ -196,7 +196,7 @@ export class NodeService { return this.httpServer.get(controller, urlPath, { responseType: 'text' as 'json' }); } - getPrivateConfiguration(controller: Server, node: Node) { + getPrivateConfiguration(controller:Controller , node: Node) { let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'iou') { @@ -208,7 +208,7 @@ export class NodeService { return this.httpServer.get(controller, urlPath, { responseType: 'text' as 'json' }); } - saveConfiguration(controller: Server, node: Node, configuration: string) { + saveConfiguration(controller:Controller , node: Node, configuration: string) { let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'vpcs') { @@ -222,7 +222,7 @@ export class NodeService { return this.httpServer.post(controller, urlPath, configuration); } - savePrivateConfiguration(controller: Server, node: Node, configuration: string) { + savePrivateConfiguration(controller:Controller , node: Node, configuration: string) { let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'iou') { diff --git a/src/app/services/nodeConsole.service.ts b/src/app/services/nodeConsole.service.ts index b4bf656e..ba66c829 100644 --- a/src/app/services/nodeConsole.service.ts +++ b/src/app/services/nodeConsole.service.ts @@ -1,5 +1,5 @@ import { EventEmitter, Injectable } from '@angular/core'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { Subject } from 'rxjs'; import { Node } from '../cartography/models/node'; import { Router } from '@angular/router'; @@ -66,7 +66,7 @@ export class NodeConsoleService { return this.defaultConsoleHeight / this.defaultNumberOfRows; } - getUrl(controller: Server, node: Node) { + getUrl(controller:Controller , node: Node) { let protocol:string = "ws" if (controller.protocol === "https:") { protocol = "wss" diff --git a/src/app/services/notification.service.ts b/src/app/services/notification.service.ts index f5ed5d7e..e0f01206 100644 --- a/src/app/services/notification.service.ts +++ b/src/app/services/notification.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; @Injectable() export class NotificationService { - notificationsPath(controller: Server): string { + notificationsPath(controller:Controller ): string { let protocol:string = "ws" if (controller.protocol === "https:") { protocol = "wss" @@ -14,7 +14,7 @@ export class NotificationService { } - projectNotificationsPath(controller: Server, project_id: string): string { + projectNotificationsPath(controller:Controller , project_id: string): string { let protocol:string = "ws" if (controller.protocol === "https:") { protocol = "wss" diff --git a/src/app/services/packet-capture.service.ts b/src/app/services/packet-capture.service.ts index ad838ba3..943d0310 100644 --- a/src/app/services/packet-capture.service.ts +++ b/src/app/services/packet-capture.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { Link } from '../models/link'; import { Project } from '../models/project'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; @Injectable() export class PacketCaptureService { constructor() {} - startCapture(controller: Server, project: Project, link: Link, name: string) { + startCapture(controller:Controller , project: Project, link: Link, name: string) { location.assign( `gns3+pcap://${controller.host}:${controller.port}?project_id=${project.project_id}&link_id=${link.link_id}&name=${name}` ); diff --git a/src/app/services/project.service.spec.ts b/src/app/services/project.service.spec.ts index 2cd46927..92562fa0 100644 --- a/src/app/services/project.service.spec.ts +++ b/src/app/services/project.service.spec.ts @@ -4,7 +4,7 @@ import { TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; import { of } from 'rxjs'; import { Project } from '../models/project'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { HttpServer } from './http-server.service'; import { ProjectService } from './project.service'; @@ -18,15 +18,15 @@ import { getTestServer } from './testing'; export class MockedProjectService { public projects: Project[] = []; - list(controller: Server) { + list(controller:Controller ) { return of(this.projects); } - open(controller: Server, project: Project) { + open(controller:Controller , project: Project) { return of(project); } - close(controller: Server, project: Project) { + close(controller:Controller , project: Project) { return of(project); } @@ -34,22 +34,22 @@ export class MockedProjectService { return project.readonly; } - links(controller: Server, project_id: string) { + links(controller:Controller , project_id: string) { return of([]); } - delete(controller: Server, project_id: string) { + delete(controller:Controller , project_id: string) { return of(project_id); } - duplicate(controller: Server, project_id: string) { + duplicate(controller:Controller , project_id: string) { return of(project_id); } - getStatistics(controller: Server, project_id: string) { + getStatistics(controller:Controller , project_id: string) { return of({}); } - exportPortableProject(controller: Server, formData:{}) { + exportPortableProject(controller:Controller , formData:{}) { return of({}); } getCompression() { @@ -65,7 +65,7 @@ describe('ProjectService', () => { let httpTestingController: HttpTestingController; let httpServer: HttpServer; let service: ProjectService; - let controller: Server; + let controller:Controller ; let settingsService: SettingsService; beforeEach(() => { diff --git a/src/app/services/project.service.ts b/src/app/services/project.service.ts index 0a9e6e12..f0d5f6e3 100644 --- a/src/app/services/project.service.ts +++ b/src/app/services/project.service.ts @@ -5,7 +5,7 @@ import { Drawing } from '../cartography/models/drawing'; import { Node } from '../cartography/models/node'; import { Link } from '../models/link'; import { Project } from '../models/project'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; import { RecentlyOpenedProjectService } from './recentlyOpenedProject.service'; import { SettingsService } from './settings.service'; @@ -43,48 +43,48 @@ export class ProjectService { this.projectListSubject.next(true); } - getReadmeFile(controller: Server, project_id: string) { + getReadmeFile(controller:Controller , project_id: string) { return this.httpServer.getText(controller, `/projects/${project_id}/files/README.txt`); } - postReadmeFile(controller: Server, project_id: string, readme: string) { + postReadmeFile(controller:Controller , project_id: string, readme: string) { return this.httpServer.post(controller, `/projects/${project_id}/files/README.txt`, readme); } - get(controller: Server, project_id: string) { + get(controller:Controller , project_id: string) { return this.httpServer.get(controller, `/projects/${project_id}`); } - open(controller: Server, project_id: string) { + open(controller:Controller , project_id: string) { return this.httpServer.post(controller, `/projects/${project_id}/open`, {}); } - close(controller: Server, project_id: string) { + close(controller:Controller , project_id: string) { this.recentlyOpenedProjectService.removeData(); return this.httpServer.post(controller, `/projects/${project_id}/close`, {}); } - list(controller: Server) { + list(controller:Controller ) { return this.httpServer.get(controller, '/projects'); } - nodes(controller: Server, project_id: string) { + nodes(controller:Controller , project_id: string) { return this.httpServer.get(controller, `/projects/${project_id}/nodes`); } - links(controller: Server, project_id: string) { + links(controller:Controller , project_id: string) { return this.httpServer.get(controller, `/projects/${project_id}/links`); } - drawings(controller: Server, project_id: string) { + drawings(controller:Controller , project_id: string) { return this.httpServer.get(controller, `/projects/${project_id}/drawings`); } - add(controller: Server, project_name: string, project_id: string): Observable { + add(controller:Controller , project_name: string, project_id: string): Observable { return this.httpServer.post(controller, `/projects`, { name: project_name, project_id: project_id }); } - update(controller: Server, project: Project): Observable { + update(controller:Controller , project: Project): Observable { return this.httpServer.put(controller, `/projects/${project.project_id}`, { auto_close: project.auto_close, auto_open: project.auto_open, @@ -98,27 +98,27 @@ export class ProjectService { }); } - delete(controller: Server, project_id: string): Observable { + delete(controller:Controller , project_id: string): Observable { return this.httpServer.delete(controller, `/projects/${project_id}`); } - getUploadPath(controller: Server, uuid: string, project_name: string) { + getUploadPath(controller:Controller , uuid: string, project_name: string) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/projects/${uuid}/import?name=${project_name}`; } - getExportPath(controller: Server, project: Project) { + getExportPath(controller:Controller , project: Project) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/projects/${project.project_id}/export`; } - export(controller: Server, project_id: string): Observable { + export(controller:Controller , project_id: string): Observable { return this.httpServer.get(controller, `/projects/${project_id}/export`); } - getStatistics(controller: Server, project_id: string): Observable { + getStatistics(controller:Controller , project_id: string): Observable { return this.httpServer.get(controller, `/projects/${project_id}/stats`); } - duplicate(controller: Server, project_id: string, project_name): Observable { + duplicate(controller:Controller , project_id: string, project_name): Observable { return this.httpServer.post(controller, `/projects/${project_id}/duplicate`, { name: project_name }); } @@ -137,7 +137,7 @@ export class ProjectService { }; - getexportPortableProjectPath(controller:Server, project_id: string,formData:any={}) { + getexportPortableProjectPath(controller :Controller, project_id: string,formData:any={}) { if (formData.compression_level != null && formData.compression_level !='') { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/projects/${project_id}/export?include_snapshots=${formData.include_snapshots}&include_images=${formData.include_base_image}&reset_mac_addresses=${formData.reset_mac_address}&compression=${formData.compression}&compression_level=${formData.compression_level}&token=${controller.authToken}`; } else { diff --git a/src/app/services/qemu.service.spec.ts b/src/app/services/qemu.service.spec.ts index fa22f24f..1355f663 100644 --- a/src/app/services/qemu.service.spec.ts +++ b/src/app/services/qemu.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; -import { Server } from '../models/server'; +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'; @@ -13,7 +13,7 @@ describe('QemuService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpServer: HttpServer; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/qemu.service.ts b/src/app/services/qemu.service.ts index c2969eb5..d73b2d69 100644 --- a/src/app/services/qemu.service.ts +++ b/src/app/services/qemu.service.ts @@ -3,7 +3,7 @@ import { Observable } from 'rxjs'; import { QemuBinary } from '../models/qemu/qemu-binary'; import { QemuImage } from '../models/qemu/qemu-image'; import { QemuImg } from '../models/qemu/qemu-img'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { QemuTemplate } from '../models/templates/qemu-template'; import { HttpServer } from './http-server.service'; @@ -11,35 +11,35 @@ import { HttpServer } from './http-server.service'; export class QemuService { constructor(private httpServer: HttpServer) {} - getTemplates(controller: Server): Observable { + getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; } - getTemplate(controller: Server, template_id: string): Observable { + getTemplate(controller:Controller , template_id: string): Observable { return this.httpServer.get(controller, `/templates/${template_id}`) as Observable; } - getImagePath(controller: Server, filename: string): string { + getImagePath(controller:Controller , filename: string): string { return `${controller.protocol}//${controller.host}:${controller.port}/images/upload/${filename}`; } - getBinaries(controller: Server): Observable { + getBinaries(controller:Controller ): Observable { return this.httpServer.get(controller, '/computes/local/qemu/binaries') as Observable; } - getImages(controller: Server): Observable { + getImages(controller:Controller ): Observable { return this.httpServer.get(controller, '/images?image_type=qemu') as Observable; } - addImage(controller: Server, qemuImg: QemuImg): Observable { + addImage(controller:Controller , qemuImg: QemuImg): Observable { return this.httpServer.post(controller, '/images/upload', qemuImg) as Observable; } - addTemplate(controller: Server, qemuTemplate: QemuTemplate): Observable { + addTemplate(controller:Controller , qemuTemplate: QemuTemplate): Observable { return this.httpServer.post(controller, `/templates`, qemuTemplate) as Observable; } - saveTemplate(controller: Server, qemuTemplate: QemuTemplate): Observable { + saveTemplate(controller:Controller , qemuTemplate: QemuTemplate): Observable { return this.httpServer.put( controller, `/templates/${qemuTemplate.template_id}`, diff --git a/src/app/services/server.database.ts b/src/app/services/server.database.ts deleted file mode 100644 index b0b1ca03..00000000 --- a/src/app/services/server.database.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { Injectable } from '@angular/core'; -import { BehaviorSubject } from 'rxjs'; -import { Server } from '../models/server'; - -@Injectable() -export class ServerDatabase { - dataChange: BehaviorSubject = new BehaviorSubject([]); - - constructor() {} - - get data(): Server[] { - return this.dataChange.value; - } - - public addServer(controller: Server) { - const servers = this.data.slice(); - servers.push(controller); - this.dataChange.next(servers); - } - - public addServers(servers: Server[]) { - this.dataChange.next(servers); - } - - public remove(controller: Server) { - const index = this.data.indexOf(controller); - if (index >= 0) { - this.data.splice(index, 1); - this.dataChange.next(this.data.slice()); - } - } - - public find(serverName: string) { - return this.data.find((controller) => controller.name === serverName); - } - - public findIndex(serverName: string) { - return this.data.findIndex((controller) => controller.name === serverName); - } - - public update(controller: Server) { - const index = this.findIndex(controller.name); - if (index >= 0) { - this.data[index] = controller; - this.dataChange.next(this.data.slice()); - } - } -} diff --git a/src/app/services/snapshot.service.spec.ts b/src/app/services/snapshot.service.spec.ts index 749bacc2..9e655622 100644 --- a/src/app/services/snapshot.service.spec.ts +++ b/src/app/services/snapshot.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; -import { Server } from '../models/server'; +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'; @@ -14,7 +14,7 @@ describe('SnapshotService', () => { let httpTestingController: HttpTestingController; let httpServer: HttpServer; let service: SnapshotService; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/snapshot.service.ts b/src/app/services/snapshot.service.ts index 4d7c3d28..7b6f8936 100644 --- a/src/app/services/snapshot.service.ts +++ b/src/app/services/snapshot.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { Snapshot } from '../models/snapshot'; import { HttpServer } from './http-server.service'; @@ -7,19 +7,19 @@ import { HttpServer } from './http-server.service'; export class SnapshotService { constructor(private httpServer: HttpServer) {} - create(controller: Server, project_id: string, snapshot: Snapshot) { + create(controller:Controller , project_id: string, snapshot: Snapshot) { return this.httpServer.post(controller, `/projects/${project_id}/snapshots`, snapshot); } - delete(controller: Server, project_id: string, snapshot_id: string) { + delete(controller:Controller , project_id: string, snapshot_id: string) { return this.httpServer.delete(controller, `/projects/${project_id}/snapshots/${snapshot_id}`); } - list(controller: Server, project_id: string) { + list(controller:Controller , project_id: string) { return this.httpServer.get(controller, `/projects/${project_id}/snapshots`); } - restore(controller: Server, project_id: string, snapshot_id: string) { + restore(controller:Controller , project_id: string, snapshot_id: string) { return this.httpServer.post(controller, `/projects/${project_id}/snapshots/${snapshot_id}/restore`, {}); } } diff --git a/src/app/services/symbol.service.spec.ts b/src/app/services/symbol.service.spec.ts index 688c2c30..d7712297 100644 --- a/src/app/services/symbol.service.spec.ts +++ b/src/app/services/symbol.service.spec.ts @@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { inject, TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; import { of } from 'rxjs'; -import { Server } from '../models/server'; +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'; @@ -14,7 +14,7 @@ describe('SymbolService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpServer: HttpServer; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/symbol.service.ts b/src/app/services/symbol.service.ts index dc2d972d..ed08bdc6 100644 --- a/src/app/services/symbol.service.ts +++ b/src/app/services/symbol.service.ts @@ -3,7 +3,7 @@ import { Template } from '../models/template'; import { BehaviorSubject, Observable } from 'rxjs'; import { shareReplay } from 'rxjs/operators'; import { Node } from '../cartography/models/node'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { Symbol } from '../models/symbol'; import { HttpServer } from './http-server.service'; import { environment } from 'environments/environment'; @@ -26,7 +26,7 @@ export class SymbolService { return this.symbols.getValue().find((symbol: Symbol) => symbol.symbol_id === symbol_id); } - getDimensions(controller: Server, symbol_id: string): Observable { + getDimensions(controller:Controller , symbol_id: string): Observable { const encoded_uri = encodeURI(symbol_id); return this.httpServer.get(controller, `/symbols/${encoded_uri}/dimensions`); } @@ -43,16 +43,16 @@ export class SymbolService { return this.symbols.getValue().find((symbol: Symbol) => symbol.filename === symbol_filename); } - add(controller: Server, symbolName: string, symbol: string) { + add(controller:Controller , symbolName: string, symbol: string) { this.cache = null; return this.httpServer.post(controller, `/symbols/${symbolName}/raw`, symbol); } - load(controller: Server): Observable { + load(controller:Controller ): Observable { return this.httpServer.get(controller, '/symbols'); } - list(controller: Server) { + list(controller:Controller ) { if (!this.cache) { this.cache = this.load(controller).pipe(shareReplay(CACHE_SIZE)); } @@ -60,12 +60,12 @@ export class SymbolService { return this.cache; } - raw(controller: Server, symbol_id: string) { + raw(controller:Controller , symbol_id: string) { const encoded_uri = encodeURI(symbol_id); return this.httpServer.getText(controller, `/symbols/${encoded_uri}/raw`); } - getSymbolFromTemplate(controller: Server, template: Template) { + getSymbolFromTemplate(controller:Controller , template: Template) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/symbols/${template.symbol}/raw`; } } diff --git a/src/app/services/template.service.spec.ts b/src/app/services/template.service.spec.ts index 5cbba60e..3f3c7b6f 100644 --- a/src/app/services/template.service.spec.ts +++ b/src/app/services/template.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { HttpServer } from './http-server.service'; import { TemplateService } from './template.service'; @@ -28,7 +28,7 @@ describe('TemplateService', () => { }); it('should ask for the list from controller', () => { - const controller = new Server(); + const controller = new Controller (); controller.host = '127.0.0.1'; controller.port = 3080; diff --git a/src/app/services/template.service.ts b/src/app/services/template.service.ts index e496e23d..1e5ce83e 100644 --- a/src/app/services/template.service.ts +++ b/src/app/services/template.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; import 'rxjs/add/operator/map'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { Template } from '../models/template'; import { HttpServer } from './http-server.service'; @@ -11,11 +11,11 @@ export class TemplateService { constructor(private httpServer: HttpServer) {} - list(controller: Server): Observable { + list(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; } - deleteTemplate(controller: Server, templateId: string): Observable { + deleteTemplate(controller:Controller , templateId: string): Observable { return this.httpServer.delete(controller, `/templates/${templateId}`, { observe: 'body' }); } } diff --git a/src/app/services/testing.ts b/src/app/services/testing.ts index fac676b3..f2a3af6a 100644 --- a/src/app/services/testing.ts +++ b/src/app/services/testing.ts @@ -1,7 +1,7 @@ -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; -export function getTestServer(): Server { - const server = new Server(); +export function getTestServer():Controller { + const server = new Controller (); server.host = '127.0.0.1'; server.port = 3080; server.protocol = 'http:'; diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts index 1de293c4..01bb8011 100644 --- a/src/app/services/user.service.ts +++ b/src/app/services/user.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Subject } from 'rxjs'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { HttpServer } from './http-server.service'; import { User } from '../models/users/user'; @@ -10,7 +10,7 @@ export class UserService { private httpServer: HttpServer ) {} - getInformationAboutLoggedUser(controller: Server) { + getInformationAboutLoggedUser(controller:Controller ) { return this.httpServer.get(controller, '/users/me/'); } } diff --git a/src/app/services/version.service.spec.ts b/src/app/services/version.service.spec.ts index 6e83f327..e593fa09 100644 --- a/src/app/services/version.service.spec.ts +++ b/src/app/services/version.service.spec.ts @@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { inject, TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; import { Observable } from 'rxjs/Rx'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { HttpServer } from './http-server.service'; import { getTestServer } from './testing'; @@ -12,7 +12,7 @@ import { VersionService } from './version.service'; export class MockedVersionService { public response: Observable; - public get(controller: Server) { + public get(controller:Controller ) { return this.response; } } @@ -22,7 +22,7 @@ describe('VersionService', () => { let httpTestingController: HttpTestingController; let httpServer: HttpServer; let service: VersionService; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/version.service.ts b/src/app/services/version.service.ts index c688d4c2..aa327b0f 100644 --- a/src/app/services/version.service.ts +++ b/src/app/services/version.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import 'rxjs/add/operator/map'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { Version } from '../models/version'; import { HttpServer } from './http-server.service'; @@ -8,7 +8,7 @@ import { HttpServer } from './http-server.service'; export class VersionService { constructor(private httpServer: HttpServer) {} - get(controller: Server) { + get(controller:Controller ) { return this.httpServer.get(controller, '/version'); } } diff --git a/src/app/services/virtual-box-configuration.service.ts b/src/app/services/virtual-box-configuration.service.ts index fc0ce89c..9aa8d58d 100644 --- a/src/app/services/virtual-box-configuration.service.ts +++ b/src/app/services/virtual-box-configuration.service.ts @@ -33,8 +33,8 @@ export class VirtualBoxConfigurationService { 'PCnet-PCI II (Am79C970A)', 'PCNet-FAST III (Am79C973)', 'Intel PRO/1000 MT Desktop (82540EM)', - 'Intel PRO/1000 T Server (82543GC)', - 'Intel PRO/1000 MT Server (82545EM)', + 'Intel PRO/1000 TController (82543GC)', + 'Intel PRO/1000 MTController (82545EM)', 'Paravirtualized Network (virtio-net)', ]; diff --git a/src/app/services/virtual-box.service.spec.ts b/src/app/services/virtual-box.service.spec.ts index eddafbdb..067a9454 100644 --- a/src/app/services/virtual-box.service.spec.ts +++ b/src/app/services/virtual-box.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; -import { Server } from '../models/server'; +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'; @@ -13,7 +13,7 @@ describe('VirtualBoxService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpServer: HttpServer; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/virtual-box.service.ts b/src/app/services/virtual-box.service.ts index 8c01ba2a..7e139b3b 100644 --- a/src/app/services/virtual-box.service.ts +++ b/src/app/services/virtual-box.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { Observable } from 'rxjs'; -import { Server } from '../models/server'; +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'; @@ -10,18 +10,18 @@ import { HttpServer } from './http-server.service'; export class VirtualBoxService { constructor(private httpServer: HttpServer) {} - getTemplates(controller: Server): Observable { + getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; } - getTemplate(controller: Server, template_id: string): Observable { + getTemplate(controller:Controller , template_id: string): Observable { return this.httpServer.get( controller, `/templates/${template_id}` ) as Observable; } - addTemplate(controller: Server, virtualBoxTemplate: VirtualBoxTemplate): Observable { + addTemplate(controller:Controller , virtualBoxTemplate: VirtualBoxTemplate): Observable { return this.httpServer.post( controller, `/templates`, @@ -29,7 +29,7 @@ export class VirtualBoxService { ) as Observable; } - saveTemplate(controller: Server, virtualBoxTemplate: VirtualBoxTemplate): Observable { + saveTemplate(controller:Controller , virtualBoxTemplate: VirtualBoxTemplate): Observable { return this.httpServer.put( controller, `/templates/${virtualBoxTemplate.template_id}`, @@ -37,7 +37,7 @@ export class VirtualBoxService { ) as Observable; } - getVirtualMachines(controller: Server): Observable { + getVirtualMachines(controller:Controller ): Observable { return this.httpServer.get(controller, `/computes/${environment.compute_id}/virtualbox/vms`) as Observable; } } diff --git a/src/app/services/vmware.service.spec.ts b/src/app/services/vmware.service.spec.ts index 2f3d3aa5..0866d2a7 100644 --- a/src/app/services/vmware.service.spec.ts +++ b/src/app/services/vmware.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; -import { Server } from '../models/server'; +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'; @@ -13,7 +13,7 @@ describe('VmwareService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpServer: HttpServer; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/vmware.service.ts b/src/app/services/vmware.service.ts index a39f16f8..e158c686 100644 --- a/src/app/services/vmware.service.ts +++ b/src/app/services/vmware.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { Observable } from 'rxjs'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { VmwareTemplate } from '../models/templates/vmware-template'; import { VmwareVm } from '../models/vmware/vmware-vm'; import { HttpServer } from './http-server.service'; @@ -10,19 +10,19 @@ import { HttpServer } from './http-server.service'; export class VmwareService { constructor(private httpServer: HttpServer) {} - getTemplates(controller: Server): Observable { + getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; } - getTemplate(controller: Server, template_id: string): Observable { + getTemplate(controller:Controller , template_id: string): Observable { return this.httpServer.get(controller, `/templates/${template_id}`) as Observable; } - addTemplate(controller: Server, vmwareTemplate: VmwareTemplate): Observable { + addTemplate(controller:Controller , vmwareTemplate: VmwareTemplate): Observable { return this.httpServer.post(controller, `/templates`, vmwareTemplate) as Observable; } - saveTemplate(controller: Server, vmwareTemplate: VmwareTemplate): Observable { + saveTemplate(controller:Controller , vmwareTemplate: VmwareTemplate): Observable { return this.httpServer.put( controller, `/templates/${vmwareTemplate.template_id}`, @@ -30,7 +30,7 @@ export class VmwareService { ) as Observable; } - getVirtualMachines(controller: Server): Observable { + getVirtualMachines(controller:Controller ): Observable { return this.httpServer.get(controller, `/computes/${environment.compute_id}/vmware/vms`) as Observable; } } diff --git a/src/app/services/vpcs.service.spec.ts b/src/app/services/vpcs.service.spec.ts index ecf69078..9e534e18 100644 --- a/src/app/services/vpcs.service.spec.ts +++ b/src/app/services/vpcs.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { environment } from 'environments/environment'; -import { Server } from '../models/server'; +import { Controller } from '../models/controller'; import { VpcsTemplate } from '../models/templates/vpcs-template'; import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { HttpServer } from './http-server.service'; @@ -13,7 +13,7 @@ describe('VpcsService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpServer: HttpServer; - let controller: Server; + let controller:Controller ; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/vpcs.service.ts b/src/app/services/vpcs.service.ts index 9e0f0862..080e842d 100644 --- a/src/app/services/vpcs.service.ts +++ b/src/app/services/vpcs.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { VpcsTemplate } from '../models/templates/vpcs-template'; import { HttpServer } from './http-server.service'; @@ -8,19 +8,19 @@ import { HttpServer } from './http-server.service'; export class VpcsService { constructor(private httpServer: HttpServer) {} - getTemplates(controller: Server): Observable { + getTemplates(controller:Controller ): Observable { return this.httpServer.get(controller, '/templates') as Observable; } - getTemplate(controller: Server, template_id: string): Observable { + getTemplate(controller:Controller , template_id: string): Observable { return this.httpServer.get(controller, `/templates/${template_id}`) as Observable; } - addTemplate(controller: Server, vpcsTemplate: VpcsTemplate): Observable { + addTemplate(controller:Controller , vpcsTemplate: VpcsTemplate): Observable { return this.httpServer.post(controller, `/templates`, vpcsTemplate) as Observable; } - saveTemplate(controller: Server, vpcsTemplate: VpcsTemplate): Observable { + saveTemplate(controller:Controller , vpcsTemplate: VpcsTemplate): Observable { return this.httpServer.put( controller, `/templates/${vpcsTemplate.template_id}`, diff --git a/src/app/validators/project-name-async-validator.ts b/src/app/validators/project-name-async-validator.ts index f766808f..f40d37fb 100644 --- a/src/app/validators/project-name-async-validator.ts +++ b/src/app/validators/project-name-async-validator.ts @@ -1,10 +1,10 @@ import { FormControl } from '@angular/forms'; import { timer } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { ProjectService } from '../services/project.service'; -export const projectNameAsyncValidator = (controller: Server, projectService: ProjectService) => { +export const projectNameAsyncValidator = (controller:Controller , projectService: ProjectService) => { return (control: FormControl) => { return timer(500).pipe( switchMap(() => projectService.list(controller)), diff --git a/src/app/validators/template-name-async-validator.ts b/src/app/validators/template-name-async-validator.ts index cbe35d7b..a3b7825c 100644 --- a/src/app/validators/template-name-async-validator.ts +++ b/src/app/validators/template-name-async-validator.ts @@ -1,10 +1,10 @@ import { FormControl } from '@angular/forms'; import { timer } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; -import { Server } from '../models/server'; +import{ Controller } from '../models/controller'; import { TemplateService } from '../services/template.service'; -export const templateNameAsyncValidator = (controller: Server, templateService: TemplateService) => { +export const templateNameAsyncValidator = (controller:Controller , templateService: TemplateService) => { return (control: FormControl) => { return timer(500).pipe( switchMap(() => templateService.list(controller)),