Auxiliary console support

GNS3 · May 14, 2024 · 42599da · 42599da
1 parent 9c754f3
commit 42599da
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/app/cartography/models/node.ts b/src/app/cartography/models/node.ts
@@ -14,6 +14,7 @@ export class Properties {
   headless: boolean;
   linked_clone: boolean;
   on_close: string;
+  aux: number;
   ram: number;
   nvram: number;
   usage: string;

diff --git a/...t-menu/actions/console-device-action-browser/console-device-action-browser.component.html b/...t-menu/actions/console-device-action-browser/console-device-action-browser.component.html
@@ -2,3 +2,11 @@
   <mat-icon>web_asset</mat-icon>
   <span>Console</span>
 </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>
diff --git a/...ext-menu/actions/console-device-action-browser/console-device-action-browser.component.ts b/...ext-menu/actions/console-device-action-browser/console-device-action-browser.component.ts
@@ -18,14 +18,14 @@ export class ConsoleDeviceActionBrowserComponent {
 
   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.node = node;
-      this.startConsole();
+      this.startConsole(auxiliary);
     });
   }
 
-  startConsole() {
+  startConsole(auxiliary: boolean) {
     if (this.node.status !== 'started') {
       this.toasterService.error('This node must be started before a console can be opened');
     } else {
@@ -44,7 +44,14 @@ export class ConsoleDeviceActionBrowserComponent {
            host = `[${host}]`;
         }
         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;
+          } 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') {
           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')) {