ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-02-01 00:45:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1455 from GNS3/release-v2.2.41

Browse Source 
Release v2.2.41
This commit is contained in:
Jeremy Grossmann 2023-07-12 17:10:55 +10:00 committed by GitHub
commit de07558349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 48 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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"

1
src/app/cartography/models/node.ts
View File

@ -56,6 +56,7 @@ export class Properties {
extra_volumes: string[];
replicate_network_connection_state: boolean;
tpm: boolean;
uefi: boolean;
}
export class Node {

4
src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.html
View File

@ -13,8 +13,8 @@
<th mat-header-cell *matHeaderCellDef>Adapter type</th>
<td mat-cell *matCellDef="let element; let i = index">
<mat-select placeholder="Type" [(ngModel)]="element.adapter_type">
<mat-option *ngFor="let type of networkTypes" [value]="type">
{{ type }}
<mat-option *ngFor="let type of networkTypes" [value]="type.value">
{{ type.name }}
</mat-option>
</mat-select>
</td>

8
src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html
View File

@ -98,14 +98,14 @@
<mat-checkbox [(ngModel)]="iouTemplate.l1_keepalives">
Enable layer 1 keepalive messages (non-functional) </mat-checkbox
><br />
<mat-checkbox [(ngModel)]="defaultSettings"> Use default IOU values for memories </mat-checkbox>
<mat-form-field class="form-field" *ngIf="!defaultSettings">
<mat-checkbox [(ngModel)]="iouTemplate.use_default_iou_values"> Use default IOU values for memories </mat-checkbox>
<mat-form-field class="form-field" *ngIf="!iouTemplate.use_default_iou_values">
<input matInput type="number" [(ngModel)]="iouTemplate.ram" placeholder="RAM size" />
<span matSuffix>MB</span>
</mat-form-field>
<mat-form-field class="form-field" *ngIf="!defaultSettings">
<mat-form-field class="form-field" *ngIf="!iouTemplate.use_default_iou_values">
<input matInput type="number" [(ngModel)]="iouTemplate.nvram" placeholder="NVRAM size" />
<span matSuffix>MB</span>
<span matSuffix>KB</span>
</mat-form-field>
</mat-expansion-panel>
<mat-expansion-panel>

2
src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html
View File

@ -186,7 +186,7 @@
</mat-form-field>
<mat-form-field class="form-field">
<mat-select placeholder="Type" [(ngModel)]="qemuTemplate.adapter_type">
<mat-option *ngFor="let type of networkTypes" [value]="type[0]"> {{ type[1] }} ({{ type[0] }}) </mat-option>
<mat-option *ngFor="let type of networkTypes" [value]="type.value">{{type.name}} ({{type.value}}) </mat-option>
</mat-select>
</mat-form-field>
<button mat-button class="configButton" (click)="setCustomAdaptersConfiguratorState(true)">

3
src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts
View File

@ -69,6 +69,9 @@ export class ConsoleDeviceActionBrowserComponent {
uri = `gns3+vnc://${this.node.console_host}:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`;
} else if (this.node.console_type.startsWith('spice')) {
uri = `gns3+spice://${this.node.console_host}:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`
} else if (this.node.console_type.startsWith('http')) {
uri = `${this.node.console_type}://${this.node.console_host}:${this.node.console}`
return window.open(uri); // open an http console directly in a new window/tab
} else {
this.toasterService.error('Supported console types are: telnet, vnc, spice and spice+agent.');
}

1
src/app/components/project-map/import-appliance/import-appliance.component.ts
View File

@ -91,6 +91,7 @@ export class ImportApplianceComponent implements OnInit {
template.console_auto_start = appliance.iou.console_auto_start;
template.ethernet_adapters = appliance.iou.ethernet_adapters;
template.l1_keepalives = appliance.iou.l1_keepalives;
template.use_default_iou_values = appliance.iou.use_default_iou_values;
template.nvram = appliance.iou.nvram;
template.ram = appliance.iou.ram;
template.serial_adapters = appliance.iou.serial_adapters;

2
src/app/components/project-map/log-console/log-console.component.ts
View File

@ -236,6 +236,8 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy {
location.assign(
`gns3+spice://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}`
);
} else if (node.console_type.startsWith('http')) {
window.open(`${node.console_type}://${node.console_host}:${node.console}`);
} else {
this.showCommand('Supported console types are: telnet, vnc, spice and spice+agent');
}

11
src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.html
View File

@ -20,13 +20,14 @@
</mat-select>
</mat-form-field>
<mat-checkbox [(ngModel)]="node.console_auto_start"> Auto start console </mat-checkbox><br />
<mat-form-field class="form-field">
<mat-checkbox [(ngModel)]="node.properties.use_default_iou_values"> Use default IOU values for memories </mat-checkbox>
<mat-form-field class="form-field" *ngIf="!node.properties.use_default_iou_values">
<input matInput type="number" [(ngModel)]="node.properties.ram" placeholder="RAM size" />
<span matSuffix>MB</span>
</mat-form-field>
<mat-form-field class="form-field">
<mat-form-field class="form-field" *ngIf="!node.properties.use_default_iou_values">
<input matInput type="number" [(ngModel)]="node.properties.nvram" placeholder="NVRAM size" />
<span matSuffix>MB</span>
<span matSuffix>KB</span>
</mat-form-field>
</mat-tab>
@ -38,7 +39,7 @@
matInput
formControlName="ethernetAdapters"
type="number"
[(ngModel)]="node.ethernet_adapters"
[(ngModel)]="node.properties.ethernet_adapters"
placeholder="Ethernet adapters"
/>
</mat-form-field>
@ -47,7 +48,7 @@
matInput
formControlName="serialAdapters"
type="number"
[(ngModel)]="node.serial_adapters"
[(ngModel)]="node.properties.serial_adapters"
placeholder="Serial adapters"
/>
</mat-form-field>

3
src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html
View File

@ -241,6 +241,9 @@
<br /><mat-checkbox [(ngModel)]="node.properties.tpm">
Enable the Trusted Platform Module (TPM)
</mat-checkbox>
<br /><mat-checkbox [(ngModel)]="node.properties.uefi">
Enable the UEFI boot mode
</mat-checkbox>
</mat-card-content>
</mat-card>
</mat-tab>

2
src/app/components/topology-summary/topology-summary.component.html
View File

@ -61,7 +61,7 @@
{{ node.name }}
</div>
<div *ngIf="node.console != null && node.console != undefined && node.console_type != 'none'">
{{ node.console_type }} {{ node.console_host }}:{{ node.console }}
{{ node.console_type }}://{{ node.console_host }}:{{ node.console }}
</div>
<div *ngIf="node.console === null || node.console === undefined || node.console_type === 'none'">
none

69
src/app/services/qemu-configuration.service.ts
View File

@ -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;