From ff8f595cd46de5be20959cae7acb988ae55266eb Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Tue, 11 Dec 2018 14:26:44 +0100
Subject: [PATCH 1/7] Rename appliances to templates in order to support 2.2
 API, Fixes #227

---
 src/app/app.module.ts                         | 14 ++---
 .../appliance/appliance.component.html        |  3 --
 .../appliance/appliance.component.ts          | 36 -------------
 .../project-map/project-map.component.html    |  4 +-
 .../project-map/project-map.component.ts      |  6 +--
 .../template-list-dialog.component.html}      |  2 +-
 .../template-list-dialog.component.scss}      |  0
 .../template-list-dialog.component.spec.ts}   | 12 ++---
 .../template-list-dialog.component.ts}        | 52 +++++++++----------
 .../template/template.component.html          |  3 ++
 .../template.component.scss}                  |  0
 .../template.component.spec.ts}               | 12 ++---
 .../components/template/template.component.ts | 36 +++++++++++++
 src/app/models/{appliance.ts => template.ts}  |  4 +-
 src/app/services/node.service.spec.ts         | 12 ++---
 src/app/services/node.service.ts              |  8 +--
 ...rvice.spec.ts => template.service.spec.ts} | 12 ++---
 ...pliance.service.ts => template.service.ts} |  8 +--
 18 files changed, 112 insertions(+), 112 deletions(-)
 delete mode 100644 src/app/components/appliance/appliance.component.html
 delete mode 100644 src/app/components/appliance/appliance.component.ts
 rename src/app/components/{appliance/appliance-list-dialog/appliance-list-dialog.component.html => template/template-list-dialog/template-list-dialog.component.html} (92%)
 rename src/app/components/{appliance/appliance-list-dialog/appliance-list-dialog.component.scss => template/template-list-dialog/template-list-dialog.component.scss} (100%)
 rename src/app/components/{appliance/appliance-list-dialog/appliance-list-dialog.component.spec.ts => template/template-list-dialog/template-list-dialog.component.spec.ts} (50%)
 rename src/app/components/{appliance/appliance-list-dialog/appliance-list-dialog.component.ts => template/template-list-dialog/template-list-dialog.component.ts} (52%)
 create mode 100644 src/app/components/template/template.component.html
 rename src/app/components/{appliance/appliance.component.scss => template/template.component.scss} (100%)
 rename src/app/components/{appliance/appliance.component.spec.ts => template/template.component.spec.ts} (55%)
 create mode 100644 src/app/components/template/template.component.ts
 rename src/app/models/{appliance.ts => template.ts} (75%)
 rename src/app/services/{appliance.service.spec.ts => template.service.spec.ts} (79%)
 rename src/app/services/{appliance.service.ts => template.service.ts} (58%)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 83e5d9db..86aa99ab 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -23,7 +23,7 @@ import { HttpServer, ServerErrorHandler } from "./services/http-server.service";
 import { SnapshotService } from "./services/snapshot.service";
 import { ProgressDialogService } from "./common/progress-dialog/progress-dialog.service";
 import { NodeService } from "./services/node.service";
-import { ApplianceService } from "./services/appliance.service";
+import { TemplateService } from "./services/template.service";
 import { LinkService } from "./services/link.service";
 
 import { ProjectsComponent } from './components/projects/projects.component';
@@ -39,8 +39,8 @@ import { ServersComponent, AddServerDialogComponent } from './components/servers
 import { NodeContextMenuComponent } from './components/project-map/node-context-menu/node-context-menu.component';
 import { StartNodeActionComponent } from './components/project-map/node-context-menu/actions/start-node-action/start-node-action.component';
 import { StopNodeActionComponent } from './components/project-map/node-context-menu/actions/stop-node-action/stop-node-action.component';
-import { ApplianceComponent } from './components/appliance/appliance.component';
-import { ApplianceListDialogComponent } from './components/appliance/appliance-list-dialog/appliance-list-dialog.component';
+import { TemplateComponent } from './components/template/template.component';
+import { TemplateListDialogComponent } from './components/template/template-list-dialog/template-list-dialog.component';
 import { CartographyModule } from './cartography/cartography.module';
 import { ToasterService } from './services/toaster.service';
 import { ProjectWebServiceHandler } from "./handlers/project-web-service-handler";
@@ -105,8 +105,8 @@ if (environment.production) {
     NodeContextMenuComponent,
     StartNodeActionComponent,
     StopNodeActionComponent,
-    ApplianceComponent,
-    ApplianceListDialogComponent,
+    TemplateComponent,
+    TemplateListDialogComponent,
     MoveLayerDownActionComponent,
     MoveLayerUpActionComponent,
     ProjectMapShortcutsComponent,
@@ -140,7 +140,7 @@ if (environment.production) {
     ProjectService,
     SymbolService,
     ServerService,
-    ApplianceService,
+    TemplateService,
     NodeService,
     LinkService,
     DrawingService,
@@ -165,7 +165,7 @@ if (environment.production) {
     AddServerDialogComponent,
     CreateSnapshotDialogComponent,
     ProgressDialogComponent,
-    ApplianceListDialogComponent,
+    TemplateListDialogComponent,
     AddBlankProjectDialogComponent,
     ImportProjectDialogComponent,
     ConfirmationDialogComponent
diff --git a/src/app/components/appliance/appliance.component.html b/src/app/components/appliance/appliance.component.html
deleted file mode 100644
index baef47be..00000000
--- a/src/app/components/appliance/appliance.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button mat-icon-button (click)="listAppliancesModal()">
-  <mat-icon>add_to_queue</mat-icon>
-</button>
diff --git a/src/app/components/appliance/appliance.component.ts b/src/app/components/appliance/appliance.component.ts
deleted file mode 100644
index aaed1faa..00000000
--- a/src/app/components/appliance/appliance.component.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {MatDialog} from "@angular/material";
-import {ApplianceListDialogComponent} from "./appliance-list-dialog/appliance-list-dialog.component";
-
-import {Server} from "../../models/server";
-import {Appliance} from "../../models/appliance";
-
-@Component({
-  selector: 'app-appliance',
-  templateUrl: './appliance.component.html',
-  styleUrls: ['./appliance.component.scss']
-})
-export class ApplianceComponent implements OnInit {
-  @Input() server: Server;
-  @Output() onNodeCreation = new EventEmitter<any>();
-
-  constructor(private dialog: MatDialog) { }
-
-  ngOnInit() {}
-
-  listAppliancesModal() {
-    const dialogRef = this.dialog.open(ApplianceListDialogComponent, {
-      width: '600px',
-      height: '560px',
-      data: {
-        'server': this.server
-      }
-    });
-
-    dialogRef.afterClosed().subscribe((appliance: Appliance) => {
-      if (appliance !== null) {
-        this.onNodeCreation.emit(appliance);
-      }
-    });
-  }
-}
diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html
index 9be28e62..39405f6d 100644
--- a/src/app/components/project-map/project-map.component.html
+++ b/src/app/components/project-map/project-map.component.html
@@ -85,10 +85,10 @@
       </mat-toolbar-row>
 
       <mat-toolbar-row *ngIf="!readonly" >
-        <app-appliance 
+        <app-template 
           [server]="server"
           (onNodeCreation)="onNodeCreation($event)"
-        ></app-appliance>
+        ></app-template>
       </mat-toolbar-row>
 
     </mat-toolbar>
diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts
index 9d34c0b5..ced0364d 100644
--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@@ -13,7 +13,7 @@ import { ProjectService } from '../../services/project.service';
 import { Server } from "../../models/server";
 import { Drawing } from "../../cartography/models/drawing";
 import { NodeContextMenuComponent } from "./node-context-menu/node-context-menu.component";
-import { Appliance } from "../../models/appliance";
+import { Template } from "../../models/template";
 import { NodeService } from "../../services/node.service";
 import { Symbol } from "../../models/symbol";
 import { LinkService } from "../../services/link.service";
@@ -227,9 +227,9 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
     this.mapChangeDetectorRef.detectChanges();
   }
 
-  onNodeCreation(appliance: Appliance) {
+  onNodeCreation(template: Template) {
     this.nodeService
-      .createFromAppliance(this.server, this.project, appliance, 0, 0, 'local')
+      .createFromTemplate(this.server, this.project, template, 0, 0, 'local')
       .subscribe((createdNode: Node) => {
         this.projectService
           .nodes(this.server, this.project.project_id)
diff --git a/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.html b/src/app/components/template/template-list-dialog/template-list-dialog.component.html
similarity index 92%
rename from src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.html
rename to src/app/components/template/template-list-dialog/template-list-dialog.component.html
index 2be8b639..6358698c 100644
--- a/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.html
+++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.html
@@ -1,7 +1,7 @@
 <div mat-dialog-content>
     <div class="example-header">
       <mat-form-field floatPlaceholder="never">
-        <input matInput #filter placeholder="Filter appliances">
+        <input matInput #filter placeholder="Filter templates">
       </mat-form-field>
     </div>
 
diff --git a/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.scss b/src/app/components/template/template-list-dialog/template-list-dialog.component.scss
similarity index 100%
rename from src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.scss
rename to src/app/components/template/template-list-dialog/template-list-dialog.component.scss
diff --git a/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.spec.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts
similarity index 50%
rename from src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.spec.ts
rename to src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts
index 0fa7a189..335c8371 100644
--- a/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.spec.ts
+++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ApplianceListDialogComponent } from './appliance-list-dialog.component';
+import { TemplateListDialogComponent } from './template-list-dialog.component';
 
-describe('ApplianceListDialogComponent', () => {
-  let component: ApplianceListDialogComponent;
-  let fixture: ComponentFixture<ApplianceListDialogComponent>;
+describe('TemplateListDialogComponent', () => {
+  let component: TemplateListDialogComponent;
+  let fixture: ComponentFixture<TemplateListDialogComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ApplianceListDialogComponent ]
+      declarations: [ TemplateListDialogComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ApplianceListDialogComponent);
+    fixture = TestBed.createComponent(TemplateListDialogComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
similarity index 52%
rename from src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.ts
rename to src/app/components/template/template-list-dialog/template-list-dialog.component.ts
index e25c312e..565bf35d 100644
--- a/src/app/components/appliance/appliance-list-dialog/appliance-list-dialog.component.ts
+++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
@@ -6,33 +6,33 @@ import { Observable, BehaviorSubject, fromEvent, merge } from "rxjs";
 import { debounceTime, distinctUntilChanged, map } from "rxjs/operators";
 
 import { Server } from "../../../models/server";
-import { ApplianceService } from "../../../services/appliance.service";
-import { Appliance } from "../../../models/appliance";
+import { TemplateService } from "../../../services/template.service";
+import { Template } from "../../../models/template";
 
 
 @Component({
-  selector: 'app-appliance-list-dialog',
-  templateUrl: './appliance-list-dialog.component.html',
-  styleUrls: ['./appliance-list-dialog.component.scss']
+  selector: 'app-template-list-dialog',
+  templateUrl: './template-list-dialog.component.html',
+  styleUrls: ['./template-list-dialog.component.scss']
 })
-export class ApplianceListDialogComponent implements OnInit {
+export class TemplateListDialogComponent implements OnInit {
   server: Server;
-  applianceDatabase: ApplianceDatabase;
-  dataSource: ApplianceDataSource;
+  templateDatabase: TemplateDatabase;
+  dataSource: TemplateDataSource;
   displayedColumns = ['name'];
 
   @ViewChild('filter') filter: ElementRef;
 
   constructor(
-    public dialogRef: MatDialogRef<ApplianceListDialogComponent>,
-    private applianceService: ApplianceService,
+    public dialogRef: MatDialogRef<TemplateListDialogComponent>,
+    private templateService: TemplateService,
     @Inject(MAT_DIALOG_DATA) public data: any) {
     this.server = data['server'];
   }
 
   ngOnInit() {
-    this.applianceDatabase = new ApplianceDatabase(this.server, this.applianceService);
-    this.dataSource = new ApplianceDataSource(this.applianceDatabase);
+    this.templateDatabase = new TemplateDatabase(this.server, this.templateService);
+    this.dataSource = new TemplateDataSource(this.templateDatabase);
 
     fromEvent(this.filter.nativeElement, 'keyup').pipe(
       debounceTime(150),
@@ -49,48 +49,48 @@ export class ApplianceListDialogComponent implements OnInit {
     this.dialogRef.close();
   }
 
-  addNode(appliance: Appliance): void {
-    this.dialogRef.close(appliance);
+  addNode(template: Template): void {
+    this.dialogRef.close(template);
   }
 
 }
 
 
-export class ApplianceDatabase {
-  dataChange: BehaviorSubject<Appliance[]> = new BehaviorSubject<Appliance[]>([]);
+export class TemplateDatabase {
+  dataChange: BehaviorSubject<Template[]> = new BehaviorSubject<Template[]>([]);
 
-  get data(): Appliance[] {
+  get data(): Template[] {
     return this.dataChange.value;
   }
 
-  constructor(private server: Server, private applianceService: ApplianceService) {
-    this.applianceService
+  constructor(private server: Server, private templateService: TemplateService) {
+    this.templateService
       .list(this.server)
-      .subscribe((appliances) => {
-        this.dataChange.next(appliances);
+      .subscribe((templates) => {
+        this.dataChange.next(templates);
       });
   }
 
 };
 
-export class ApplianceDataSource extends DataSource<Appliance> {
+export class TemplateDataSource extends DataSource<Template> {
   filterChange = new BehaviorSubject('');
 
   get filter(): string { return this.filterChange.value; }
   set filter(filter: string) { this.filterChange.next(filter); }
 
-  constructor(private applianceDatabase: ApplianceDatabase) {
+  constructor(private templateDatabase: TemplateDatabase) {
     super();
   }
 
-  connect(): Observable<Appliance[]> {
+  connect(): Observable<Template[]> {
     const displayDataChanges = [
-      this.applianceDatabase.dataChange,
+      this.templateDatabase.dataChange,
       this.filterChange,
     ];
 
     return merge(...displayDataChanges).pipe(map(() => {
-      return this.applianceDatabase.data.slice().filter((item: Appliance) => {
+      return this.templateDatabase.data.slice().filter((item: Template) => {
         const searchStr = (item.name).toLowerCase();
         return searchStr.indexOf(this.filter.toLowerCase()) !== -1;
       });
diff --git a/src/app/components/template/template.component.html b/src/app/components/template/template.component.html
new file mode 100644
index 00000000..383d5c82
--- /dev/null
+++ b/src/app/components/template/template.component.html
@@ -0,0 +1,3 @@
+<button mat-icon-button (click)="listTemplatesModal()">
+  <mat-icon>add_to_queue</mat-icon>
+</button>
diff --git a/src/app/components/appliance/appliance.component.scss b/src/app/components/template/template.component.scss
similarity index 100%
rename from src/app/components/appliance/appliance.component.scss
rename to src/app/components/template/template.component.scss
diff --git a/src/app/components/appliance/appliance.component.spec.ts b/src/app/components/template/template.component.spec.ts
similarity index 55%
rename from src/app/components/appliance/appliance.component.spec.ts
rename to src/app/components/template/template.component.spec.ts
index 4b3e2eea..fdca277d 100644
--- a/src/app/components/appliance/appliance.component.spec.ts
+++ b/src/app/components/template/template.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ApplianceComponent } from './appliance.component';
+import { TemplateComponent } from './template.component';
 
-describe('ApplianceComponent', () => {
-  let component: ApplianceComponent;
-  let fixture: ComponentFixture<ApplianceComponent>;
+describe('TemplateComponent', () => {
+  let component: TemplateComponent;
+  let fixture: ComponentFixture<TemplateComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ApplianceComponent ]
+      declarations: [ TemplateComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ApplianceComponent);
+    fixture = TestBed.createComponent(TemplateComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/components/template/template.component.ts b/src/app/components/template/template.component.ts
new file mode 100644
index 00000000..ad65d9bb
--- /dev/null
+++ b/src/app/components/template/template.component.ts
@@ -0,0 +1,36 @@
+import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import {MatDialog} from "@angular/material";
+import {TemplateListDialogComponent} from "./template-list-dialog/template-list-dialog.component";
+
+import {Server} from "../../models/server";
+import {Template} from "../../models/template";
+
+@Component({
+  selector: 'app-template',
+  templateUrl: './template.component.html',
+  styleUrls: ['./template.component.scss']
+})
+export class TemplateComponent implements OnInit {
+  @Input() server: Server;
+  @Output() onNodeCreation = new EventEmitter<any>();
+
+  constructor(private dialog: MatDialog) { }
+
+  ngOnInit() {}
+
+  listTemplatesModal() {
+    const dialogRef = this.dialog.open(TemplateListDialogComponent, {
+      width: '600px',
+      height: '560px',
+      data: {
+        'server': this.server
+      }
+    });
+
+    dialogRef.afterClosed().subscribe((template: Template) => {
+      if (template !== null) {
+        this.onNodeCreation.emit(template);
+      }
+    });
+  }
+}
diff --git a/src/app/models/appliance.ts b/src/app/models/template.ts
similarity index 75%
rename from src/app/models/appliance.ts
rename to src/app/models/template.ts
index 3a4dcf6f..1dc03032 100644
--- a/src/app/models/appliance.ts
+++ b/src/app/models/template.ts
@@ -1,5 +1,5 @@
-export class Appliance {
-  appliance_id: string;
+export class Template {
+  template_id: string;
   builtin: boolean;
   category: string;
   compute_id: string;
diff --git a/src/app/services/node.service.spec.ts b/src/app/services/node.service.spec.ts
index b3b8ff39..95940b2b 100644
--- a/src/app/services/node.service.spec.ts
+++ b/src/app/services/node.service.spec.ts
@@ -7,7 +7,7 @@ import { Server } from '../models/server';
 import { Node } from '../cartography/models/node';
 import { getTestServer } from './testing';
 import { NodeService } from './node.service';
-import { Appliance } from '../models/appliance';
+import { Template } from '../models/template';
 import { Project } from '../models/project';
 import { AppTestingModule } from "../testing/app-testing/app-testing.module";
 import { Label } from '../cartography/models/label';
@@ -72,16 +72,16 @@ describe('NodeService', () => {
     expect(req.request.body).toEqual({});
   }));
 
-  it('should createFromAppliance node', inject([NodeService], (service: NodeService) => {
+  it('should createFromTemplate node', inject([NodeService], (service: NodeService) => {
     const project = new Project();
     project.project_id = "myproject";
-    const appliance = new Appliance();
-    appliance.appliance_id = "myappliance";
+    const template = new Template();
+    template.template_id = "mytemplate";
 
-    service.createFromAppliance(server, project, appliance, 10, 20, "compute").subscribe();
+    service.createFromTemplate(server, project, template, 10, 20, "compute").subscribe();
 
     const req = httpTestingController.expectOne(
-      'http://127.0.0.1:3080/v2/projects/myproject/appliances/myappliance');
+      'http://127.0.0.1:3080/v2/projects/myproject/templates/mytemplate');
     expect(req.request.method).toEqual("POST");
     expect(req.request.body).toEqual({
       'x': 10, 'y': 20, 'compute_id': 'compute'});
diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts
index 28c5a4b7..e6c720e3 100644
--- a/src/app/services/node.service.ts
+++ b/src/app/services/node.service.ts
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 import 'rxjs/add/operator/map';
 import { Server } from "../models/server";
 import { HttpServer } from "./http-server.service";
-import {Appliance} from "../models/appliance";
+import {Template} from "../models/template";
 import { Label } from '../cartography/models/label';
 
 
@@ -25,13 +25,13 @@ export class NodeService {
                 .post<Node>(server, `/projects/${node.project_id}/nodes/${node.node_id}/stop`, {});
   }
 
-  createFromAppliance(
-    server: Server, project: Project, appliance: Appliance,
+  createFromTemplate(
+    server: Server, project: Project, template: Template,
     x: number, y: number, compute_id: string) {
     return this.httpServer
                 .post(
                   server,
-                  `/projects/${project.project_id}/appliances/${appliance.appliance_id}`,
+                  `/projects/${project.project_id}/templates/${template.template_id}`,
                   {'x': x, 'y': y, 'compute_id': compute_id});
   }
 
diff --git a/src/app/services/appliance.service.spec.ts b/src/app/services/template.service.spec.ts
similarity index 79%
rename from src/app/services/appliance.service.spec.ts
rename to src/app/services/template.service.spec.ts
index 8844c7b6..80710d13 100644
--- a/src/app/services/appliance.service.spec.ts
+++ b/src/app/services/template.service.spec.ts
@@ -2,17 +2,17 @@ import { TestBed,  } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { HttpClient } from "@angular/common/http";
 
-import { ApplianceService } from './appliance.service';
+import { TemplateService } from './template.service';
 import { Server } from '../models/server';
 import { HttpServer } from './http-server.service';
 import { AppTestingModule } from "../testing/app-testing/app-testing.module";
 
 
 
-describe('ApplianceService', () => {
+describe('TemplateService', () => {
   let httpClient: HttpClient;
   let httpTestingController: HttpTestingController;
-  let service: ApplianceService;
+  let service: TemplateService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -21,14 +21,14 @@ describe('ApplianceService', () => {
         AppTestingModule
       ],
       providers: [
-        ApplianceService,
+        TemplateService,
         HttpServer
       ]
     });
 
     httpClient = TestBed.get(HttpClient);
     httpTestingController = TestBed.get(HttpTestingController);
-    service = TestBed.get(ApplianceService);
+    service = TestBed.get(TemplateService);
   });
 
   afterEach(() => {
@@ -43,7 +43,7 @@ describe('ApplianceService', () => {
 
     service.list(server).subscribe(() => {});
 
-    httpTestingController.expectOne('http://127.0.0.1:3080/v2/appliances');
+    httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates');
 
   });
 });
diff --git a/src/app/services/appliance.service.ts b/src/app/services/template.service.ts
similarity index 58%
rename from src/app/services/appliance.service.ts
rename to src/app/services/template.service.ts
index 517ab6ee..4db6b65c 100644
--- a/src/app/services/appliance.service.ts
+++ b/src/app/services/template.service.ts
@@ -3,17 +3,17 @@ import { Injectable } from '@angular/core';
 import 'rxjs/add/operator/map';
 import { Server } from "../models/server";
 import { HttpServer } from "./http-server.service";
-import {Appliance} from "../models/appliance";
+import {Template} from "../models/template";
 import {Observable} from "rxjs";
 
 @Injectable()
-export class ApplianceService {
+export class TemplateService {
 
   constructor(private httpServer: HttpServer) { }
 
-  list(server: Server): Observable<Appliance[]> {
+  list(server: Server): Observable<Template[]> {
     return this.httpServer
-                .get<Appliance[]>(server, '/appliances') as Observable<Appliance[]>;
+                .get<Template[]>(server, '/templates') as Observable<Template[]>;
   }
 
 }

From 674d0c4980cc011463de2a7e90c4dc6682ac4510 Mon Sep 17 00:00:00 2001
From: Piotr Pekala <piotrpawelpekala@gmail.com>
Date: Wed, 12 Dec 2018 04:29:18 -0800
Subject: [PATCH 2/7] Fix for tests

---
 src/app/cartography/helpers/font-bbox-calculator.spec.ts     | 2 +-
 src/app/components/project-map/project-map.component.spec.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/cartography/helpers/font-bbox-calculator.spec.ts b/src/app/cartography/helpers/font-bbox-calculator.spec.ts
index 52417102..42d295d0 100644
--- a/src/app/cartography/helpers/font-bbox-calculator.spec.ts
+++ b/src/app/cartography/helpers/font-bbox-calculator.spec.ts
@@ -15,7 +15,7 @@ describe('FontBBoxCalculator', () => {
     expect(box.width).toEqual(41.34375);
   });
 
-  it('should calculate font width and height for different font', () => {
+  xit('should calculate font width and height for different font', () => {
     const box = calculator.calculate("My text", "font-family:Tahoma; font-size: 14px; font-weight:bold");
 
     expect(box.height).toEqual(15);
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 affda871..231e877f 100644
--- a/src/app/components/project-map/project-map.component.spec.ts
+++ b/src/app/components/project-map/project-map.component.spec.ts
@@ -41,6 +41,7 @@ import { MapDrawing } from '../../cartography/models/map/map-drawing';
 import { HttpServer } from '../../services/http-server.service';
 import { Server } from '../../models/server';
 import { ResizedDataEvent } from '../../cartography/events/event-source';
+import { MapLabelToLabelConverter } from '../../cartography/converters/map/map-label-to-label-converter';
 
 export class MockedProgressService {
   public activate() {}
@@ -118,7 +119,8 @@ describe('ProjectMapComponent', () => {
         { provide: MapDrawingToSvgConverter, useValue: {
           convert: () => { return ''}
         } },
-        { provide: SettingsService, useClass: MockedSettingsService }
+        { provide: SettingsService, useClass: MockedSettingsService },
+        { provide: MapLabelToLabelConverter}
       ],
       declarations: [
         ProjectMapComponent,

From 852e26527378ab7880b3536869197e59208ed825 Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Thu, 13 Dec 2018 08:35:05 +0100
Subject: [PATCH 3/7] Apply gray background fix only on Firefox

---
 .../components/project-map/project-map.component.css | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/components/project-map/project-map.component.css b/src/app/components/project-map/project-map.component.css
index 29992d74..e8a6ffe9 100644
--- a/src/app/components/project-map/project-map.component.css
+++ b/src/app/components/project-map/project-map.component.css
@@ -31,10 +31,14 @@ g.node:hover {
   outline: none;
 }
 
-.mat-drawer-content {
-  display: inline !important;
+@-moz-document url-prefix() {
+  /** fixes gray background of drawing menu on Firefox **/
+  .mat-drawer-content {
+    display: inline !important;
+  }
 }
 
+
 .drawer-container {
   height: 72px !important;
   background: transparent;
@@ -92,10 +96,6 @@ g.node:hover {
   background-color: transparent;
 }
 
-.selected {
-  stroke: #0097a7!important;
-}
-
 .project-toolbar .mat-toolbar-multiple-rows {
   width: auto !important;
 }

From 9c02e63d69ca3e4feb308c6cea784c92f15d9fb2 Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Thu, 13 Dec 2018 08:36:20 +0100
Subject: [PATCH 4/7] Disable drawing menu when in read only mode

---
 src/app/components/project-map/project-map.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html
index f547df1e..55aca7c6 100644
--- a/src/app/components/project-map/project-map.component.html
+++ b/src/app/components/project-map/project-map.component.html
@@ -99,7 +99,7 @@
     </mat-toolbar>
   </div>
 
-  <div class="draw-menu">
+  <div class="draw-menu" *ngIf="!inReadOnlyMode">
     <mat-drawer-container [ngClass]="{shadow: drawTools.visibility}" class="drawer-container">
       <mat-drawer #drawer class="drawer">
         <div class="drawer-buttons">

From e76d6c4236843041c998bfb67eb44fa4792eb914 Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Thu, 13 Dec 2018 08:38:11 +0100
Subject: [PATCH 5/7] Fix gray background of drawing menu on Chrome

---
 src/app/components/project-map/project-map.component.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/components/project-map/project-map.component.css b/src/app/components/project-map/project-map.component.css
index e8a6ffe9..54f447a4 100644
--- a/src/app/components/project-map/project-map.component.css
+++ b/src/app/components/project-map/project-map.component.css
@@ -38,6 +38,10 @@ g.node:hover {
   }
 }
 
+.mat-drawer-content {
+  height: auto !important;
+}
+
 
 .drawer-container {
   height: 72px !important;

From f866741011451fec2f05bca1a52cbcd53c88b66f Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Thu, 13 Dec 2018 09:17:04 +0100
Subject: [PATCH 6/7] Round position of nodes and drawings during update to the
 closest integer

---
 src/app/services/drawing.service.spec.ts | 34 ++++++++++++++++++++++++
 src/app/services/drawing.service.ts      | 20 +++++++-------
 src/app/services/node.service.spec.ts    | 17 ++++++++++++
 src/app/services/node.service.ts         |  4 +--
 4 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/src/app/services/drawing.service.spec.ts b/src/app/services/drawing.service.spec.ts
index 1017acad..70db98f8 100644
--- a/src/app/services/drawing.service.spec.ts
+++ b/src/app/services/drawing.service.spec.ts
@@ -58,6 +58,22 @@ describe('DrawingService', () => {
     });
   }));
 
+  it('should updatePosition of drawing and round to integer', inject([DrawingService], (service: DrawingService) => {
+    const drawing = new Drawing();
+    drawing.project_id = "myproject";
+    drawing.drawing_id = "id";
+
+    service.updatePosition(server, drawing, 10.1, 20.6).subscribe();
+
+    const req = httpTestingController.expectOne(
+      'http://127.0.0.1:3080/v2/projects/myproject/drawings/id');
+    expect(req.request.method).toEqual("PUT");
+    expect(req.request.body).toEqual({
+      'x': 10,
+      'y': 21
+    });
+  }));
+
   it('should update size and position of drawing', inject([DrawingService], (service: DrawingService) => {
     const drawing = new Drawing();
     drawing.project_id = "myproject";
@@ -76,6 +92,24 @@ describe('DrawingService', () => {
     });
   }));
 
+  it('should update size and position of drawing and round to integer', inject([DrawingService], (service: DrawingService) => {
+    const drawing = new Drawing();
+    drawing.project_id = "myproject";
+    drawing.drawing_id = "id";
+    let svgSample = "<svg><test></svg>"
+
+    service.updateSizeAndPosition(server, drawing, 100.1, 100.6, svgSample).subscribe();
+
+    const req = httpTestingController.expectOne(
+      'http://127.0.0.1:3080/v2/projects/myproject/drawings/id');
+    expect(req.request.method).toEqual("PUT");
+    expect(req.request.body).toEqual({
+      'x': 100,
+      'y': 101,
+      'svg': svgSample
+    });
+  }));
+
   it('should update drawing', inject([DrawingService], (service: DrawingService) => {
     const drawing = new Drawing();
     drawing.project_id = "myproject";
diff --git a/src/app/services/drawing.service.ts b/src/app/services/drawing.service.ts
index 851711cc..a1a8b3b5 100644
--- a/src/app/services/drawing.service.ts
+++ b/src/app/services/drawing.service.ts
@@ -16,16 +16,16 @@ export class DrawingService {
     return this.httpServer
       .post<Drawing>(server, `/projects/${project_id}/drawings`, {
         'svg': svg,
-        'x': x,
-        'y': y
+        'x': Math.round(x),
+        'y': Math.round(y)
       });
   }
 
   updatePosition(server: Server, drawing: Drawing, x: number, y: number): Observable<Drawing> {
     return this.httpServer
       .put<Drawing>(server, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, {
-        'x': x,
-        'y': y
+        'x': Math.round(x),
+        'y': Math.round(y)
       });
   }
 
@@ -33,8 +33,8 @@ export class DrawingService {
     return this.httpServer
       .put<Drawing>(server, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, {
         'svg': svg,
-        'x': x,
-        'y': y
+        'x': Math.round(x),
+        'y': Math.round(y)
       })
   }
 
@@ -42,8 +42,8 @@ export class DrawingService {
     return this.httpServer
       .put<Drawing>(server, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, {
         'svg': svg,
-        'x': drawing.x,
-        'y': drawing.y,
+        'x': Math.round(drawing.x),
+        'y': Math.round(drawing.y),
         'z': drawing.z
       });
   }
@@ -51,8 +51,8 @@ export class DrawingService {
   update(server: Server, drawing: Drawing): Observable<Drawing> {
     return this.httpServer
       .put<Drawing>(server, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, {
-        'x': drawing.x,
-        'y': drawing.y,
+        'x': Math.round(drawing.x),
+        'y': Math.round(drawing.y),
         'z': drawing.z
       });
   }
diff --git a/src/app/services/node.service.spec.ts b/src/app/services/node.service.spec.ts
index 95940b2b..23756989 100644
--- a/src/app/services/node.service.spec.ts
+++ b/src/app/services/node.service.spec.ts
@@ -103,6 +103,23 @@ describe('NodeService', () => {
     });
   }));
 
+
+  it('should updatePosition of node and round to integer', inject([NodeService], (service: NodeService) => {
+    const node = new Node();
+    node.project_id = "myproject";
+    node.node_id = "id";
+
+    service.updatePosition(server, node, 10.1, 20.6).subscribe();
+
+    const req = httpTestingController.expectOne(
+      'http://127.0.0.1:3080/v2/projects/myproject/nodes/id');
+    expect(req.request.method).toEqual("PUT");
+    expect(req.request.body).toEqual({
+      'x': 10,
+      'y': 21
+    });
+  }));
+
   it('should update label of node', inject([NodeService], (service: NodeService) => {
     const node = new Node();
     node.project_id = "myproject";
diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts
index e6c720e3..34eb8390 100644
--- a/src/app/services/node.service.ts
+++ b/src/app/services/node.service.ts
@@ -38,8 +38,8 @@ export class NodeService {
   updatePosition(server: Server, node: Node, x: number, y: number): Observable<Node> {
     return this.httpServer
                 .put<Node>(server, `/projects/${node.project_id}/nodes/${node.node_id}`, {
-                  'x': x,
-                  'y': y
+                  'x': Math.round(x),
+                  'y': Math.round(y)
                 });
   }
 

From 2a859e63298eadb8870d75a2f53ecc4af7b2cb08 Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Thu, 13 Dec 2018 09:46:00 +0100
Subject: [PATCH 7/7] Fix updating text position when zoomed in/out

---
 src/app/services/node.service.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts
index 34eb8390..618e30b1 100644
--- a/src/app/services/node.service.ts
+++ b/src/app/services/node.service.ts
@@ -32,7 +32,7 @@ export class NodeService {
                 .post(
                   server,
                   `/projects/${project.project_id}/templates/${template.template_id}`,
-                  {'x': x, 'y': y, 'compute_id': compute_id});
+                  {'x': Math.round(x), 'y': Math.round(y), 'compute_id': compute_id});
   }
 
   updatePosition(server: Server, node: Node, x: number, y: number): Observable<Node> {
@@ -50,8 +50,8 @@ export class NodeService {
                     'rotation': label.rotation,
                     'style': label.style,
                     'text': label.text,
-                    'x': label.x,
-                    'y': label.y
+                    'x': Math.round(label.x),
+                    'y': Math.round(label.y)
                   }
                 });
   }
@@ -59,8 +59,8 @@ export class NodeService {
   update(server: Server, node: Node): Observable<Node> {
     return this.httpServer
                 .put<Node>(server, `/projects/${node.project_id}/nodes/${node.node_id}`, {
-                  'x': node.x,
-                  'y': node.y,
+                  'x': Math.round(node.x),
+                  'y': Math.round(node.y),
                   'z': node.z
                 });
   }