shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity

F #4994: Add VM name to VNC dialog

Browse Source 
Signed-off-by: Frederick Borges <fborges@opennebula.io>
This commit is contained in:
Frederick Borges 2021-01-12 12:07:34 +01:00 committed by Tino Vázquez
parent da519d197d
commit 1f9844cd71
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sunstone/public/app/opennebula/vm.js
View File

@ -612,7 +612,8 @@ define(function(require) {
var callback = params.success;
var callback_error = params.error;
var id = params.data.id;
var typeConnection = params.data.extra_param;
var typeConnection = params.data.extra_param.type;
var vm_name = params.data.extra_param.vm_name;
var resource = RESOURCE;
var request = OpenNebulaHelper.request(resource, null, params.data);
@ -621,6 +622,7 @@ define(function(require) {
type: "POST",
dataType: "json",
success: function(response) {
response.vm_name = vm_name;
return callback ? callback(request, response) : null;
},
error: function(response) {

12
src/sunstone/public/app/tabs/vms-tab/actions.js
View File

@ -347,7 +347,9 @@ define(function(require) {
type: "custom",
call: function() {
$.each(Sunstone.getDataTable(TAB_ID).elements(), function(index, elem) {
Sunstone.runAction("VM.startguac_action", elem, 'vnc');
var vm_name = OpenNebulaVM.getName(elem);
var extra_param = {type: 'vnc', 'vm_name': vm_name }
Sunstone.runAction("VM.startguac_action", elem, extra_param);
});
},
error: function(req, resp) {
@ -358,7 +360,9 @@ define(function(require) {
type: "custom",
call: function() {
$.each(Sunstone.getDataTable(TAB_ID).elements(), function(index, elem) {
Sunstone.runAction("VM.startguac_action", elem, 'rdp');
var vm_name = OpenNebulaVM.getName(elem);
var extra_param = {type: 'rdp', 'vm_name': vm_name }
Sunstone.runAction("VM.startguac_action", elem, extra_param);
});
},
error: function(req, resp) {
@ -369,7 +373,9 @@ define(function(require) {
type: "custom",
call: function() {
$.each(Sunstone.getDataTable(TAB_ID).elements(), function(index, elem) {
Sunstone.runAction("VM.startguac_action", elem, 'ssh');
var vm_name = OpenNebulaVM.getName(elem);
var extra_param = {type: 'ssh', 'vm_name': vm_name }
Sunstone.runAction("VM.startguac_action", elem, extra_param);
});
},
error: function(req, resp) {

15
src/sunstone/public/app/utils/gclient.js
View File

@ -75,6 +75,7 @@ define(function(require) {
var tunnel = new Guacamole.WebSocketTunnel(wsprotocol + '//' + host + ':' + port + '/fireedge/guacamole')
var guac = this._client = new Guacamole.Client(tunnel);
var vm_name = response.vm_name || "";
// Client display
this._display = $("#guacamole-display");
@ -94,19 +95,19 @@ define(function(require) {
guac.onstatechange = function(state) {
switch (state) {
case 0:
setStatus("Client IDLE");
setStatus("Client IDLE to: " + vm_name);
setLoading(true);
break;
case 1:
setStatus("Client CONNECTING");
setStatus("Client CONNECTING to: " + vm_name);
setLoading(true);
break;
case 2:
setStatus("Client WAITING");
setStatus("Client WAITING to: " + vm_name);
setLoading(true);
break;
case 3:
setStatus("Client CONNECTED");
setStatus("Client CONNECTED to: " + vm_name);
setLoading(false);
setTimeout(function() {
rescale(that);
@ -114,15 +115,15 @@ define(function(require) {
}, 100);
break;
case 4:
setStatus("Client DISCONNECTING");
setStatus("Client DISCONNECTING to: " + vm_name);
setLoading(true);
break;
case 5:
setStatus("Client DISCONNECTED");
setStatus("Client DISCONNECTED to: " + vm_name);
setLoading(false);
break;
default:
setStatus("Client ERROR");
setStatus("Client ERROR to: " + vm_name);
setLoading(false);
break;
}