From 455a13b96f9d87a0b76c7dc6e1645aa44cbbe8bb Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Tue, 2 Jun 2020 17:29:14 +0200 Subject: [PATCH] Default values in templates --- .../add-docker-template/add-docker-template.component.ts | 2 +- .../add-iou-template/add-iou-template.component.ts | 8 ++++++++ .../add-qemu-vm-template.component.html | 3 --- .../add-qemu-vm-template.component.ts | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) 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 28b32c61..c8bc1cfd 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 @@ -57,7 +57,7 @@ export class AddDockerTemplateComponent implements OnInit { }); this.networkAdaptersForm = this.formBuilder.group({ - adapters: new FormControl('', Validators.required) + adapters: new FormControl('1', Validators.required) }); } 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 66c50685..6fa54508 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 @@ -133,6 +133,14 @@ export class AddIouTemplateComponent implements OnInit { this.iouTemplate.name = this.templateNameForm.get("templateName").value; if (this.newImageSelected) this.iouTemplate.path = this.imageForm.get("imageName").value; this.iouTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + + if (this.selectedType === 'L2 image') { + this.iouTemplate.ethernet_adapters = 4; + this.iouTemplate.serial_adapters = 0; + } else if (this.selectedType === 'L3 image') { + this.iouTemplate.ethernet_adapters = 2; + this.iouTemplate.serial_adapters = 2; + } this.iouService.addTemplate(this.server, this.iouTemplate).subscribe((template: IouTemplate) => { this.goBack(); diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html index a2533e2c..fc32f94d 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html @@ -23,9 +23,6 @@ placeholder="Please choose a descriptive name for your new QEMU virtual machine" ngDefaultContro/>
- - This is a legacy ASA VM - 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 92d39f2d..eb32cab1 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 @@ -60,7 +60,7 @@ export class AddQemuVmTemplateComponent implements OnInit { }); this.memoryForm = this.formBuilder.group({ - ramMemory: new FormControl('', Validators.required) + ramMemory: new FormControl('256', Validators.required) }); this.diskForm = this.formBuilder.group({ @@ -98,6 +98,7 @@ export class AddQemuVmTemplateComponent implements OnInit { this.qemuService.getBinaries(server).subscribe((qemuBinaries: QemuBinary[]) => { this.qemuBinaries = qemuBinaries; + if (this.qemuBinaries[0]) this.selectedBinary = this.qemuBinaries[0]; }); this.qemuService.getImages(server).subscribe((qemuImages: QemuImage[]) => {