From 7eac08ab917fe51783fd5f34f512a937705de436 Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Fri, 25 Jan 2019 06:31:32 -0800 Subject: [PATCH] Preferences options for qemu temporary disabled --- src/app/app-routing.module.ts | 3 ++- .../preferences/preferences.component.html | 2 +- .../add-qemu-vm-template.component.ts | 6 +++--- .../qemu-vm-template-details.component.html | 13 ++++++++++++- .../qemu-vm-template-details.component.scss | 18 ++++++++++++++++++ .../qemu-vm-template-details.component.ts | 6 ++++++ src/app/services/qemu.service.ts | 4 ++++ 7 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index b048c418..ef477a75 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -24,7 +24,8 @@ const routes: Routes = [ { path: 'server/:server_id/projects', component: ProjectsComponent }, { path: 'settings', component: SettingsComponent }, { path: 'server/:server_id/preferences', component: PreferencesComponent }, - { path: 'server/:server_id/preferences/qemu', component: QemuPreferencesComponent }, + // temporary disabled + // { path: 'server/:server_id/preferences/qemu', component: QemuPreferencesComponent }, { path: 'server/:server_id/preferences/qemu/templates', component: QemuVmTemplatesComponent }, { path: 'server/:server_id/preferences/qemu/templates/:template_id', component: QemuVmTemplateDetailsComponent }, { path: 'server/:server_id/preferences/qemu/addtemplate', component: AddQemuVmTemplateComponent } diff --git a/src/app/components/preferences/preferences.component.html b/src/app/components/preferences/preferences.component.html index edac3f4d..0816c694 100644 --- a/src/app/components/preferences/preferences.component.html +++ b/src/app/components/preferences/preferences.component.html @@ -13,7 +13,7 @@ - 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 ccb177f4..949c96aa 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 @@ -71,10 +71,10 @@ export class AddQemuVmTemplateComponent implements OnInit { qemuTemplate.adapters = 1; qemuTemplate.boot_priority = "c"; qemuTemplate.category = "guest"; - qemuTemplate.name = this.templateName; - - //this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']); + this.qemuService.addTemplate(this.server, qemuTemplate).subscribe((template: QemuTemplate) => { + this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']); + }); } else { this.toasterService.error(`Fill all required fields`); } diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html index 35e49deb..5d5809fd 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html @@ -1,4 +1,4 @@ -
+

QEMU VM configuration

@@ -195,6 +195,7 @@ +
Use the legacy networking mode @@ -316,3 +317,13 @@
+
+
+
+

Custom adapters configuration

+
+
+
+ +
+
diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.scss b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.scss index 2ea3d257..cf60da17 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.scss +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.scss @@ -19,3 +19,21 @@ padding-right: 2%; width: 80%; } + +.configButton { + width: 100%; + margin-bottom: 10px; +} + +.shadowed { + opacity: 0.4; + margin-right: 80%; + transition: 0.15s; +} + +.configurator { + position: absolute; + top: 60px; + left: 50%; + min-width: 300px; +} 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 ce6af349..8bc8268f 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 @@ -61,6 +61,8 @@ export class QemuVmTemplateDetailsComponent implements OnInit { binaries: QemuBinary[] = []; activateCpuThrottling: boolean = true; + isConfiguratorOpened: boolean = true; + constructor( private route: ActivatedRoute, private serverService: ServerService, @@ -99,6 +101,10 @@ export class QemuVmTemplateDetailsComponent implements OnInit { this.qemuTemplate.bios_image = event.target.files[0].name; } + configureCustomAdapters(){ + this.isConfiguratorOpened = !this.isConfiguratorOpened; + } + onSave(){ if (!this.activateCpuThrottling){ this.qemuTemplate.cpu_throttling = 0; diff --git a/src/app/services/qemu.service.ts b/src/app/services/qemu.service.ts index a6ee5c04..d987016f 100644 --- a/src/app/services/qemu.service.ts +++ b/src/app/services/qemu.service.ts @@ -26,6 +26,10 @@ export class QemuService { return this.httpServer.get(server, '/compute/qemu/images') as Observable; } + addTemplate(server: Server, qemuTemplate: QemuTemplate): Observable { + return this.httpServer.post(server, `/templates`, qemuTemplate) as Observable; + } + saveTemplate(server: Server, qemuTemplate: QemuTemplate): Observable { return this.httpServer.put(server, `/templates/${qemuTemplate.template_id}`, qemuTemplate) as Observable; }