From 55bc69389d8bdf0f40e5fb5480d8f7f84a73e264 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Wed, 5 Feb 2025 20:02:58 +1000
Subject: [PATCH] Add missing adapter and mac address settings for Qemu and
 Docker nodes

---
 src/app/cartography/models/node.ts            |  1 +
 .../docker/configurator-docker.component.html | 20 ++++++---
 .../docker/configurator-docker.component.ts   |  1 +
 .../qemu/configurator-qemu.component.html     | 42 +++++++++++++++----
 .../qemu/configurator-qemu.component.ts       | 25 ++++++-----
 .../services/docker-configuration.service.ts  |  4 ++
 .../services/qemu-configuration.service.ts    | 32 ++------------
 7 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/src/app/cartography/models/node.ts b/src/app/cartography/models/node.ts
index a92c836f..bad991c8 100644
--- a/src/app/cartography/models/node.ts
+++ b/src/app/cartography/models/node.ts
@@ -70,6 +70,7 @@ export class Properties {
   qemu_path: string;
   environment: string;
   extra_hosts: string;
+  start_command: string;
   replicate_network_connection_state: boolean;
   memory: number;
   tpm: boolean;
diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html
index 7be22add..bcb467f1 100644
--- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html
+++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html
@@ -33,17 +33,27 @@ <h1 mat-dialog-title>Configurator for node {{ name }}</h1>
               </mat-form-field>
 
               <mat-form-field class="form-field">
-                  <input formControlName="memory" matInput type="number" min="1" [(ngModel)]="node.properties.memory" placeholder="Maximum memory">
+                <input
+                  matInput
+                  formControlName="mac_address"
+                  type="text"
+                  [(ngModel)]="node.properties.mac_address"
+                  placeholder="Base MAC"
+                />
+              </mat-form-field>
+
+              <mat-form-field class="form-field">
+                  <input formControlName="memory" matInput type="number" min="0" [(ngModel)]="node.properties.memory" placeholder="Maximum memory">
                   <span matSuffix>MB</span>
               </mat-form-field>
 
               <mat-form-field class="form-field">
-                  <input formControlName="cpus" matInput type="number" min="1" [(ngModel)]="node.properties.cpus" placeholder="Maximum CPUs">
+                  <input formControlName="cpus" matInput type="number" min="0" [(ngModel)]="node.properties.cpus" placeholder="Maximum CPUs">
               </mat-form-field>
 
-              <button mat-button class="form-field" (click)="configureCustomAdapters()">
-                  Configure custom adapters
-              </button>
+<!--              <button mat-button class="form-field" (click)="configureCustomAdapters()">-->
+<!--                  Configure custom adapters-->
+<!--              </button>-->
 
               <mat-form-field class="select">
                 <mat-select
diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts
index cdd9ac79..53936516 100644
--- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts
@@ -42,6 +42,7 @@ export class ConfiguratorDialogDockerComponent implements OnInit {
       this.generalSettingsForm = this.formBuilder.group({
           name: new UntypedFormControl('', Validators.required),
           adapter: new UntypedFormControl('', Validators.required),
+          mac_address: new UntypedFormControl('', Validators.pattern(this.dockerConfigurationService.getMacAddrRegex())),
           memory: new UntypedFormControl('', nonNegativeValidator.get),
           cpus: new UntypedFormControl('', nonNegativeValidator.get),
           startCommand: new UntypedFormControl(''),
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 1e03210e..a872d7c8 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
@@ -152,15 +152,43 @@ <h1 mat-dialog-title>Configurator for Qemu VM {{ name }}</h1>
           </mat-tab>
           <mat-tab label="Network">
             <br />
-            <br /><mat-checkbox [(ngModel)]="node.properties.replicate_network_connection_state">
+            <mat-form-field class="form-field">
+              <input
+                matInput
+                min=0
+                type="number"
+                [(ngModel)]="node.properties.adapters"
+                placeholder="Adapters"
+              />
+            </mat-form-field>
+            <form [formGroup]="networkSettingsForm">
+              <mat-form-field class="form-field">
+                <input
+                  matInput
+                  formControlName="mac_address"
+                  type="text"
+                  [(ngModel)]="node.properties.mac_address"
+                  placeholder="Base MAC"
+                />
+              </mat-form-field>
+            </form>
+            <mat-select placeholder="Type" [(ngModel)]="node.properties.adapter_type">
+              <mat-option *ngFor="let type of networkTypes" [value]="type.value">
+                {{ type.name }} ({{ type.value }})
+              </mat-option>
+            </mat-select>
+<!--            <button mat-button class="form-field" (click)="setCustomAdaptersConfiguratorState(true)">-->
+<!--              Configure custom adapters-->
+<!--            </button>-->
+            <br /><br /><mat-checkbox [(ngModel)]="node.properties.replicate_network_connection_state">
               Replicate network connection state
             </mat-checkbox>
-            <app-custom-adapters-table
-              #customAdapters
-              [networkTypes]="networkTypes"
-              [displayedColumns]="displayedColumns"
-              [adapters]="node.ports"
-            ></app-custom-adapters-table>
+<!--            <app-custom-adapters-table-->
+<!--              #customAdapters-->
+<!--              [networkTypes]="networkTypes"-->
+<!--              [displayedColumns]="displayedColumns"-->
+<!--              [adapters]="node.ports"-->
+<!--            ></app-custom-adapters-table>-->
           </mat-tab>
           <mat-tab label="Advanced">
             <mat-card>
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 130904f4..4a17f44a 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
@@ -22,6 +22,7 @@ export class ConfiguratorDialogQemuComponent implements OnInit {
   node: Node;
   name: string;
   generalSettingsForm: UntypedFormGroup;
+  networkSettingsForm: UntypedFormGroup;
   consoleTypes: string[] = [];
   onCloseOptions = [];
   bootPriorities = [];
@@ -54,6 +55,10 @@ export class ConfiguratorDialogQemuComponent implements OnInit {
       name: new UntypedFormControl('', Validators.required),
       ram: new UntypedFormControl('', Validators.required),
     });
+
+    this.networkSettingsForm = this.formBuilder.group({
+      mac_address: new UntypedFormControl('', Validators.pattern(this.qemuConfigurationService.getMacAddrRegex())),
+    });
   }
 
   ngOnInit() {
@@ -103,16 +108,16 @@ export class ConfiguratorDialogQemuComponent implements OnInit {
   }
 
   onSaveClick() {
-    if (this.generalSettingsForm.valid) {
-      this.node.custom_adapters = [];
-      this.customAdapters.adapters.forEach((n) => {
-        this.node.custom_adapters.push({
-          adapter_number: n.adapter_number,
-          adapter_type: n.adapter_type,
-        });
-      });
-
-      this.node.properties.adapters = this.node.custom_adapters.length;
+    if (this.generalSettingsForm.valid && this.networkSettingsForm.valid) {
+      // this.node.custom_adapters = [];
+      // this.customAdapters.adapters.forEach((n) => {
+      //   this.node.custom_adapters.push({
+      //     adapter_number: n.adapter_number,
+      //     adapter_type: n.adapter_type,
+      //   });
+      // });
+      //
+      // this.node.properties.adapters = this.node.custom_adapters.length;
 
       this.nodeService.updateNodeWithCustomAdapters(this.controller, this.node).subscribe(() => {
         this.toasterService.success(`Node ${this.node.name} updated.`);
diff --git a/src/app/services/docker-configuration.service.ts b/src/app/services/docker-configuration.service.ts
index c6059350..9cd5cb58 100644
--- a/src/app/services/docker-configuration.service.ts
+++ b/src/app/services/docker-configuration.service.ts
@@ -27,4 +27,8 @@ export class DockerConfigurationService {
 
     return consoleResolutions;
   }
+
+  getMacAddrRegex() {
+    return /^([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})$/;
+  }
 }
diff --git a/src/app/services/qemu-configuration.service.ts b/src/app/services/qemu-configuration.service.ts
index c975acbe..706b7013 100644
--- a/src/app/services/qemu-configuration.service.ts
+++ b/src/app/services/qemu-configuration.service.ts
@@ -76,34 +76,6 @@ export class QemuConfigurationService {
       { value: 'vmxnet3', name: 'VMWare Paravirtualized Ethernet v3' },
     ];
 
-    // let networkTypes = [
-    //   'e1000',
-    //   'e1000-82544gc',
-    //   'e1000-82545em',
-    //   'e1000e',
-    //   'rocker',
-    //   'Intel Gigabit Ethernet',
-    //   'i82550',
-    //   'i82551',
-    //   'i82557a',
-    //   'i82557b',
-    //   'i82557c',
-    //   'i82558a',
-    //   'i82558b',
-    //   'i82559a',
-    //   'i82559b',
-    //   'i82559c',
-    //   'i82559er',
-    //   'i82562',
-    //   'i82801',
-    //   'ne2k_pci',
-    //   'pcnet',
-    //   'rtl8139',
-    //   'virtio',
-    //   'virtio-net-pci',
-    //   'vmxnet3',
-    // ];
-
     return networkTypes;
   }
 
@@ -146,4 +118,8 @@ export class QemuConfigurationService {
 
     return priorities;
   }
+
+  getMacAddrRegex() {
+    return /^([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})$/;
+  }
 }