diff --git a/package.json b/package.json
index b989262f..a494c540 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "gns3-web-ui",
- "version": "2.2.38",
+ "version": "2.2.42.dev1",
"author": {
"name": "GNS3 Technology Inc.",
"email": "developers@gns3.com"
diff --git a/src/app/cartography/models/node.ts b/src/app/cartography/models/node.ts
index b92c8fba..8bef9b6a 100644
--- a/src/app/cartography/models/node.ts
+++ b/src/app/cartography/models/node.ts
@@ -56,6 +56,7 @@ export class Properties {
extra_volumes: string[];
replicate_network_connection_state: boolean;
tpm: boolean;
+ uefi: boolean;
}
export class Node {
diff --git a/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.html b/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.html
index 7fecbe05..d1d000a6 100644
--- a/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.html
+++ b/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.html
@@ -13,8 +13,8 @@
Adapter type |
-
- {{ type }}
+
+ {{ type.name }}
|
diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html
index 6d8cc52b..4f0397bf 100644
--- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html
+++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html
@@ -98,14 +98,14 @@
Enable layer 1 keepalive messages (non-functional)
- Use default IOU values for memories
-
+ Use default IOU values for memories
+
MB
-
+
- MB
+ KB
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 a53f2b4e..0be98dbd 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
@@ -186,7 +186,7 @@
- {{ type[1] }} ({{ type[0] }})
+ {{type.name}} ({{type.value}})
Auto start console
-
+ Use default IOU values for memories
+
MB
-
+
- MB
+ KB
@@ -38,7 +39,7 @@
matInput
formControlName="ethernetAdapters"
type="number"
- [(ngModel)]="node.ethernet_adapters"
+ [(ngModel)]="node.properties.ethernet_adapters"
placeholder="Ethernet adapters"
/>
@@ -47,7 +48,7 @@
matInput
formControlName="serialAdapters"
type="number"
- [(ngModel)]="node.serial_adapters"
+ [(ngModel)]="node.properties.serial_adapters"
placeholder="Serial adapters"
/>
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 190fb0fb..2d5fad11 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
@@ -241,6 +241,9 @@
Enable the Trusted Platform Module (TPM)
+
+ Enable the UEFI boot mode
+
diff --git a/src/app/components/topology-summary/topology-summary.component.html b/src/app/components/topology-summary/topology-summary.component.html
index 652d5deb..6c82eeef 100644
--- a/src/app/components/topology-summary/topology-summary.component.html
+++ b/src/app/components/topology-summary/topology-summary.component.html
@@ -61,7 +61,7 @@
{{ node.name }}
- {{ node.console_type }} {{ node.console_host }}:{{ node.console }}
+ {{ node.console_type }}://{{ node.console_host }}:{{ node.console }}
none
diff --git a/src/app/services/qemu-configuration.service.ts b/src/app/services/qemu-configuration.service.ts
index c4e8c675..5f80c1dc 100644
--- a/src/app/services/qemu-configuration.service.ts
+++ b/src/app/services/qemu-configuration.service.ts
@@ -12,53 +12,30 @@ export class QemuConfigurationService {
getNetworkTypes() {
// needs extending of custom adapter component
- // let networkTypes = [["e1000", "Intel Gigabit Ethernet"],
- // ["i82550", "Intel i82550 Ethernet"],
- // ["i82551", "Intel i82551 Ethernet"],
- // ["i82557a", "Intel i82557A Ethernet"],
- // ["i82557b", "Intel i82557B Ethernet"],
- // ["i82557c", "Intel i82557C Ethernet"],
- // ["i82558a", "Intel i82558A Ethernet"],
- // ["i82558b", "Intel i82558B Ethernet"],
- // ["i82559a", "Intel i82559A Ethernet"],
- // ["i82559b", "Intel i82559B Ethernet"],
- // ["i82559c", "Intel i82559C Ethernet"],
- // ["i82559er", "Intel i82559ER Ethernet"],
- // ["i82562", "Intel i82562 Ethernet"],
- // ["i82801", "Intel i82801 Ethernet"],
- // ["ne2k_pci", "NE2000 Ethernet"],
- // ["pcnet", "AMD PCNet Ethernet"],
- // ["rtl8139", "Realtek 8139 Ethernet"],
- // ["virtio", "Legacy paravirtualized Network I/O"],
- // ["virtio-net-pci", "Paravirtualized Network I/O"],
- // ["vmxnet3", "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',
+ { value: 'e1000', name: 'Intel Gigabit Ethernet' },
+ { value: 'e1000-82544gc', name: 'Intel 82544GC Gigabit Ethernet' },
+ { value: 'e1000-82545em', name: 'Intel 82545EM Gigabit Ethernet' },
+ { value: 'e1000e', name: 'Intel PCIe Gigabit Ethernet' },
+ { value: 'i82550', name: 'Intel i82550 Ethernet' },
+ { value: 'i82551', name: 'Intel i82551 Ethernet' },
+ { value: 'i82557a', name: 'Intel i82557A Ethernet' },
+ { value: 'i82557b', name: 'Intel i82557B Ethernet' },
+ { value: 'i82557c', name: 'Intel i82557C Ethernet' },
+ { value: 'i82558a', name: 'Intel i82558A Ethernet' },
+ { value: 'i82558b', name: 'Intel i82558B Ethernet' },
+ { value: 'i82559a', name: 'Intel i82559A Ethernet' },
+ { value: 'i82559b', name: 'Intel i82559B Ethernet' },
+ { value: 'i82559c', name: 'Intel i82559C Ethernet' },
+ { value: 'i82559er', name: 'Intel i82559ER Ethernet' },
+ { value: 'i82562', name: 'Intel i82562 Ethernet' },
+ { value: 'i82801', name: 'Intel i82801 Ethernet' },
+ { value: 'ne2k_pci', name: 'NE2000 Ethernet' },
+ { value: 'pcnet', name: 'AMD PCNet Ethernet' },
+ { value: 'rocker', name: 'Rocker L2 switch device' },
+ { value: 'rtl8139', name: 'Realtek 8139 Ethernet' },
+ { value: 'virtio-net-pci', name: 'Paravirtualized Network I/O' },
+ { value: 'vmxnet3', name: 'VMWare Paravirtualized Ethernet v3' },
];
return networkTypes;