';
+ }
+ else {
+ gr_icon = '
';
+ }
+ return gr_icon;
+}
+
+/*
+
function vncIcon(vm){
var graphics = vm.TEMPLATE.GRAPHICS;
var state = vm.STATE;
@@ -1063,6 +1084,9 @@ function vncIcon(vm){
return gr_icon;
}
+*/
+
+/*
function vmMonitorError(req,error_json){
var message = error_json.error.message;
var info = req.request.data[0].monitor;
@@ -1070,9 +1094,9 @@ function vmMonitorError(req,error_json){
var id_suffix = labels.replace(/,/g,'_');
var id = '#vm_monitor_'+id_suffix;
$('#vm_monitoring_tab '+id).html(''+message+'
');
-}
+}*/
+
-*/
// At this point the DOM is ready and the sunstone.js ready() has been run.
$(document).ready(function(){
@@ -1102,7 +1126,7 @@ $(document).ready(function(){
//setupCreateVMDialog();
setupSaveasDialog();
setVMAutorefresh();
- //setupVNC();
+ setupVNC();
initCheckAllBoxes(dataTable_vMachines);
tableCheckboxesListener(dataTable_vMachines);
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/configuration.js b/src/cloud/occi/lib/ui/public/js/plugins/configuration.js
index c92844ac1e..900e21e32a 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/configuration.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/configuration.js
@@ -41,24 +41,46 @@ var config_tab_content =
\
';
+var config_actions = {
+ "Config.list" : {
+ type : 'list',
+ call : OCCI.Config.list,
+ callback : updateConfig,
+ error : onError
+ },
+};
+
var config_tab = {
title: tr("Configuration"),
content: config_tab_content
}
+Sunstone.addActions(config_actions);
Sunstone.addMainTab('config_tab',config_tab);
+function updateConfig(request, response){
+ var config = response;
+ //These two variables defined in compute.js
+ vnc_enable = config['VNC'] == 'true' || config['VNC'] == 'yes' ? true : false;
+ use_wss = config['WSS'] == 'true' || config['WSS'] == 'yes'? true : false;
+};
+
$(document).ready(function(){
- if (lang)
- $('table#config_table #lang_sel option[value="'+lang+'"]').attr('selected','selected');
- $('table#config_table #lang_sel').change(function(){
- setLang($(this).val());
- });
+ Sunstone.runAction('Config.list');
$('#li_config_tab').click(function(){
hideDialog();
});
- $('div#logo img').attr('src',logo_small);
+ //Set lang to the right value
+ if (lang)
+ $('table#config_table #lang_sel option[value="'+lang+'"]').attr('selected','selected');
+ //Listen to changes in language
+ $('table#config_table #lang_sel').change(function(){
+ setLang($(this).val());
+ });
+
+ //Vendor customization, change small logo
+ $('div#logo img').attr('src',logo_small);
});
\ No newline at end of file
diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb
new file mode 100644
index 0000000000..2da2e57d34
--- /dev/null
+++ b/src/sunstone/OpenNebulaVNC.rb
@@ -0,0 +1,103 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) #
+# #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may #
+# not use this file except in compliance with the License. You may obtain #
+# a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, software #
+# distributed under the License is distributed on an "AS IS" BASIS, #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and #
+# limitations under the License. #
+#--------------------------------------------------------------------------- #
+
+require 'json'
+require 'OpenNebula'
+
+#
+# This class provides support for launching and stopping a websockify proxy
+#
+class OpenNebulaVNC
+ def initialize(config, opt={:json_errors => true})
+ @proxy_path = config[:vnc_proxy_path]
+ @proxy_base_port = config[:vnc_proxy_base_port].to_i
+
+ @wss = config[:vnc_proxy_support_wss]
+
+ if (@wss == "yes") || (@wss == "only") || (@wss == true)
+ @enable_wss = true
+ @cert = config[:vnc_proxy_cert]
+ @key = config[:vnc_proxy_key]
+ else
+ @enable_wss = false
+ end
+
+ @options = opt
+ end
+
+ # Start a VNC proxy
+ def start(vm_resource)
+ # Check configurations and VM attributes
+
+ if @proxy_path == nil || @proxy_path.empty?
+ return error(403,"VNC proxy not configured")
+ end
+
+ if vm_resource['LCM_STATE'] != "3"
+ return error(403,"VM is not running")
+ end
+
+ if vm_resource['TEMPLATE/GRAPHICS/TYPE'] != "vnc"
+ return error(403,"VM has no VNC configured")
+ end
+
+ # Proxy data
+ host = vm_resource['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']
+ vnc_port = vm_resource['TEMPLATE/GRAPHICS/PORT']
+
+ proxy_port = @proxy_base_port + vnc_port.to_i
+
+ proxy_options = ""
+
+ if @enable_wss
+ proxy_options << " --cert #{@cert}"
+ proxy_options << " --key #{@key}" if @key && @key.size > 0
+ proxy_options << " --ssl-only" if @wss == "only"
+ end
+
+ cmd ="#{@proxy_path} #{proxy_options} #{proxy_port} #{host}:#{vnc_port}"
+
+ begin
+ $stderr.puts("Starting vnc proxy: #{proxy_cmd}")
+ pipe = IO.popen(cmd)
+ rescue Exception => e
+ return [500, OpenNebula::Error.new(e.message).to_json]
+ end
+
+ vnc_pw = vm_resource['TEMPLATE/GRAPHICS/PASSWD']
+ info = {:pipe => pipe, :port => proxy_port, :password => vnc_pw}
+
+ return [200, info]
+ end
+
+ # Stop a VNC proxy handle exceptions outside
+ def self.stop(pipe)
+ Process.kill('KILL',pipe.pid)
+ pipe.close
+ end
+
+ private
+
+ def error(code, msg)
+ if @options[:json_errors]
+ return [code,OpenNebula::Error.new(msg).to_json]
+ else
+ return [code,msg]
+ end
+ end
+
+
+end
diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf
index 1927bfb949..bcc7e8225f 100644
--- a/src/sunstone/etc/sunstone-server.conf
+++ b/src/sunstone/etc/sunstone-server.conf
@@ -16,8 +16,20 @@
:core_auth: cipher
# VNC Configuration
+# base_port: base_port + vnc_port of the VM is the port where the
+# proxy will listen for VNC session connections to that VM.
+# vnc_proxy_path: path to the websockets proxy (set by install_novnc.sh)
+# support_wss: no | yes | only. For yes and only, provide path to
+# cert and key. "yes" means both ws and wss connections will be
+# supported.
+# vnc_proxy_cert: Certificate to encrypt wss connections.
+# vnc_proxy_key: Key for wss connections. Only necessary if not included in cert.
:vnc_proxy_base_port: 29876
-:novnc_path:
+:vnc_proxy_path:
+:vnc_proxy_support_wss: no
+:vnc_proxy_cert:
+:vnc_proxy_key:
+
# Default language setting
:lang: en_US
diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb
index a8113bcf65..0c21f8440d 100644
--- a/src/sunstone/models/SunstoneServer.rb
+++ b/src/sunstone/models/SunstoneServer.rb
@@ -18,6 +18,7 @@ require 'OpenNebulaJSON'
include OpenNebulaJSON
require 'acct/watch_client'
+require 'OpenNebulaVNC'
class SunstoneServer
# FLAG that will filter the elements retrieved from the Pools
@@ -146,37 +147,6 @@ class SunstoneServer
end
end
- ############################################################################
- #
- ############################################################################
- def get_configuration(user_id)
- if user_id != "0"
- return [401, ""]
- end
-
- one_config = VAR_LOCATION + "/config"
- config = Hash.new
-
- begin
- cfg = File.read(one_config)
- rescue Exception => e
- error = Error.new("Error reading config: #{e.inspect}")
- return [500, error.to_json]
- end
-
- cfg.lines do |line|
- m=line.match(/^([^=]+)=(.*)$/)
-
- if m
- name=m[1].strip.upcase
- value=m[2].strip
- config[name]=value
- end
- end
-
- return [200, config.to_json]
- end
-
############################################################################
#
############################################################################
@@ -201,7 +171,6 @@ class SunstoneServer
end
end
-
########################################################################
# VNC
########################################################################
@@ -211,50 +180,16 @@ class SunstoneServer
return [404, resource.to_json]
end
- if resource['LCM_STATE'] != "3"
- error = OpenNebula::Error.new("VM is not running")
- return [403, error.to_json]
- end
-
- if resource['TEMPLATE/GRAPHICS/TYPE'] != "vnc"
- error = OpenNebula::Error.new("VM has no VNC configured")
- return [403, error.to_json]
- end
-
- # The VM host and its VNC port
- host = resource['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']
- vnc_port = resource['TEMPLATE/GRAPHICS/PORT']
- # The noVNC proxy_port
- proxy_port = config[:vnc_proxy_base_port].to_i + vnc_port.to_i
-
- begin
- novnc_cmd = "#{config[:novnc_path]}/utils/wsproxy.py"
- novnc_exec = "#{novnc_cmd} #{proxy_port} #{host}:#{vnc_port}"
- $stderr.puts("Starting vnc proxy: #{novnc_exec}")
- pipe = IO.popen(novnc_exec)
- rescue Exception => e
- error = Error.new(e.message)
- return [500, error.to_json]
- end
-
- vnc_pw = resource['TEMPLATE/GRAPHICS/PASSWD']
-
- info = {:pipe => pipe, :port => proxy_port, :password => vnc_pw}
- return [200, info]
+ vnc_proxy = OpenNebulaVNC.new(config)
+ return vnc_proxy.start(resource)
end
############################################################################
#
############################################################################
- def stopvnc(id,pipe)
- resource = retrieve_resource("vm", id)
- if OpenNebula.is_error?(resource)
- return [404, resource.to_json]
- end
-
+ def stopvnc(pipe)
begin
- Process.kill('KILL',pipe.pid)
- pipe.close
+ OpenNebulaVNC.stop(pipe)
rescue Exception => e
error = Error.new(e.message)
return [500, error.to_json]
@@ -266,7 +201,6 @@ class SunstoneServer
############################################################################
#
############################################################################
-
def get_monitoring(id, resource, monitor_resources, gid)
watch_client = case resource
when "vm","VM"
@@ -295,18 +229,11 @@ class SunstoneServer
return [200, rc.to_json]
end
- ############################################################################
- #
- ############################################################################
-
- ############################################################################
- #
- ############################################################################
-
-
-
private
+ ############################################################################
+ #
+ ############################################################################
def retrieve_resource(kind, id)
resource = case kind
when "group" then GroupJSON.new_with_id(id, @client)
diff --git a/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js
index 6f64a8bab4..303961fb60 100644
--- a/src/sunstone/public/js/plugins/config-tab.js
+++ b/src/sunstone/public/js/plugins/config-tab.js
@@ -33,6 +33,12 @@ var config_tab_content =
\
\
\
+