feature #1711: Add SPICE HTML5:

TODO: install.sh, cloud view
This commit is contained in:
Daniel Molina committed 2014-12-05 18:41:19 +01:00
1 parent c544a35ba8
commit b0bf1dcd44
6 files changed
+376 -3

No files matched your search

+1 -1
View File
@@ -167,7 +167,7 @@ class OpenNebulaVNC
end
if vm_resource['TEMPLATE/GRAPHICS/TYPE'].nil? ||
vm_resource['TEMPLATE/GRAPHICS/TYPE'].downcase != "vnc"
!(["vnc", "spice"].include?(vm_resource['TEMPLATE/GRAPHICS/TYPE'].downcase))
return error(400,"VM has no VNC configured")
end
+152 -1
View File
@@ -193,6 +193,7 @@ var $create_vm_dialog;
var $deploy_vm_dialog;
var $migrate_vm_dialog;
var $vnc_dialog;
var $spice_dialog;
var rfb;
var vm_actions = {
@@ -549,6 +550,17 @@ var vm_actions = {
notify: true
},
"VM.startspice_action" : {
type: "single",
call: OpenNebula.VM.startvnc,
callback: spiceCallback,
error: function(req, resp){
onError(req, resp);
spice_lock = false;
},
notify: true
},
"VM.monitor" : {
type: "monitor",
call : OpenNebula.VM.monitor,
@@ -3026,6 +3038,58 @@ function setupVNC(){
});
}
//setups VNC application
function setupSPICE(){
//Append to DOM
dialogs_context.append('<div id="spice_dialog" style="width:auto; max-width:70%"></div>');
$spice_dialog = $('#spice_dialog',dialogs_context);
var dialog = $spice_dialog;
dialog.html('\
<div class="row">\
<div class="large-12 columns">\
<h3 class="subheader" id="spice_dialog">'+tr("SPICE")+' \
<span id="vnc_buttons">\
<a id="open_in_a_new_window_spice" href="" target="_blank" title="'+tr("Open in a new window")+'">\
<i class="fa fa-external-link detach-spice-icon"/>\
</a>\
</span>\
</h3>\
</div>\
</div>\
<div class="reveal-body" style="width:100%; overflow-x:overlay">\
<div id="spice-area">\
<div id="spice-screen" class="spice-screen"></div>\
</div>\
</div>\
<a class="close-reveal-modal">&#215;</a>\
');
dialog.addClass("reveal-modal large max-height").attr("data-reveal", "");
$spice_dialog.foundation();
$("#open_in_a_new_window_spice", dialog).on("click", function(){
$spice_dialog.foundation('reveal', 'close');
});
$('.spice').live("click",function(){
var id = $(this).attr('vm_id');
//Ask server for connection params
if (!vnc_lock) {
spice_lock = true
Sunstone.runAction("VM.startspice_action",id);
return false;
} else {
notifyError(tr("SPICE Connection in progress"))
return false;
}
});
}
// Open vnc window
function popUpVnc(){
$.each(getSelectedNodes(dataTable_vMachines), function(index, elem) {
@@ -3073,6 +3137,78 @@ function vncCallback(request,response){
});
}
function spiceCallback(request,response){
var host = null, port = null;
var sc;
function spice_error(e) {
disconnect();
}
function disconnect() {
if (sc) {
sc.stop();
}
}
function agent_connected(sc)
{
window.addEventListener('resize', handle_resize);
window.spice_connection = this;
resize_helper(this);
}
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"];
if ((!host) || (!port)) {
console.log("must specify host and port in URL");
return;
}
if (sc) {
sc.stop();
}
uri = scheme + host + ":" + port + "?token=" + token;
try {
sc = new SpiceMainConn({uri: uri, screen_id: "spice-screen", dump_id: "debug-div",
message_id: "", password: password, onerror: spice_error, onagent: agent_connected });
}
catch (e) {
alert(e.toString());
disconnect();
}
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;
$("#open_in_a_new_window_spice").attr('href', url)
$spice_dialog.foundation("reveal", "open");
spice_lock = false;
$spice_dialog.off("closed");
$spice_dialog.on("closed", function () {
disconnect();
});
}
// returns true if the vnc button should be enabled
function enableVnc(vm){
var graphics = vm.TEMPLATE.GRAPHICS;
@@ -3080,7 +3216,17 @@ function enableVnc(vm){
return (graphics &&
graphics.TYPE &&
graphics.TYPE.toLowerCase() == "vnc" &&
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);
}
@@ -3091,6 +3237,10 @@ function vncIcon(vm){
gr_icon = '<a class="vnc" href="#" vm_id="'+vm.ID+'">';
gr_icon += '<i class="fa fa-desktop" style="color: rgb(111, 111, 111)"/>';
}
else if (enableSPICE(vm)){
gr_icon = '<a class="spice" href="#" vm_id="'+vm.ID+'">';
gr_icon += '<i class="fa fa-desktop" style="color: rgb(111, 111, 111)"/>';
}
else {
gr_icon = '';
}
@@ -3138,6 +3288,7 @@ $(document).ready(function(){
Sunstone.runAction("VM.list");
setupVNC();
setupSPICE();
hotpluggingOps();
setup_vm_network_tab();
setup_vm_capacity_tab();
+10 -1
View File
@@ -277,7 +277,7 @@ before do
@request_body = request.body.read
request.body.rewind
unless %w(/ /login /vnc).include?(request.path)
unless %w(/ /login /vnc /spice).include?(request.path)
halt 401 unless authorized? && valid_csrftoken?
end
@@ -354,6 +354,15 @@ get '/vnc' do
end
end
get '/spice' do
content_type 'text/html', :charset => 'utf-8'
if !authorized?
erb :login
else
erb :spice
end
end
##############################################################################
# Login
##############################################################################
+30
View File
@@ -39,6 +39,36 @@
<link href="vendor/4.0/nouislider/nouislider.css?v=<%= OpenNebula::VERSION %>" rel="stylesheet" type="text/css"></link>
<script src="vendor/spice/spicearraybuffer.js"></script>
<script src="vendor/spice/enums.js"></script>
<script src="vendor/spice/atKeynames.js"></script>
<script src="vendor/spice/utils.js"></script>
<script src="vendor/spice/png.js"></script>
<script src="vendor/spice/lz.js"></script>
<script src="vendor/spice/quic.js"></script>
<script src="vendor/spice/bitmap.js"></script>
<script src="vendor/spice/spicedataview.js"></script>
<script src="vendor/spice/spicetype.js"></script>
<script src="vendor/spice/spicemsg.js"></script>
<script src="vendor/spice/wire.js"></script>
<script src="vendor/spice/spiceconn.js"></script>
<script src="vendor/spice/display.js"></script>
<script src="vendor/spice/main.js"></script>
<script src="vendor/spice/inputs.js"></script>
<script src="vendor/spice/webm.js"></script>
<script src="vendor/spice/playback.js"></script>
<script src="vendor/spice/simulatecursor.js"></script>
<script src="vendor/spice/cursor.js"></script>
<script src="vendor/spice/thirdparty/jsbn.js"></script>
<script src="vendor/spice/thirdparty/rsa.js"></script>
<script src="vendor/spice/thirdparty/prng4.js"></script>
<script src="vendor/spice/thirdparty/rng.js"></script>
<script src="vendor/spice/thirdparty/sha1.js"></script>
<script src="vendor/spice/ticket.js"></script>
<script src="vendor/spice/resize.js"></script>
<% if session[:lang] %>
<script src="locale/<%= session[:lang] %>/<%= session[:lang] %>.js?v=<%= OpenNebula::VERSION %>" type="text/javascript"></script>
<% end %>
+182
View File
@@ -0,0 +1,182 @@
<!--
Copyright (C) 2012 by Jeremy P. White <jwhite@codeweavers.com>
This file is part of spice-html5.
spice-html5 is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
spice-html5 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with spice-html5. If not, see <http://www.gnu.org/licenses/>.
--------------------------------------------------
Spice Javascript client template.
Refer to main.js for more detailed information
--------------------------------------------------
-->
<!doctype html>
<html>
<head>
<title>Spice Javascript client</title>
<script src="vendor/spice/spicearraybuffer.js"></script>
<script src="vendor/spice/enums.js"></script>
<script src="vendor/spice/atKeynames.js"></script>
<script src="vendor/spice/utils.js"></script>
<script src="vendor/spice/png.js"></script>
<script src="vendor/spice/lz.js"></script>
<script src="vendor/spice/quic.js"></script>
<script src="vendor/spice/bitmap.js"></script>
<script src="vendor/spice/spicedataview.js"></script>
<script src="vendor/spice/spicetype.js"></script>
<script src="vendor/spice/spicemsg.js"></script>
<script src="vendor/spice/wire.js"></script>
<script src="vendor/spice/spiceconn.js"></script>
<script src="vendor/spice/display.js"></script>
<script src="vendor/spice/main.js"></script>
<script src="vendor/spice/inputs.js"></script>
<script src="vendor/spice/webm.js"></script>
<script src="vendor/spice/playback.js"></script>
<script src="vendor/spice/simulatecursor.js"></script>
<script src="vendor/spice/cursor.js"></script>
<script src="vendor/spice/thirdparty/jsbn.js"></script>
<script src="vendor/spice/thirdparty/rsa.js"></script>
<script src="vendor/spice/thirdparty/prng4.js"></script>
<script src="vendor/spice/thirdparty/rng.js"></script>
<script src="vendor/spice/thirdparty/sha1.js"></script>
<script src="vendor/spice/ticket.js"></script>
<script src="vendor/spice/resize.js"></script>
<link rel="stylesheet" type="text/css" href="vendor/spice/spice.css" />
<script>
var host = null, port = null;
var sc;
function spice_set_cookie(name, value, days) {
var date, expires;
date = new Date();
date.setTime(date.getTime() + (days*24*60*60*1000));
expires = "; expires=" + date.toGMTString();
document.cookie = name + "=" + value + expires + "; path=/";
};
function spice_query_var(name, defvalue) {
var match = RegExp('[?&]' + name + '=([^&]*)')
.exec(window.location.search);
return match ?
decodeURIComponent(match[1].replace(/\+/g, ' '))
: defvalue;
}
function spice_error(e)
{
disconnect();
}
function connect()
{
var host, port, password, scheme = "ws://", uri;
// By default, use the host and port of server that served this file
host = spice_query_var('host', window.location.hostname);
// Note that using the web server port only makes sense
// if your web server has a reverse proxy to relay the WebSocket
// traffic to the correct destination port.
var default_port = window.location.port;
if (!default_port) {
if (window.location.protocol == 'http:') {
default_port = 80;
}
else if (window.location.protocol == 'https:') {
default_port = 443;
}
}
port = spice_query_var('port', default_port);
if (window.location.protocol == 'https:') {
scheme = "wss://";
}
// If a token variable is passed in, set the parameter in a cookie.
// This is used by nova-spiceproxy.
token = spice_query_var('token', null);
if (token) {
spice_set_cookie('token', token, 1)
}
password = spice_query_var('password', '');
path = spice_query_var('path', 'websockify');
if ((!host) || (!port)) {
console.log("must specify host and port in URL");
return;
}
if (sc) {
sc.stop();
}
uri = scheme + host + ":" + port + "?token=" + token;
try
{
sc = new SpiceMainConn({uri: uri, screen_id: "spice-screen", dump_id: "debug-div",
message_id: "message-div", password: password, onerror: spice_error, onagent: agent_connected });
}
catch (e)
{
alert(e.toString());
disconnect();
}
}
function disconnect()
{
console.log(">> disconnect");
if (sc) {
sc.stop();
}
console.log("<< disconnect");
}
function agent_connected(sc)
{
window.addEventListener('resize', handle_resize);
window.spice_connection = this;
resize_helper(this);
}
connect();
</script>
</head>
<body>
<div id="login">
<span class="logo">SPICE</span>
</div>
<div id="spice-area">
<div id="spice-screen" class="spice-screen"></div>
</div>
<div id="message-div" class="spice-message"></div>
<div id="debug-div">
<!-- If DUMPXXX is turned on, dumped images will go here -->
</div>
</body>
</html>