From 1e0afa246023ed227caf5a65e051303547f9538c Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 1 Aug 2022 10:02:42 +0530
Subject: [PATCH 01/10] Qemu binaries endpoint, Now we are not using  in
 Frontend side

---
 .../add-qemu-vm-template.component.ts            | 12 ++++++------
 .../qemu-vm-template-details.component.ts        |  6 +++---
 .../new-template-dialog.component.html           |  4 ++--
 .../new-template-dialog.component.ts             | 16 ++++++++--------
 .../qemu/configurator-qemu.component.ts          |  6 +++---
 src/app/services/qemu.service.ts                 |  6 +++---
 6 files changed, 25 insertions(+), 25 deletions(-)

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 1b3ea490..1a1f4c75 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
@@ -109,10 +109,11 @@ export class AddQemuVmTemplateComponent implements OnInit {
       });
 
 
-      this.qemuService.getBinaries(this.controller).subscribe((qemuBinaries: QemuBinary[]) => {
-        this.qemuBinaries = qemuBinaries;
-        if (this.qemuBinaries[0]) this.selectedBinary = this.qemuBinaries[0];
-      });
+      // this.qemuService.getBinaries(this.controller).subscribe((qemuBinaries: QemuBinary[]) => {
+      //   debugger
+      //   this.qemuBinaries = qemuBinaries;
+      //   if (this.qemuBinaries[0]) this.selectedBinary = this.qemuBinaries[0];
+      // });
 
       this.qemuService.getImages(this.controller).subscribe((qemuImages: QemuImage[]) => {
         this.qemuImages = qemuImages;
@@ -175,9 +176,8 @@ 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.qemu_path = this.selectedBinary.path;
       this.qemuTemplate.platform = this.selectedPlatform;
-
       if (this.newImageSelected) {
         this.qemuTemplate.hda_disk_image = this.diskForm.get('fileName').value;
       } else {
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 c34bfd53..0f56e424 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
@@ -63,9 +63,9 @@ export class QemuVmTemplateDetailsComponent implements OnInit {
         this.qemuTemplate = qemuTemplate;
         this.fillCustomAdapters();
 
-        this.qemuService.getBinaries(controller).subscribe((qemuBinaries: QemuBinary[]) => {
-          this.binaries = qemuBinaries;
-        });
+        // this.qemuService.getBinaries(controller).subscribe((qemuBinaries: QemuBinary[]) => {
+        //   this.binaries = qemuBinaries;
+        // });
       });
     });
   }
diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
index 848ab358..213ade77 100644
--- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
+++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
@@ -131,7 +131,7 @@
 
     <mat-card [hidden]="!(!isLinuxPlatform || applianceToInstall.dynamips)">
       <div *ngIf="applianceToInstall.qemu">
-        <div>
+        <!-- <div>
           Qemu binary<br />
           <mat-select
             class="selection-group"
@@ -143,7 +143,7 @@
               {{ binary.path }}
             </mat-option>
           </mat-select>
-        </div>
+        </div> -->
         <div>
           Install required files
           <button
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 d63a22b6..93f2f13f 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
@@ -126,9 +126,9 @@ export class NewTemplateDialogComponent implements OnInit {
       });
     });
 
-    this.qemuService.getBinaries(this.controller).subscribe((binaries) => {
-      this.qemuBinaries = binaries;
-    });
+    // this.qemuService.getBinaries(this.controller).subscribe((binaries) => {
+    //   this.qemuBinaries = binaries;
+    // });
 
     this.qemuService.getImages(this.controller).subscribe((qemuImages) => {
       this.qemuImages = qemuImages;
@@ -642,10 +642,10 @@ export class NewTemplateDialogComponent implements OnInit {
       return;
     }
 
-    if (!this.selectedBinary) {
-      this.toasterService.error('Please select QEMU binary first');
-      return;
-    }
+    // if (!this.selectedBinary) {
+    //   this.toasterService.error('Please select QEMU binary first');
+    //   return;
+    // }
 
     let qemuTemplate: QemuTemplate = new QemuTemplate();
     qemuTemplate.ram = this.applianceToInstall.qemu.ram;
@@ -662,7 +662,7 @@ 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.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/qemu/configurator-qemu.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts
index 246804aa..b74ba573 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
@@ -63,9 +63,9 @@ export class ConfiguratorDialogQemuComponent implements OnInit {
       this.getConfiguration();
     });
 
-    this.qemuService.getBinaries(this.controller).subscribe((qemuBinaries: QemuBinary[]) => {
-      this.binaries = qemuBinaries;
-    });
+    // this.qemuService.getBinaries(this.controller).subscribe((qemuBinaries: QemuBinary[]) => {
+    //   this.binaries = qemuBinaries;
+    // });
 
     this.qemuService.getImages(this.controller).subscribe((qemuImages: QemuImage[]) => {
       this.qemuImages = qemuImages;
diff --git a/src/app/services/qemu.service.ts b/src/app/services/qemu.service.ts
index 0bf589e9..86fe858d 100644
--- a/src/app/services/qemu.service.ts
+++ b/src/app/services/qemu.service.ts
@@ -23,9 +23,9 @@ export class QemuService {
     return `${controller.protocol}//${controller.host}:${controller.port}/images/upload/${filename}`;
   }
 
-  getBinaries(controller:Controller ): Observable<QemuBinary[]> {
-    return this.httpController.get<QemuBinary[]>(controller, '/computes/local/qemu/binaries') as Observable<QemuBinary[]>;
-  }
+  // getBinaries(controller:Controller ): Observable<QemuBinary[]> {
+  //   return this.httpController.get<QemuBinary[]>(controller, '/computes/local/qemu/binaries') as Observable<QemuBinary[]>;
+  // }
 
   getImages(controller:Controller ): Observable<any> {
     return this.httpController.get<QemuImage[]>(controller, '/images?image_type=qemu') as Observable<QemuImage[]>;

From a1163f02745d54278c9c98ab5dca4d5dada7022a Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 1 Aug 2022 10:34:41 +0530
Subject: [PATCH 02/10] Modify  platform selection on add new Qemu Component

---
 .../add-qemu-vm-template/add-qemu-vm-template.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 1a1f4c75..93aac9e7 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
@@ -65,7 +65,7 @@ export class AddQemuVmTemplateComponent implements OnInit {
     });
 
     this.memoryForm = this.formBuilder.group({
-      ramMemory: new FormControl('256', Validators.required),
+      ramMemory: new FormControl('', Validators.required),
     });
 
     this.diskForm = this.formBuilder.group({
@@ -120,7 +120,7 @@ export class AddQemuVmTemplateComponent implements OnInit {
       });
 
       this.selectPlatform = this.configurationService.getPlatform();
-      this.selectedPlatform = this.selectPlatform[0];
+      // this.selectedPlatform = this.selectPlatform[0];
 
       this.consoleTypes = this.configurationService.getConsoleTypes();
     });

From 939e4dfd5b935cd392ccaeca12ac000062f0347b Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 1 Aug 2022 16:48:15 +0530
Subject: [PATCH 03/10] Remove QEMU binaries code from add and edit qemu
 template.

---
 .../add-qemu-vm-template.component.ts             |  2 +-
 .../qemu-vm-template-details.component.html       | 11 +++++++++--
 .../qemu-vm-template-details.component.ts         |  6 ++++++
 .../vpcs-template-details.component.html          | 15 ++++++++++++++-
 .../qemu/configurator-qemu.component.html         |  4 ++--
 5 files changed, 32 insertions(+), 6 deletions(-)

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 93aac9e7..ca0853cf 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
@@ -65,7 +65,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({
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 979515db..054b0681 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
@@ -54,6 +54,13 @@
             </mat-option>
           </mat-select>
         </mat-form-field>
+        <mat-form-field class="form-field">
+          <mat-select placeholder="Platform" [(ngModel)]="qemuTemplate.platform">
+            <mat-option *ngFor="let platform of selectPlatform" [value]="platform">
+              {{ platform }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
         <mat-form-field class="form-field">
           <input matInput type="number" [(ngModel)]="qemuTemplate.ram" placeholder="RAM" />
           <span matSuffix>MB</span>
@@ -61,13 +68,13 @@
         <mat-form-field class="form-field">
           <input matInput type="number" [(ngModel)]="qemuTemplate.cpus" placeholder="vCPUs" />
         </mat-form-field>
-        <mat-form-field class="form-field">
+        <!-- <mat-form-field class="form-field">
           <mat-select placeholder="Qemu binary" [(ngModel)]="qemuTemplate.qemu_path">
             <mat-option *ngFor="let binary of binaries" [value]="binary.path">
               {{ binary.path }}
             </mat-option>
           </mat-select>
-        </mat-form-field>
+        </mat-form-field> -->
         <mat-form-field class="form-field">
           <mat-select placeholder="Boot priority" [(ngModel)]="qemuTemplate.boot_priority">
             <mat-option *ngFor="let priority of bootPriorities" [value]="priority[1]">
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 0f56e424..f1cf0a4f 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
@@ -32,6 +32,9 @@ export class QemuVmTemplateDetailsComponent implements OnInit {
   isConfiguratorOpened: boolean = false;
   displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions'];
   generalSettingsForm: FormGroup;
+  selectPlatform: string[] = [];
+  selectedPlatform: string;
+
 
   @ViewChild('customAdaptersConfigurator')
   customAdaptersConfigurator: CustomAdaptersComponent;
@@ -68,6 +71,9 @@ export class QemuVmTemplateDetailsComponent implements OnInit {
         // });
       });
     });
+
+    this.selectPlatform = this.configurationService.getPlatform();
+      this.selectedPlatform = this.selectPlatform[0];
   }
 
   getConfiguration() {
diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html
index 68c08732..ae176604 100644
--- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html
+++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html
@@ -1,7 +1,20 @@
 <div class="content" [ngClass]="{ shadowed: isSymbolSelectionOpened }">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">VPCS device configuration</h1>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          (click)="goBack()"
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">VPCS device configuration</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="vpcsTemplate">
diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
index 14678fce..57da298b 100644
--- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
+++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
@@ -25,13 +25,13 @@
             <mat-form-field class="form-field">
               <input matInput type="number" [(ngModel)]="node.properties.cpus" placeholder="vCPUs" />
             </mat-form-field>
-            <mat-form-field class="form-field">
+            <!-- <mat-form-field class="form-field">
               <mat-select placeholder="Qemu binary" [(ngModel)]="node.properties.qemu_path">
                 <mat-option *ngFor="let binary of binaries" [value]="binary.path">
                   {{ binary.path }}
                 </mat-option>
               </mat-select>
-            </mat-form-field>
+            </mat-form-field> -->
             <mat-form-field class="form-field">
               <mat-select placeholder="Boot priority" [(ngModel)]="node.properties.boot_priority">
                 <mat-option *ngFor="let priority of bootPriorities" [value]="priority[1]">

From 8846415959a6df63db9efb0c45747fe3a93efe1b Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 1 Aug 2022 16:51:38 +0530
Subject: [PATCH 04/10] .

---
 .../configurator/qemu/configurator-qemu.component.html    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
index 57da298b..f6873fa2 100644
--- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
+++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
@@ -25,13 +25,7 @@
             <mat-form-field class="form-field">
               <input matInput type="number" [(ngModel)]="node.properties.cpus" placeholder="vCPUs" />
             </mat-form-field>
-            <!-- <mat-form-field class="form-field">
-              <mat-select placeholder="Qemu binary" [(ngModel)]="node.properties.qemu_path">
-                <mat-option *ngFor="let binary of binaries" [value]="binary.path">
-                  {{ binary.path }}
-                </mat-option>
-              </mat-select>
-            </mat-form-field> -->
+    
             <mat-form-field class="form-field">
               <mat-select placeholder="Boot priority" [(ngModel)]="node.properties.boot_priority">
                 <mat-option *ngFor="let priority of bootPriorities" [value]="priority[1]">

From 408130596a6de4ef002a42c009fdef17686b6f7f Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 1 Aug 2022 16:57:44 +0530
Subject: [PATCH 05/10] Removed QEMU binaries code

---
 .../add-qemu-vm-template.component.ts               |  6 +-----
 .../qemu-vm-template-details.component.ts           |  4 ----
 .../new-template-dialog.component.html              | 13 -------------
 .../new-template-dialog.component.ts                |  4 ----
 .../qemu/configurator-qemu.component.ts             |  4 ----
 src/app/services/qemu.service.ts                    |  3 ---
 6 files changed, 1 insertion(+), 33 deletions(-)

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 ca0853cf..9adea1d6 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
@@ -109,11 +109,7 @@ export class AddQemuVmTemplateComponent implements OnInit {
       });
 
 
-      // this.qemuService.getBinaries(this.controller).subscribe((qemuBinaries: QemuBinary[]) => {
-      //   debugger
-      //   this.qemuBinaries = qemuBinaries;
-      //   if (this.qemuBinaries[0]) this.selectedBinary = this.qemuBinaries[0];
-      // });
+      
 
       this.qemuService.getImages(this.controller).subscribe((qemuImages: QemuImage[]) => {
         this.qemuImages = qemuImages;
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 f1cf0a4f..a5438f97 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
@@ -65,10 +65,6 @@ export class QemuVmTemplateDetailsComponent implements OnInit {
       this.qemuService.getTemplate(this.controller, template_id).subscribe((qemuTemplate: QemuTemplate) => {
         this.qemuTemplate = qemuTemplate;
         this.fillCustomAdapters();
-
-        // this.qemuService.getBinaries(controller).subscribe((qemuBinaries: QemuBinary[]) => {
-        //   this.binaries = qemuBinaries;
-        // });
       });
     });
 
diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
index 213ade77..350795fb 100644
--- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
+++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
@@ -131,19 +131,6 @@
 
     <mat-card [hidden]="!(!isLinuxPlatform || applianceToInstall.dynamips)">
       <div *ngIf="applianceToInstall.qemu">
-        <!-- <div>
-          Qemu binary<br />
-          <mat-select
-            class="selection-group"
-            placeholder="Qemu binary"
-            [(ngModel)]="selectedBinary"
-            [ngModelOptions]="{ standalone: true }"
-          >
-            <mat-option *ngFor="let binary of qemuBinaries" [value]="binary">
-              {{ binary.path }}
-            </mat-option>
-          </mat-select>
-        </div> -->
         <div>
           Install required files
           <button
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 93f2f13f..2958e08b 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
@@ -126,10 +126,6 @@ export class NewTemplateDialogComponent implements OnInit {
       });
     });
 
-    // this.qemuService.getBinaries(this.controller).subscribe((binaries) => {
-    //   this.qemuBinaries = binaries;
-    // });
-
     this.qemuService.getImages(this.controller).subscribe((qemuImages) => {
       this.qemuImages = qemuImages;
     });
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 b74ba573..f45d9c25 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
@@ -63,10 +63,6 @@ export class ConfiguratorDialogQemuComponent implements OnInit {
       this.getConfiguration();
     });
 
-    // this.qemuService.getBinaries(this.controller).subscribe((qemuBinaries: QemuBinary[]) => {
-    //   this.binaries = qemuBinaries;
-    // });
-
     this.qemuService.getImages(this.controller).subscribe((qemuImages: QemuImage[]) => {
       this.qemuImages = qemuImages;
     });
diff --git a/src/app/services/qemu.service.ts b/src/app/services/qemu.service.ts
index 86fe858d..88d8d461 100644
--- a/src/app/services/qemu.service.ts
+++ b/src/app/services/qemu.service.ts
@@ -23,9 +23,6 @@ export class QemuService {
     return `${controller.protocol}//${controller.host}:${controller.port}/images/upload/${filename}`;
   }
 
-  // getBinaries(controller:Controller ): Observable<QemuBinary[]> {
-  //   return this.httpController.get<QemuBinary[]>(controller, '/computes/local/qemu/binaries') as Observable<QemuBinary[]>;
-  // }
 
   getImages(controller:Controller ): Observable<any> {
     return this.httpController.get<QemuImage[]>(controller, '/images?image_type=qemu') as Observable<QemuImage[]>;

From 4d5a5b8934e131b8969a75c96d8631b10d6f57b0 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 1 Aug 2022 17:18:46 +0530
Subject: [PATCH 06/10] .

---
 .../add-qemu-vm-template.component.spec.ts    | 16 -----------
 .../add-qemu-vm-template.component.ts         |  3 ---
 .../copy-qemu-vm-template.component.ts        |  1 -
 .../qemu-vm-template-details.component.html   |  8 +-----
 ...qemu-vm-template-details.component.spec.ts |  3 ---
 .../qemu-vm-template-details.component.ts     |  1 -
 .../new-template-dialog.component.ts          | 27 -------------------
 .../cloud/configurator-cloud.component.ts     |  1 -
 8 files changed, 1 insertion(+), 59 deletions(-)

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 @@
         <mat-form-field class="form-field">
           <input matInput type="number" [(ngModel)]="qemuTemplate.cpus" placeholder="vCPUs" />
         </mat-form-field>
-        <!-- <mat-form-field class="form-field">
-          <mat-select placeholder="Qemu binary" [(ngModel)]="qemuTemplate.qemu_path">
-            <mat-option *ngFor="let binary of binaries" [value]="binary.path">
-              {{ binary.path }}
-            </mat-option>
-          </mat-select>
-        </mat-form-field> -->
+       
         <mat-form-field class="form-field">
           <mat-select placeholder="Boot priority" [(ngModel)]="qemuTemplate.boot_priority">
             <mat-option *ngFor="let priority of bootPriorities" [value]="priority[1]">
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[] = [];

From 24deb65a0b1770555b9a1a4309049308dc08db39 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 1 Aug 2022 17:23:04 +0530
Subject: [PATCH 07/10] remove Qemu code

---
 .../cloud/configurator-cloud.component.html   | 85 ++++++++++---------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.html b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.html
index 0fdf942b..8d6109a2 100644
--- a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.html
+++ b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.html
@@ -40,56 +40,57 @@
           </mat-tab>
 
           <mat-tab label="Miscellaneous">
-              <form [formGroup]="generalSettingsForm">
-                  <mat-form-field class="form-field">
-                      <input
-                          matInput type="text"
-                          [(ngModel)]="node.name"
-                          formControlName="name"
-                          placeholder="Name">
-                  </mat-form-field>
-              </form>
-              <mat-form-field class="select">
-                  <mat-select
-                      placeholder="Console type"
-                      [(ngModel)]="node.console_type">
-                          <mat-option *ngFor="let type of consoleTypes" [value]="type">
-                              {{type}}
-                          </mat-option>
-                  </mat-select>
-              </mat-form-field>
+            <form [formGroup]="generalSettingsForm">
               <mat-form-field class="form-field">
-                  <input
-                      matInput type="text"
-                      [(ngModel)]="node.properties.remote_console_host"
-                      placeholder="Console host">
-              </mat-form-field>
-              <mat-form-field class="form-field">
-                  <input
-                      matInput type="text"
-                      [(ngModel)]="node.properties.remote_console_port"
-                      placeholder="Console port">
-              </mat-form-field>
-              <mat-form-field class="form-field">
-                  <input
-                      matInput type="text"
-                      [(ngModel)]="node.properties.remote_console_http_path"
-                      placeholder="Console HTTP path">
+                <input matInput type="text" [(ngModel)]="node.name" formControlName="name" placeholder="Name" />
               </mat-form-field>
+            </form>
+            <mat-form-field class="select">
+              <mat-select placeholder="Console type" [(ngModel)]="node.console_type">
+                <mat-option *ngFor="let type of consoleTypes" [value]="type">
+                  {{ type }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field class="form-field">
+              <input
+                matInput
+                type="text"
+                [(ngModel)]="node.properties.remote_console_host"
+                placeholder="Console host"
+              />
+            </mat-form-field>
+            <mat-form-field class="form-field">
+              <input
+                matInput
+                type="text"
+                [(ngModel)]="node.properties.remote_console_port"
+                placeholder="Console port"
+              />
+            </mat-form-field>
+            <mat-form-field class="form-field">
+              <input
+                matInput
+                type="text"
+                [(ngModel)]="node.properties.remote_console_http_path"
+                placeholder="Console HTTP path"
+              />
+            </mat-form-field>
           </mat-tab>
 
           <mat-tab label="Usage">
-              <mat-form-field class="form-field">
-                  <textarea matInput type="text" [(ngModel)]="node.properties.usage"></textarea>
-              </mat-form-field>
+            <mat-form-field class="form-field">
+              <textarea matInput type="text" [(ngModel)]="node.properties.usage"></textarea>
+            </mat-form-field>
           </mat-tab>
         </mat-tab-group>
-      </mat-card><div>
+      </mat-card>
+      <div></div>
     </div>
   </div>
-</div>
 
-<div mat-dialog-actions>
-  <button mat-button (click)="onCancelClick()" color="accent">Cancel</button>
-  <button mat-button (click)="onSaveClick()" tabindex="2" mat-raised-button color="primary">Apply</button>
+  <div mat-dialog-actions>
+    <button mat-button (click)="onCancelClick()" color="accent">Cancel</button>
+    <button mat-button (click)="onSaveClick()" tabindex="2" mat-raised-button color="primary">Apply</button>
+  </div>
 </div>

From 8424df0e2b7b1d47593d67d2f7abe4bbefa322d2 Mon Sep 17 00:00:00 2001
From: Jeremy Grossmann <grossmj@gns3.net>
Date: Tue, 2 Aug 2022 00:16:01 +0200
Subject: [PATCH 08/10] Update configurator-qemu.component.ts

---
 .../configurator/qemu/configurator-qemu.component.ts             | 1 -
 1 file changed, 1 deletion(-)

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 f45d9c25..fc1bb4c9 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
@@ -23,7 +23,6 @@ export class ConfiguratorDialogQemuComponent implements OnInit {
   name: string;
   generalSettingsForm: FormGroup;
   consoleTypes: string[] = [];
-  binaries: QemuBinary[] = [];
   onCloseOptions = [];
   bootPriorities = [];
   diskInterfaces: string[] = [];

From e8e5ce8bb9c8f3d0aec55a9d5a7c455d498b2c8c Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Tue, 2 Aug 2022 09:47:50 +0530
Subject: [PATCH 09/10] Remove unused code and Add edit platform in node
 Configurator pop

---
 .../add-qemu-vm-template/add-qemu-vm-template.component.ts | 2 --
 .../new-template-dialog/new-template-dialog.component.ts   | 6 +-----
 .../configurator/qemu/configurator-qemu.component.html     | 7 +++++++
 .../configurator/qemu/configurator-qemu.component.ts       | 3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)

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 82d29ac6..853c4840 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
@@ -114,8 +114,6 @@ export class AddQemuVmTemplateComponent implements OnInit {
       });
 
       this.selectPlatform = this.configurationService.getPlatform();
-      // this.selectedPlatform = this.selectPlatform[0];
-
       this.consoleTypes = this.configurationService.getConsoleTypes();
     });
 
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 075ea733..dbf921d6 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
@@ -612,11 +612,6 @@ export class NewTemplateDialogComponent implements OnInit {
       return;
     }
 
-    // if (!this.selectedBinary) {
-    //   this.toasterService.error('Please select QEMU binary first');
-    //   return;
-    // }
-
     let qemuTemplate: QemuTemplate = new QemuTemplate();
     qemuTemplate.ram = this.applianceToInstall.qemu.ram;
     qemuTemplate.adapters = this.applianceToInstall.qemu.adapters;
@@ -638,6 +633,7 @@ export class NewTemplateDialogComponent implements OnInit {
     qemuTemplate.hdb_disk_image = version.images.hdb_disk_image;
     qemuTemplate.template_type = 'qemu';
     qemuTemplate.usage = this.applianceToInstall.usage;
+    qemuTemplate.platform = this.applianceToInstall.qemu.arch;
 
     const dialogRef = this.dialog.open(TemplateNameDialogComponent, {
       width: '400px',
diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
index f6873fa2..fb29217d 100644
--- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
+++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
@@ -11,6 +11,13 @@
               <mat-form-field class="form-field">
                 <input matInput type="text" formControlName="name" [(ngModel)]="node.name" placeholder="Name" />
               </mat-form-field>
+              <mat-form-field class="form-field">
+                <mat-select placeholder="Platform" [(ngModel)]="node.properties.platform"  [ngModelOptions]="{ standalone: true }">
+                  <mat-option *ngFor="let platform of selectPlatform" [value]="platform">
+                    {{ platform }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
               <mat-form-field class="form-field">
                 <input
                   matInput
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 f45d9c25..8aa03c03 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
@@ -31,6 +31,7 @@ export class ConfiguratorDialogQemuComponent implements OnInit {
   displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions'];
   networkTypes = [];
   qemuImages: QemuImage[] = [];
+  selectPlatform: string[] = [];
 
   private conf = {
     autoFocus: false,
@@ -66,6 +67,8 @@ export class ConfiguratorDialogQemuComponent implements OnInit {
     this.qemuService.getImages(this.controller).subscribe((qemuImages: QemuImage[]) => {
       this.qemuImages = qemuImages;
     });
+    this.selectPlatform = this.qemuConfigurationService.getPlatform();
+
   }
 
   openQemuImageCreator() {

From 206d25d032d698f5f6b5c274074ba0e4b8498c2b Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Wed, 3 Aug 2022 11:08:30 +0200
Subject: [PATCH 10/10] Set platform with first element in the list

---
 .../add-qemu-vm-template/add-qemu-vm-template.component.ts    | 4 +---
 .../qemu-vm-template-details.component.ts                     | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

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 853c4840..2c561c9d 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
@@ -106,14 +106,12 @@ export class AddQemuVmTemplateComponent implements OnInit {
         this.qemuTemplate = qemuTemplate;
       });
 
-
-      
-
       this.qemuService.getImages(this.controller).subscribe((qemuImages: QemuImage[]) => {
         this.qemuImages = qemuImages;
       });
 
       this.selectPlatform = this.configurationService.getPlatform();
+      this.selectedPlatform = this.selectPlatform[0];
       this.consoleTypes = this.configurationService.getConsoleTypes();
     });
 
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 b7c13400..41fd5e31 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
@@ -68,7 +68,6 @@ export class QemuVmTemplateDetailsComponent implements OnInit {
     });
 
     this.selectPlatform = this.configurationService.getPlatform();
-      this.selectedPlatform = this.selectPlatform[0];
   }
 
   getConfiguration() {