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

Merge pull request #1499 from GNS3/feature/aux-console

Browse Source 
Auxiliary console support
This commit is contained in:
Jeremy Grossmann 2024-05-14 22:17:16 +07:00 committed by GitHub
commit ac84106dbc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ export class Properties {
headless: boolean; headless: boolean;
linked_clone: boolean; linked_clone: boolean;
on_close: string; on_close: string;
aux: number;
ram: number; ram: number;
nvram: number; nvram: number;
usage: string; usage: string;

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

@ -2,3 +2,11 @@
<mat-icon>web_asset</mat-icon> <mat-icon>web_asset</mat-icon>
<span>Console</span> <span>Console</span>
</button> </button>
<button
mat-menu-item
*ngIf="node.node_type === 'docker' || node.node_type === 'dynamips'"
(click)="openConsole(auxiliary=true)"
>
<mat-icon>web_asset</mat-icon>
<span>Auxiliary console</span>
</button>

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

@ -18,14 +18,14 @@ export class ConsoleDeviceActionBrowserComponent {
constructor(private toasterService: ToasterService, private nodeService: NodeService, private protocolHandlerService: ProtocolHandlerService) {} constructor(private toasterService: ToasterService, private nodeService: NodeService, private protocolHandlerService: ProtocolHandlerService) {}
openConsole() { openConsole(auxiliary: boolean = false) {
this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => {
this.node = node; this.node = node;
this.startConsole(); this.startConsole(auxiliary);
}); });
} }
startConsole() { startConsole(auxiliary: boolean) {
if (this.node.status !== 'started') { if (this.node.status !== 'started') {
this.toasterService.error('This node must be started before a console can be opened'); this.toasterService.error('This node must be started before a console can be opened');
} else { } else {
@ -44,7 +44,18 @@ export class ConsoleDeviceActionBrowserComponent {
host = `[${host}]`; host = `[${host}]`;
} }
if (this.node.console_type === 'telnet') { if (this.node.console_type === 'telnet') {
uri = `gns3+telnet://${host}:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`;
var console_port;
if (auxiliary === true) {
console_port = this.node.properties.aux;
if (console_port === undefined) {
this.toasterService.error('Auxiliary console port is not set.');
return;
}
} else {
console_port = this.node.console;
}
uri = `gns3+telnet://${host}:${console_port}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`;
} else if (this.node.console_type === 'vnc') { } else if (this.node.console_type === 'vnc') {
uri = `gns3+vnc://${host}:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`; uri = `gns3+vnc://${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')) { } else if (this.node.console_type.startsWith('spice')) {
@ -54,6 +65,7 @@ export class ConsoleDeviceActionBrowserComponent {
return window.open(uri); // open an http console directly in a new window/tab return window.open(uri); // open an http console directly in a new window/tab
} else { } else {
this.toasterService.error('Supported console types are: telnet, vnc, spice and spice+agent.'); this.toasterService.error('Supported console types are: telnet, vnc, spice and spice+agent.');
return;
} }
this.protocolHandlerService.open(uri); this.protocolHandlerService.open(uri);