Merge remote-tracking branch 'origin/one-4.0'

Sync branches
This commit is contained in:
Javi Fontan committed 2013-04-03 16:05:38 +02:00
commit a47fe26836
18 files changed
+156 -73

No files matched your search

+1
View File
@@ -1523,6 +1523,7 @@ SUNSTONE_PUBLIC_IMAGES_FILES="src/sunstone/public/images/ajax-loader.gif \
src/sunstone/public/images/opennebula-sunstone-big.png \
src/sunstone/public/images/opennebula-sunstone-small.png \
src/sunstone/public/images/opennebula-sunstone-v4.0.png \
src/sunstone/public/images/opennebula-sunstone-v4.0-small.png \
src/sunstone/public/images/panel.png \
src/sunstone/public/images/panel_short.png \
src/sunstone/public/images/pbar.gif \
+1
View File
@@ -0,0 +1 @@
This gem is deprecated, use "opennebula" gem instead.
+18 -6
View File
@@ -21,7 +21,7 @@ require 'tmpdir'
DEFAULTS={
:version => "3.9.0.beta",
:version => "3.9.80.beta",
:date => Time.now.strftime("%Y-%m-%d"),
:dependencies => []
}
@@ -30,7 +30,7 @@ TEMPLATE=<<EOT
# This file is automatically generated
Gem::Specification.new do |s|
s.name = 'opennebula-$(NAME)'
s.name = '$(NAME)'
s.version = '$(VERSION)'
s.date = '$(DATE)'
s.summary = "$(SUMMARY)"
@@ -49,7 +49,7 @@ EOT
GEM_DESCRIPTION={
:oca => {
:name => 'oca',
:name => 'opennebula',
:files => [
['src/oca/ruby/opennebula.rb', '/lib'],
['src/oca/ruby/opennebula/*.rb', '/lib/opennebula'],
@@ -66,7 +66,7 @@ GEM_DESCRIPTION={
},
:cli => {
:name => 'cli',
:name => 'opennebula-cli',
:files => [
['src/cli/one[a-z]*', '/bin'],
['src/cli/*.rb', '/lib'],
@@ -74,10 +74,22 @@ GEM_DESCRIPTION={
['NOTICE', ''],
['LICENSE', '']
],
:summary => 'OpenNebula Client API',
:summary => 'OpenNebula Command Line Interface',
:description => 'Commands used to talk to OpenNebula',
:dependencies => [
['opennebula-oca', "= #{DEFAULTS[:version]}"]
['opennebula', "= #{DEFAULTS[:version]}"]
]
},
:oca_deprecated => {
:name => 'opennebula-oca',
:files => [
['share/rubygems/deprecated/README', '']
],
:summary => 'OpenNebula Client API (deprecated)',
:description => 'Use opennebula gem instead',
:dependencies => [
['opennebula', "= #{DEFAULTS[:version]}"]
]
}
}
+32 -3
View File
@@ -56,6 +56,7 @@ module CommandParser
def initialize(args=[], &block)
@available_options = Array.new
@commands = Hash.new
@command_list = Array.new
@formats = Hash.new
@main = nil
@@ -288,6 +289,21 @@ module CommandParser
end
}
cmd[:proc] = block
@command_list << name.to_sym
@commands[name.to_sym] = cmd
end
def deprecated_command(name, new_command)
cmd = Hash.new
cmd[:desc] = "Deprecated, use #{new_command} instead"
cmd[:arity] = 0
cmd[:options] = []
cmd[:args_format] = [[:string, nil]] * 20
cmd[:deprecated] = new_command
cmd[:proc] = lambda do
print_deprecated(new_command)
end
@commands[name.to_sym] = cmd
end
@@ -418,6 +434,10 @@ module CommandParser
exit -1
end
if comm[:deprecated]
print_deprecated(comm[:deprecated])
end
extra_options = comm[:options] if comm
parse(extra_options)
@@ -617,7 +637,9 @@ module CommandParser
puts "## OPTIONS"
shown_opts = Array.new
@commands.each do |key,value|
@command_list.each do |key|
value = @commands[key]
value[:options].flatten.each do |o|
if shown_opts.include?(o[:name])
next
@@ -659,11 +681,12 @@ module CommandParser
else
puts "## COMMANDS"
@commands.each{ |key,value|
@command_list.each do |key|
value = @commands[key]
printf cmd_format5, "* #{key} "
print_command(value)
}
end
end
end
@@ -713,6 +736,12 @@ module CommandParser
}
end
def print_deprecated(new_command)
puts "This command is deprecated, use instead:"
puts " $ #{File.basename $0} #{new_command}"
exit(-1)
end
def word_wrap(size, text, first_size=nil)
output=[]
line=""
+12
View File
@@ -769,4 +769,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do
vm.resize(template, enforce)
end
end
# Deprecated commands
deprecated_command(:attachdisk, 'disk-attach')
deprecated_command(:detachdisk, 'disk-detach')
deprecated_command(:saveas, 'disk-snapshot')
deprecated_command(:livemigrate, 'migrate --live')
deprecated_command(:cancel, 'shutdown --hard')
deprecated_command(:reset, 'reboot --hard')
deprecated_command(:restart, 'boot')
deprecated_command(:delete, 'destroy')
deprecated_command(:resubmit, 'destroy --recreate')
end
+2
View File
@@ -103,6 +103,8 @@ class OpenNebulaVNC
return false
end
STDOUT.puts "VNC proxy started"
true
end
+2 -2
View File
@@ -70,9 +70,9 @@ if ARGV[0]
when :start
vnc.start
when :stop
vnc.stop(ARGV[1]=='--force')
vnc.stop(true)
when :restart
vnc.stop
vnc.stop(true)
sleep 1
vnc.start
when :status
@@ -47,8 +47,8 @@ module OpenNebulaJSON
when "deploy" then self.deploy(action_hash['params'])
when "finalize" then self.finalize
when "hold" then self.hold
when "livemigrate" then self.live_migrate(action_hash['params'])
when "migrate" then self.migrate(action_hash['params'])
when "livemigrate" then self.migrate(action_hash['params'], true)
when "migrate" then self.migrate(action_hash['params'], false)
when "resume" then self.resume
when "release" then self.release
when "stop" then self.stop
@@ -87,12 +87,9 @@ module OpenNebulaJSON
super(params['host_id'])
end
def live_migrate(params=Hash.new)
super(params['host_id'])
end
def migrate(params=Hash.new)
super(params['host_id'])
def migrate(params=Hash.new, live=false, enforce=false)
# TODO add enforce parameter
super(params['host_id'], live)
end
def save_as(params=Hash.new)
+6
View File
@@ -6854,3 +6854,9 @@ div.time-picker li.selected {
.columns {
line-height: 2;
}
/* line 786, ../sass/app.scss */
.transparent_table, .transparent_table tr {
background: none !important;
border: 0px !important;
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

+1 -1
View File
@@ -72,8 +72,8 @@ var create_acl_tmpl =
<small id="create_vnet_header">'+tr("Create ACL")+'</small>\
</h3>\
</div>\
<div class="reveal-body">\
<form id="create_acl_form" action="">\
<div class="reveal-body">\
<div class="row">\
<div class="four columns">\
<label class="inline right" for="applies">'+tr("This rule applies to")+':</label>\
@@ -75,8 +75,8 @@ var create_datastore_tmpl =
<small id="create_cluster_header">'+tr("Create Datastore")+'</small>\
</h3>\
</div>\
<div class="reveal-body">\
<form id="create_datastore_form" action="" class="creation">\
<div class="reveal-body">\
<div class="row">\
<div class="three columns">\
<label class="right inline" for="name" >' + tr("Name") + ':</label>\
@@ -143,7 +143,7 @@ var create_datastore_tmpl =
<select id="disk_type" name="disk_type">\
<option value="file">' + tr("File") + '</option>\
<option value="block">' + tr("Block") + '</option>\
<option value="rbd">' + tr("RBD") + '</option>\
<option value="RBD">' + tr("RBD") + '</option>\
</select>\
</div>\
<div class="one columns">\
@@ -195,30 +195,30 @@ var create_datastore_tmpl =
</div>\
</div>\
<div class="twelve columns">\
<div class="three columns">\
<div class="four columns">\
<label class="right inline" for="safe_dirs">' + tr("Safe Directories") + ':</label>\
</div>\
<div class="eight columns">\
<div class="seven columns">\
<input type="text" name="safe_dirs" id="safe_dirs" />\
</div>\
<div class="one columns">\
</div>\
</div>\
<div class="twelve columns">\
<div class="three columns">\
<div class="four columns">\
<label class="right inline" for="restricted_dirs">' + tr("Restricted Directories") + ':</label>\
</div>\
<div class="eight columns">\
<div class="seven columns">\
<input type="text" name="restricted_dirs" id="restricted_dirs" />\
</div>\
<div class="one columns">\
</div>\
</div>\
<div class="twelve columns">\
<div class="three columns">\
<div class="four columns">\
<label class="right inline" for="bridge_list">' + tr("Host Bridge List") + ':</label>\
</div>\
<div class="eight columns">\
<div class="seven columns">\
<input type="text" name="bridge_list" id="bridge_list" />\
</div>\
<div class="one columns">\
@@ -226,43 +226,42 @@ var create_datastore_tmpl =
</div>\
<div class="row">\
<div class="six columns">\
<label class="right inline" for="ds_use_ssh"><input id="ds_use_ssh" type="checkbox" name="ds_use_ssh" value="YES" />' + tr("Use SSH for Datastore Manager") + ':</label>\
<label class="right inline" for="ds_use_ssh"><input id="ds_use_ssh" type="checkbox" name="ds_use_ssh" value="YES" />' + tr("Use SSH for Datastore Manager") + '</label>\
</div>\
<div class="six columns">\
<label class="inline" for="tm_use_ssh"><input id="tm_use_ssh" type="checkbox" name="tm_use_ssh" value="YES" />' + tr("Use SSH for Transfer Manager") + ':</label>\
<label class="inline" for="tm_use_ssh"><input id="tm_use_ssh" type="checkbox" name="tm_use_ssh" value="YES" />' + tr("Use SSH for Transfer Manager") + '</label>\
</div>\
</div>\
<div class="twelve columns">\
<div class="three columns">\
<div class="four columns">\
<label class="right inline" for="host">' + tr("Storage Server") + ':</label>\
</div>\
<div class="eight columns">\
<div class="seven columns">\
<input type="text" name="host" id="host" />\
</div>\
<div class="one columns">\
</div>\
</div>\
<div class="twelve columns">\
<div class="three columns">\
<div class="four columns">\
<label class="right inline" for="base_iqn">' + tr("Base IQN") + ':</label>\
</div>\
<div class="eight columns">\
<div class="seven columns">\
<input type="text" name="base_iqn" id="base_iqn" />\
</div>\
<div class="one columns">\
</div>\
</div>\
<div class="twelve columns">\
<div class="three columns">\
<div class="four columns">\
<label class="right inline" for="vg_name">' + tr("Volume Group Name") + ':</label>\
</div>\
<div class="eight columns">\
<div class="seven columns">\
<input type="text" name="vg_name" id="vg_name" />\
</div>\
<div class="one columns">\
</div>\
</div>\
</form>\
</div>\
<hr>\
<div class="form_buttons">\
@@ -271,6 +270,7 @@ var create_datastore_tmpl =
<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
</div>\
<a class="close-reveal-modal">&#215;</a>\
</form>\
</div>';
var datastore_image_table_tmpl='<thead>\
@@ -936,7 +936,7 @@ function select_ceph(){
$('select#ds_mad').attr('disabled', 'disabled');
$('select#tm_mad').val('ceph');
$('select#tm_mad').attr('disabled', 'disabled');
$('select#ds_type').val('rbd');
$('select#disk_type').val('RBD');
}
function select_lvm(){
+1 -1
View File
@@ -82,8 +82,8 @@ var create_host_tmpl =
<small id="create_cluster_header">'+tr("Create Host")+'</small>\
</h3>\
</div>\
<div class="reveal-body">\
<form id="create_host_form" action="" class="">\
<div class="reveal-body">\
<div class="row">\
<div class="four columns">\
<label class="inline right" for="name">' + tr("Name") + ':</label>\
+46 -32
View File
@@ -517,13 +517,13 @@ function generate_capacity_tab_content() {
'</div>'+
'<hr>'+
'<br>'+
'<div class="row vm_param">'+
'<div class="row">'+
'<div class="two columns">'+
'<label class="inline right" for="CPU">'+tr("CPU")+':</label>'+
'</div>'+
'<div id="cpu_slider" class="seven columns">'+
'</div>'+
'<div class="one columns">'+
'<div class="one columns vm_param">'+
'<input type="text" id="CPU" name="cpu" size="2"/>'+
'</div>'+
'<div class="one right columns">'+
@@ -556,13 +556,13 @@ function generate_capacity_tab_content() {
'<h4><small><i class=" icon-plus-sign-alt"/> '+tr("Advanced options")+'<a id="add_os_boot_opts" class="icon_left" href="#"></a></small></h4>'+
'</div>'+
'<div class="advanced">'+
'<div class="row vm_param">'+
'<div class="row">'+
'<div class="two columns">'+
'<label class="inline right" for="VCPU">'+tr("VCPU")+':</label>'+
'</div>'+
'<div id="vcpu_slider" class="seven columns">'+
'</div>'+
'<div class="one columns">'+
'<div class="one columns vm_param">'+
'<input type="text" id="VCPU" name="vcpu" size="3" />'+
'</div>'+
'<div class="one right columns">'+
@@ -751,7 +751,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
'</div>'+
'</div>'+
'<hr>'+
'<div id="disk_type" class="vm_param image">'+
'<div id="disk_type" class="image vm_param">'+
'<div class="row collapse ">'+
'<div class="five columns push-seven">'+
'<input id="'+str_disk_tab_id+'_search" type="text" placeholder="'+tr("Search")+'"/>'+
@@ -852,13 +852,13 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
'</div>'+
'</div>'+
'</div>'+
'<div class="row vm_param">'+
'<div class="row">'+
'<div class="two columns">'+
'<label class="inline right" for="SIZE">'+tr("SIZE")+':</label>'+
'</div>'+
'<div id="size_slider" class="five columns">'+
'</div>'+
'<div class="two columns">'+
'<div class="two columns vm_param">'+
'<input type="text" id="SIZE" name="size"/>'+
'</div>'+
'<div class="two columns">'+
@@ -1225,15 +1225,19 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
'</div>'+
'<div class="row">'+
'<div class="six columns">'+
'<fieldset>'+
'<legend>'+tr("ICMP")+'</legend>'+
'<div class="row">'+
'<div class="four columns">'+
'<div class="one columns">'+
'<input type="checkbox" name="icmp_type" value="ICMP" id="icmp_type">'+
'</div>'+
'<div class="six columns">'+
'<label for="icmp_type"><input type="checkbox" name="icmp_type" value="ICMP" id="icmp_type"> '+ tr("Drop ICMP")+'</label>'+
'<div class="nine columns">'+
'<label for="icmp_type">'+ tr("Drop")+'</label>'+
'</div>'+
'<div class="two columns">'+
'</div>'+
'</div>'+
'</fieldset>'+
'</div>'+
'</div>'+
'</div>';
@@ -1376,10 +1380,13 @@ function updateTemplateInfo(request,template){
};
var template_tab = {
title: tr("Template"),
content: '<table id="template_template_table" class="info_table" style="width:80%">\
<thead><tr><th colspan="2">'+tr("Template")+'</th></tr></thead>'+
prettyPrintJSON(template_info.TEMPLATE)+
'</table>'
content: '<div class="">\
<div class="eight columns">\
<table id="template_template_table" class="transparent_table twelve">'+
prettyPrintJSON(template_info.TEMPLATE)+'\
</table>\
</div>\
</div>'
};
$("#div_edit_rename_link").die();
@@ -1551,6 +1558,7 @@ function setupCreateTemplateDialog(){
if (value.length == 0)
remove = true;
}
if (remove)
delete obj[elem];
}
@@ -2324,37 +2332,45 @@ function setupCreateTemplateDialog(){
'<fieldset>'+
'<legend>'+tr("SSH")+'</legend>'+
'<div class="row">'+
'<div class="columns eight centered">'+
'<label for="ssh_context"><input type="checkbox" name="ssh_context" id="ssh_context"> '+ tr(" Add SSH contextualization")+'</label>'+
'<div class="columns one">'+
'<input type="checkbox" name="ssh_context" id="ssh_context" checked>'+
'</div>'+
'<div class="columns ten">'+
'<label class="inline" for="ssh_context">'+ tr(" Add SSH contextualization")+'</label>'+
'</div>'+
'<div class="columns one">'+
'<div class="tip">'+tr("Add an ssh public key to the context. If the Public Key textarea is empty then the user variable SSH_PUBLIC_KEY will be used.")+'</div>'+
'</div>'+
'</div>'+
'<br>'+
'<div class="row">'+
'<div class="four columns">'+
'<label class="right inline" for="ssh_puclic_key"> '+tr("Public Key")+':</label>'+
'</div>'+
'<div class="six columns">'+
'<input type="text" id="ssh_puclic_key" name="ssh_puclic_key" />'+
'</div>'+
'<div class="two columns">'+
'<div class="ten columns">'+
'<label for="ssh_puclic_key"> '+tr("Public Key")+':</label>'+
'</div>'+
'</div>'+
'<div class="row">'+
'<textarea rows="4" type="text" id="ssh_puclic_key" name="ssh_puclic_key" />'+
'</div>'+
'</fieldset>'+
'</div>'+
'<div class="six columns">'+
'<fieldset>'+
'<legend>'+tr("Network")+'</legend>'+
'<div class="row">'+
'<div class="columns nine centered">'+
'<label for="network_context"><input type="checkbox" name="network_context" id="network_context">'+ tr(" Add Network contextualization")+'</label>'+
'<div class="row">'+
'<div class="columns one">'+
'<input type="checkbox" name="network_context" id="network_context" checked>'+
'</div>'+
'<div class="columns ten">'+
'<label class="inline" for="network_context">'+ tr(" Add Network contextualization")+'</label>'+
'</div>'+
'<div class="columns one">'+
'<div class="tip">'+tr("Add network contextualization parameters. For each NIC defined in the NETWORK section, ETH%i_IP, ETH%i_NETWORK... parameters will be included in the CONTEXT section and will be available in the Virtual Machine")+'</div>'+
'</div>'+
'</div>'+
'</div>'+
'<br>'+
'</fieldset>'+
'</div>'+
'</div>'+
'</li>'+
'<li class="wizard_internal_tab vm_param" id="filesTab">'+
'<li class="wizard_internal_tab" id="filesTab">'+
'<div class="row collapse ">'+
'<div class="five columns push-seven">'+
'<input id="files_search" type="text" placeholder="'+tr("Search")+'"/>'+
@@ -3044,7 +3060,6 @@ function setupCreateTemplateDialog(){
var build_template = function(){
var vm_json = {};
var name,value,boot_method;
//
// CAPACITY
//
@@ -3055,7 +3070,6 @@ function setupCreateTemplateDialog(){
// return false;
// };
addSectionJSON(vm_json,$('li#capacityTab',dialog));
//
// OS
//
+1 -1
View File
@@ -273,7 +273,7 @@ function notifyMessage(msg){
function prettyPrintJSON(template_json,padding,weight, border_bottom,padding_top_bottom){
var str = ""
if (!template_json){ return "Not defined";}
if (!padding) {padding=0};
if (!padding) {padding=10};
if (!weight) {weight="bold";}
if (!border_bottom) {border_bottom = "1px solid #CCCCCC";}
if (!padding_top_bottom) {padding_top_bottom=6;}
+4
View File
@@ -781,6 +781,10 @@ function insertButtonsInTab(tab_name){
$("#user_buttons", action_block).remove()
}
//action_block.foundationButtons();
$('.top_button, .list_button',action_block).attr('disabled', false);
$('.top_button, .list_button',action_block).attr('disabled', true);
$('.create_dialog_button',action_block).attr('disabled', false);
$('.alwaysActive',action_block).attr('disabled', false);
}//if tab exists
}
+5
View File
@@ -781,4 +781,9 @@ div.time-picker li.selected {
.columns {
line-height: 2;
}
.transparent_table, .transparent_table tr {
background: none !important;
border: 0px !important;
}
+1 -1
View File
@@ -87,7 +87,7 @@
<div id="menu" class="outer-west">
<div id="logo">
<img src="images/opennebula-sunstone-v4.0.png"/>
<img src="images/opennebula-sunstone-v4.0-small.png"/>
</div>
<div class="menu-navZ">
<ul id="navigation" class="tabs vertical">