ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-04-24 13:05:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 512

Browse Source
This commit is contained in:
Piotr Pekala 2019-09-30 06:44:19 -07:00
parent 35ade675df
commit dfa25d7b94
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ describe('LogConsoleComponent', () => {
component.handleCommand();
expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Available commands: help, version, start all, start {node name}, stop all, stop {node name}, suspend all, suspend {node name}, reload all, reload {node name}, show {node name}.'});
expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: "Available commands: help, version, console {node name}, start all, start {node name}, stop all, stop {node name}, suspend all, suspend {node name}, reload all, reload {node name}, show {node name}."});
});
it('should call show message when version command entered', () => {

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

@ -42,6 +42,7 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy {
private regexSuspend: RegExp = /^suspend (.*?)$/;
private regexReload: RegExp = /^reload (.*?)$/;
private regexShow: RegExp = /^show (.*?)$/;
private regexConsole: RegExp = /^console (.*?)$/;
constructor(
private projectWebServiceHandler: ProjectWebServiceHandler,
@ -128,8 +129,8 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy {
}
handleCommand() {
if (this.command === 'help') {
this.showCommand("Available commands: help, version, start all, start {node name}, stop all, stop {node name}, suspend all, suspend {node name}, reload all, reload {node name}, show {node name}.")
if (this.command === 'help' || this.command === '') {
this.showCommand("Available commands: help, version, console {node name}, start all, start {node name}, stop all, stop {node name}, suspend all, suspend {node name}, reload all, reload {node name}, show {node name}.")
} else if (this.command === 'version') {
this.showCommand("Current version: 2019.2.0");
} else if (this.command === 'start all') {
@ -153,7 +154,7 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy {
this.showCommand("All nodes reloaded.")
});
} else if (
this.regexStart.test(this.command) || this.regexStop.test(this.command) || this.regexSuspend.test(this.command) || this.regexReload.test(this.command) || this.regexShow.test(this.command)) {
this.regexStart.test(this.command) || this.regexStop.test(this.command) || this.regexSuspend.test(this.command) || this.regexReload.test(this.command) || this.regexShow.test(this.command) || this.regexConsole.test(this.command)) {
let splittedCommand = this.command.split(/[ ,]+/);
let node = this.nodesDataSource.getItems().find(n => n.name.valueOf() === splittedCommand[1].valueOf());
if (node) {
@ -173,6 +174,22 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy {
this.showCommand(`Reloading node ${splittedCommand[1]}...`);
this.nodeService.reload(this.server, node).subscribe(() => this.showCommand(`Node ${node.name} reloaded.`));
}
else if (this.regexConsole.test(this.command)) {
if (node.status === 'started') {
this.showCommand(`Launching console for node ${splittedCommand[1]}...`);
if (node.console_type === "telnet") {
location.assign(`gns3+telnet://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}`);
} else if (node.console_type === "vnc") {
location.assign(`gns3+vnc://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}`);
} else if(node.console_type === "spice") {
location.assign(`gns3+spice://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}`);
} else {
this.showCommand("Supported console types: telnet, vnc, spice.");
}
} else {
this.showCommand(`This node must be started before a console can be opened.`);
}
}
else if (this.regexShow.test(this.command)) {
this.showCommand(`Information about node ${node.name}:`);
this.showCommand(this.printNode(node));