shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-24 21:34:01 +03:00
Code Releases Wiki Activity

feature #1711: Add SPICE console to cloud view

Browse Source
This commit is contained in:
Daniel Molina 2014-12-09 17:47:18 +01:00
parent 91906ce77f
commit 8c7b93f18c
3 changed files with 69 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/sunstone/public/js/plugins/provision-tab.js
View File

@ -1319,7 +1319,7 @@ var provision_info_vm =
'<div class="large-12 large-centered columns">'+
'<ul class="inline-list provision_action_icons">'+
'<li>'+
'<a href"#" data-tooltip title="Open a VNC console in a new window" class="left button medium radius provision_vnc_button tip-top">'+
'<a href"#" data-tooltip title="Open a remote console in a new window" class="left button medium radius provision_vnc_button tip-top">'+
'<i class="fa fa-fw fa-lg fa-desktop"/> '+
'</a>'+
'<a data-tooltip title="You have to boot the Virtual Machine first" class="left button medium radius white provision_vnc_button_disabled tip-top" style="color: #999">'+
@ -3504,6 +3504,8 @@ function setup_info_vm(context) {
}
$(".provision_info_vm", context).attr("vm_id", data.ID);
$(".provision_info_vm", context).data("vm", data);
$(".provision_info_vm_name", context).text(data.NAME);
$(".provision-pricing-table_vm_info", context).html(
@ -3915,29 +3917,59 @@ function setup_info_vm(context) {
var button = $(this);
button.attr("disabled", "disabled");
var vm_id = $(".provision_info_vm", context).attr("vm_id");
var vm_data = $(".provision_info_vm", context).data("vm");
OpenNebula.VM.startvnc({
data : {
id: vm_id
},
success: function(request, response){
var proxy_host = window.location.hostname;
var proxy_port = config['system_config']['vnc_proxy_port'];
var pw = response["password"];
var token = response["token"];
var vm_name = response["vm_name"];
var path = '?token='+token;
if (enableVnc(vm_data)) {
var proxy_host = window.location.hostname;
var proxy_port = config['system_config']['vnc_proxy_port'];
var pw = response["password"];
var token = response["token"];
var vm_name = response["vm_name"];
var path = '?token='+token;
var url = "vnc?";
url += "host=" + proxy_host;
url += "&port=" + proxy_port;
url += "&token=" + token;
url += "&password=" + pw;
url += "&encrypt=" + config['user_config']['vnc_wss'];
url += "&title=" + vm_name;
var url = "vnc?";
url += "host=" + proxy_host;
url += "&port=" + proxy_port;
url += "&token=" + token;
url += "&password=" + pw;
url += "&encrypt=" + config['user_config']['vnc_wss'];
url += "&title=" + vm_name;
window.open(url, '', '_blank');
button.removeAttr("disabled");
window.open(url, '', '_blank');
button.removeAttr("disabled");
} else if (enableSPICE(vm_data)) {
var host, port, password, scheme = "ws://", uri, token, vm_name;
if (config['user_config']['vnc_wss'] == "yes") {
scheme = "wss://";
}
host = window.location.hostname;
port = config['system_config']['vnc_proxy_port'];
password = response["password"];
token = response["token"];
vm_name = response["vm_name"];
uri = scheme + host + ":" + port + "?token=" + token;
var url = "spice?";
url += "host=" + host;
url += "&port=" + port;
url += "&token=" + token;
url += "&password=" + password;
url += "&encrypt=" + config['user_config']['vnc_wss'];
url += "&title=" + vm_name;
window.open(url, '', '_blank');
button.removeAttr("disabled");
} else {
notifyError("The remote console is not enabled for this VM")
}
},
error: function(request, response){
onError(request, response);

20
src/sunstone/public/js/plugins/vms-tab.js
View File

@ -3246,26 +3246,6 @@ function spiceCallback(request,response){
});
}
// returns true if the vnc button should be enabled
function enableVnc(vm){
var graphics = vm.TEMPLATE.GRAPHICS;
var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
return (graphics &&
graphics.TYPE &&
graphics.TYPE.toLowerCase() == "vnc" &&
$.inArray(state, VNCstates)!=-1);
}
function enableSPICE(vm){
var graphics = vm.TEMPLATE.GRAPHICS;
var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
return (graphics &&
graphics.TYPE &&
graphics.TYPE.toLowerCase() == "spice" &&
$.inArray(state, VNCstates)!=-1);
}
function vncIcon(vm){
var gr_icon;

21
src/sunstone/public/js/sunstone.js
View File

@ -7245,3 +7245,24 @@ function ip_str(vm, divider){
return ip;
};
// returns true if the vnc button should be enabled
function enableVnc(vm){
var graphics = vm.TEMPLATE.GRAPHICS;
var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
return (graphics &&
graphics.TYPE &&
graphics.TYPE.toLowerCase() == "vnc" &&
$.inArray(state, VNCstates)!=-1);
}
function enableSPICE(vm){
var graphics = vm.TEMPLATE.GRAPHICS;
var state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
return (graphics &&
graphics.TYPE &&
graphics.TYPE.toLowerCase() == "spice" &&
$.inArray(state, VNCstates)!=-1);
}