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 0ef7a2a5..2543f5c9 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 @@ -32,10 +32,6 @@ export class MockedQemuService { return of(qemuTemplate); } - public getBinaries(controller:Controller ) { - return of([]); - } - public getImages(controller:Controller ) { return of([]); } @@ -105,10 +101,6 @@ xdescribe('AddQemuVmTemplateComponent', () => { component.memoryForm.controls['ramMemory'].setValue(0); component.diskForm.controls['fileName'].setValue('file name'); component.chosenImage = 'path'; - component.selectedBinary = { - path: 'path', - version: 'version', - }; component.newImageSelected = true; component.controller = { id: 1 } as Controller ; @@ -124,10 +116,6 @@ xdescribe('AddQemuVmTemplateComponent', () => { component.memoryForm.controls['ramMemory'].setValue(0); component.diskForm.controls['fileName'].setValue('file name'); component.chosenImage = 'path'; - component.selectedBinary = { - path: 'path', - version: 'version', - }; component.newImageSelected = true; component.controller = { id: 1 } as Controller ; @@ -142,10 +130,6 @@ xdescribe('AddQemuVmTemplateComponent', () => { component.memoryForm.controls['binary'].setValue('binary'); component.diskForm.controls['fileName'].setValue('file name'); component.chosenImage = 'path'; - component.selectedBinary = { - path: 'path', - version: 'version', - }; component.newImageSelected = true; component.controller = { id: 1 } as Controller ; 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 9adea1d6..82d29ac6 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 @@ -25,10 +25,8 @@ import { ToasterService } from '../../../../services/toaster.service'; }) export class AddQemuVmTemplateComponent implements OnInit { controller:Controller ; - qemuBinaries: QemuBinary[] = []; selectPlatform: string[] = []; selectedPlatform: string; - selectedBinary: QemuBinary; ramMemory: number; consoleTypes: string[] = []; newImageSelected: boolean = false; @@ -172,7 +170,6 @@ export class AddQemuVmTemplateComponent implements OnInit { addTemplate() { if (!this.nameForm.invalid && !this.memoryForm.invalid && (this.selectedImage || this.chosenImage)) { this.qemuTemplate.ram = +this.memoryForm.get('ramMemory').value; - // this.qemuTemplate.qemu_path = this.selectedBinary.path; this.qemuTemplate.platform = this.selectedPlatform; if (this.newImageSelected) { this.qemuTemplate.hda_disk_image = this.diskForm.get('fileName').value; 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 6ef1c61d..a242d411 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 @@ -16,7 +16,6 @@ import { ToasterService } from '../../../../services/toaster.service'; }) export class CopyQemuVmTemplateComponent implements OnInit { controller:Controller ; - qemuBinaries: QemuBinary[] = []; templateName: string = ''; qemuTemplate: QemuTemplate; nameForm: FormGroup; 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 054b0681..76d1b934 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 @@ -68,13 +68,7 @@ - + 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 d9094549..01dc916b 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 @@ -31,9 +31,6 @@ export class MockedQemuService { return of(qemuTemplate); } - public getBinaries(controller:Controller ) { - return of([]); - } public getImages(controller:Controller ) { return of([]); 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 a5438f97..b7c13400 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 @@ -27,7 +27,6 @@ export class QemuVmTemplateDetailsComponent implements OnInit { onCloseOptions = []; categories = []; priorities: string[] = []; - binaries: QemuBinary[] = []; activateCpuThrottling: boolean = true; isConfiguratorOpened: boolean = false; displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; 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 2958e08b..075ea733 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 @@ -65,8 +65,6 @@ export class NewTemplateDialogComponent implements OnInit { public isLinuxPlatform = false; private isLocalComputerChosen = false; - public qemuBinaries: QemuBinary[] = []; - public selectedBinary: QemuBinary; public categories: string[] = ['all categories', 'router', 'multilayer_switch', 'guest', 'firewall']; public category: string = 'all categories'; @@ -332,30 +330,6 @@ export class NewTemplateDialogComponent implements OnInit { this.applianceToInstall = object; setTimeout(() => { this.stepper.next(); - if (this.applianceToInstall.qemu) { - setTimeout(() => { - if (this.qemuBinaries.length) { - if (this.applianceToInstall.qemu.arch === 'x86_64') { - let filtered_binaries = this.qemuBinaries.filter((n) => n.path.includes('qemu-system-x86_64')); - if (filtered_binaries.length) { - this.selectedBinary = filtered_binaries[0]; - } - } else if (this.applianceToInstall.qemu.arch === 'i386') { - let filtered_binaries = this.qemuBinaries.filter((n) => n.path.includes('qemu-system-i386')); - if (filtered_binaries.length) { - this.selectedBinary = filtered_binaries[0]; - } - } else if (this.applianceToInstall.qemu.arch === 'x86_64') { - let filtered_binaries = this.qemuBinaries.filter((n) => n.path.includes('qemu-system-arm')); - if (filtered_binaries.length) { - this.selectedBinary = filtered_binaries[0]; - } - } else { - this.selectedBinary = this.qemuBinaries[0]; - } - } - }, 100); - } }, 100); } @@ -658,7 +632,6 @@ export class NewTemplateDialogComponent implements OnInit { qemuTemplate.first_port_name = this.applianceToInstall.first_port_name; qemuTemplate.port_name_format = this.applianceToInstall.port_name_format; qemuTemplate.symbol = this.applianceToInstall.symbol; - // qemuTemplate.qemu_path = this.selectedBinary.path; qemuTemplate.compute_id = 'local'; qemuTemplate.template_id = uuid(); qemuTemplate.hda_disk_image = version.images.hda_disk_image; 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 215fcc1f..f4acae0b 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 @@ -21,7 +21,6 @@ export class ConfiguratorDialogCloudComponent implements OnInit { name: string; generalSettingsForm: FormGroup; consoleTypes: string[] = []; - binaries: QemuBinary[] = []; onCloseOptions = []; bootPriorities = []; diskInterfaces: string[] = [];