shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-13 13:17:39 +03:00
Code Releases Wiki Activity

Merge branch 'feature-789'

Browse Source
This commit is contained in:
Ruben S. Montero 2011-10-22 00:37:16 +02:00
commit d37865d277
35 changed files with 1475 additions and 820 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
install.sh
View File

@ -198,6 +198,7 @@ ETC_DIRS="$ETC_LOCATION/im_kvm \
LIB_DIRS="$LIB_LOCATION/ruby \ LIB_DIRS="$LIB_LOCATION/ruby \
$LIB_LOCATION/ruby/OpenNebula \ $LIB_LOCATION/ruby/OpenNebula \
$LIB_LOCATION/ruby/zona \
$LIB_LOCATION/ruby/cloud/ \ $LIB_LOCATION/ruby/cloud/ \
$LIB_LOCATION/ruby/cloud/econe \ $LIB_LOCATION/ruby/cloud/econe \
$LIB_LOCATION/ruby/cloud/econe/views \ $LIB_LOCATION/ruby/cloud/econe/views \
@ -272,7 +273,8 @@ OZONES_DIRS="$OZONES_LOCATION/lib \
OZONES_CLIENT_DIRS="$LIB_LOCATION/ruby \ OZONES_CLIENT_DIRS="$LIB_LOCATION/ruby \
$LIB_LOCATION/ruby/OpenNebula \ $LIB_LOCATION/ruby/OpenNebula \
$LIB_LOCATION/ruby/cli \ $LIB_LOCATION/ruby/cli \
$LIB_LOCATION/ruby/cli/ozones_helper" $LIB_LOCATION/ruby/cli/ozones_helper \
$LIB_LOCATION/ruby/zona"
LIB_ECO_CLIENT_DIRS="$LIB_LOCATION/ruby \ LIB_ECO_CLIENT_DIRS="$LIB_LOCATION/ruby \
$LIB_LOCATION/ruby/OpenNebula \ $LIB_LOCATION/ruby/OpenNebula \
@ -370,10 +372,11 @@ INSTALL_CLIENT_FILES=(
CLI_LIB_FILES:$LIB_LOCATION/ruby/cli CLI_LIB_FILES:$LIB_LOCATION/ruby/cli
ONE_CLI_LIB_FILES:$LIB_LOCATION/ruby/cli/one_helper ONE_CLI_LIB_FILES:$LIB_LOCATION/ruby/cli/one_helper
ETC_CLIENT_FILES:$ETC_LOCATION ETC_CLIENT_FILES:$ETC_LOCATION
OZONES_LIB_CLIENT_FILES:$LIB_LOCATION/ruby
OZONES_BIN_CLIENT_FILES:$BIN_LOCATION OZONES_BIN_CLIENT_FILES:$BIN_LOCATION
OZONES_LIB_CLIENT_CLI_FILES:$LIB_LOCATION/ruby/cli OZONES_LIB_CLIENT_CLI_FILES:$LIB_LOCATION/ruby/cli
OZONES_LIB_CLIENT_CLI_HELPER_FILES:$LIB_LOCATION/ruby/cli/ozones_helper OZONES_LIB_CLIENT_CLI_HELPER_FILES:$LIB_LOCATION/ruby/cli/ozones_helper
OZONES_LIB_API_FILES:$LIB_LOCATION/ruby
OZONES_LIB_API_ZONA_FILES:$LIB_LOCATION/ruby/zona
CLI_CONF_FILES:$ETC_LOCATION/cli CLI_CONF_FILES:$ETC_LOCATION/cli
OCA_LIB_FILES:$LIB_LOCATION/ruby OCA_LIB_FILES:$LIB_LOCATION/ruby
RUBY_OPENNEBULA_LIB_FILES:$LIB_LOCATION/ruby/OpenNebula RUBY_OPENNEBULA_LIB_FILES:$LIB_LOCATION/ruby/OpenNebula
@ -428,10 +431,11 @@ INSTALL_OZONES_FILES=(
OZONES_PUBLIC_IMAGES_FILES:$OZONES_LOCATION/public/images OZONES_PUBLIC_IMAGES_FILES:$OZONES_LOCATION/public/images
OZONES_PUBLIC_CSS_FILES:$OZONES_LOCATION/public/css OZONES_PUBLIC_CSS_FILES:$OZONES_LOCATION/public/css
OZONES_PUBLIC_JS_PLUGINS_FILES:$OZONES_LOCATION/public/js/plugins OZONES_PUBLIC_JS_PLUGINS_FILES:$OZONES_LOCATION/public/js/plugins
OZONES_LIB_CLIENT_FILES:$LIB_LOCATION/ruby
OZONES_BIN_CLIENT_FILES:$BIN_LOCATION OZONES_BIN_CLIENT_FILES:$BIN_LOCATION
OZONES_LIB_CLIENT_CLI_FILES:$LIB_LOCATION/ruby/cli OZONES_LIB_CLIENT_CLI_FILES:$LIB_LOCATION/ruby/cli
OZONES_LIB_CLIENT_CLI_HELPER_FILES:$LIB_LOCATION/ruby/cli/ozones_helper OZONES_LIB_CLIENT_CLI_HELPER_FILES:$LIB_LOCATION/ruby/cli/ozones_helper
OZONES_LIB_API_FILES:$LIB_LOCATION/ruby
OZONES_LIB_API_ZONA_FILES:$LIB_LOCATION/ruby/zona
) )
INSTALL_OZONES_ETC_FILES=( INSTALL_OZONES_ETC_FILES=(
@ -1056,6 +1060,16 @@ OZONES_LIB_ZONE_FILES="src/ozones/Server/lib/OZones/Zones.rb \
src/ozones/Server/lib/OZones/AggregatedImages.rb \ src/ozones/Server/lib/OZones/AggregatedImages.rb \
src/ozones/Server/lib/OZones/AggregatedTemplates.rb" src/ozones/Server/lib/OZones/AggregatedTemplates.rb"
OZONES_LIB_API_FILES="src/ozones/Client/lib/zona.rb"
OZONES_LIB_API_ZONA_FILES="src/ozones/Client/lib/zona/ZoneElement.rb \
src/ozones/Client/lib/zona/OZonesPool.rb \
src/ozones/Client/lib/zona/OZonesJSON.rb \
src/ozones/Client/lib/zona/VDCPool.rb \
src/ozones/Client/lib/zona/VDCElement.rb \
src/ozones/Client/lib/zona/OZonesElement.rb \
src/ozones/Client/lib/zona/ZonePool.rb"
OZONES_PUBLIC_VENDOR_JQUERY=$SUNSTONE_PUBLIC_VENDOR_JQUERY OZONES_PUBLIC_VENDOR_JQUERY=$SUNSTONE_PUBLIC_VENDOR_JQUERY
OZONES_PUBLIC_VENDOR_DATATABLES=$SUNSTONE_PUBLIC_VENDOR_DATATABLES OZONES_PUBLIC_VENDOR_DATATABLES=$SUNSTONE_PUBLIC_VENDOR_DATATABLES
@ -1091,8 +1105,6 @@ OZONES_PUBLIC_JS_PLUGINS_FILES="src/ozones/Server/public/js/plugins/zones-tab.js
src/ozones/Server/public/js/plugins/aggregated-tab.js \ src/ozones/Server/public/js/plugins/aggregated-tab.js \
src/ozones/Server/public/js/plugins/dashboard-tab.js" src/ozones/Server/public/js/plugins/dashboard-tab.js"
OZONES_LIB_CLIENT_FILES="src/ozones/Client/lib/OZonesClient.rb"
OZONES_LIB_CLIENT_CLI_FILES="src/ozones/Client/lib/cli/ozones_helper.rb" OZONES_LIB_CLIENT_CLI_FILES="src/ozones/Client/lib/cli/ozones_helper.rb"
OZONES_LIB_CLIENT_CLI_HELPER_FILES="\ OZONES_LIB_CLIENT_CLI_HELPER_FILES="\

3
src/oca/ruby/OpenNebula/Configuration.rb
View File

@ -78,9 +78,6 @@ module OpenNebula
key=m[0].strip.upcase key=m[0].strip.upcase
value=m[1].strip value=m[1].strip
# hack to skip multiline VM_TYPE values
next if %w{NAME TEMPLATE}.include? key.upcase
add_value(key, value) add_value(key, value)
} }

21
src/ozones/Client/bin/onevdc
View File

@ -1,5 +1,21 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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. #
#--------------------------------------------------------------------------- #
ONE_LOCATION=ENV["ONE_LOCATION"] ONE_LOCATION=ENV["ONE_LOCATION"]
if !ONE_LOCATION if !ONE_LOCATION
@ -49,8 +65,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
helper.show_resource(args[0],options) helper.show_resource(args[0],options)
end end
command :list, 'Lists VDCs in the pool', command :list, 'Lists VDCs in the pool' do
:options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS do
helper.list_pool(options) helper.list_pool(options)
end end
@ -64,7 +79,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
end end
command :delhost, 'Deletes the set of hosts from the VDC', command :delhost, 'Deletes the set of hosts from the VDC',
:vdcid, :range, :options=>[FORCE] do :vdcid, :range do
helper.delhost(args[0], args[1], options) helper.delhost(args[0], args[1], options)
end end
end end

27
src/ozones/Client/bin/onezone
View File

@ -68,45 +68,45 @@ cmd=CommandParser::CmdParser.new(ARGV) do
case args[1] case args[1]
when "host" when "host"
aux_helper = OneHostHelper.new( aux_helper = OneHostHelper.new(
zone['onename'] + ":" + zone['onepass'], zone[:ONENAME] + ":" + zone[:ONEPASS],
zone['endpoint'], zone[:ENDPOINT],
false) false)
aux_helper.list_pool(options) aux_helper.list_pool(options)
when "vm" when "vm"
aux_helper = OneVMHelper.new( aux_helper = OneVMHelper.new(
zone['onename'] + ":" + zone['onepass'], zone[:ONENAME] + ":" + zone[:ONEPASS],
zone['endpoint'], zone[:ENDPOINT],
false) false)
aux_helper.list_pool(options) aux_helper.list_pool(options)
when "image" when "image"
aux_helper = OneImageHelper.new( aux_helper = OneImageHelper.new(
zone['onename'] + ":" + zone['onepass'], zone[:ONENAME] + ":" + zone[:ONEPASS],
zone['endpoint'], zone[:ENDPOINT],
false) false)
aux_helper.list_pool(options) aux_helper.list_pool(options)
when "vn" when "vn"
aux_helper = OneVNetHelper.new( aux_helper = OneVNetHelper.new(
zone['onename'] + ":" + zone['onepass'], zone[:ONENAME] + ":" + zone[:ONEPASS],
zone['endpoint'], zone[:ENDPOINT],
false) false)
aux_helper.list_pool(options) aux_helper.list_pool(options)
when "template" when "template"
aux_helper = OneTemplateHelper.new( aux_helper = OneTemplateHelper.new(
zone['onename'] + ":" + zone['onepass'], zone[:ONENAME] + ":" + zone[:ONEPASS],
zone['endpoint'], zone[:ENDPOINT],
false) false)
aux_helper.list_pool(options) aux_helper.list_pool(options)
when "user" when "user"
aux_helper = OneUserHelper.new( aux_helper = OneUserHelper.new(
zone['onename'] + ":" + zone['onepass'], zone[:ONENAME] + ":" + zone[:ONEPASS],
zone['endpoint'], zone[:ENDPOINT],
false) false)
aux_helper.list_pool(options) aux_helper.list_pool(options)
@ -114,8 +114,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
0 0
end end
command :list, 'Lists Zones in the pool', command :list, 'Lists Zones in the pool' do
:options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS do
helper.list_pool(options) helper.list_pool(options)
end end

280
src/ozones/Client/lib/OZonesClient.rb
View File

@ -1,280 +0,0 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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 'rubygems'
require 'uri'
require 'net/https'
require 'json'
require 'OpenNebula/Configuration'
module OZonesClient
class Client
OZONES_VERSION = <<EOT
oZones 1.0
Copyright 2002-2011, 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
EOT
######################################################################
# Initialize client library
######################################################################
def initialize(user=nil, pass=nil, endpoint_str=nil,
timeout=nil, debug_flag=true)
@debug = debug_flag
@timeout = timeout
# Server location
if endpoint_str
@endpoint = endpoint_str
elsif ENV["OZONES_URL"]
@endpoint = ENV["OZONES_URL"]
else
@endpoint = "http://localhost:6121"
end
# Autentication
if user && pass
@ozonesauth = [user, pass]
elsif ENV['OZONES_AUTH']
@ozonesauth=File.read(ENV['OZONES_AUTH']).strip.split(':')
end
if !@ozonesauth
raise "No authorization data present"
end
if @ozonesauth.size != 2
raise "Authorization data malformed"
end
end
#####################################
# General Resource Request Methods #
####################################
######################################################################
# Retieves all elements on a pool
# :zonetemplate
######################################################################
def get_pool(kind)
url = URI.parse(@endpoint+"/" + kind)
req = Net::HTTP::Get.new(url.path)
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = OZonesClient::http_start(url, @timeout) {|http|
http.request(req)
}
return OZonesClient::parse_error(res, kind)
end
######################################################################
# Post a new Resource to the relevant OZones Pool
# :zonetemplate
######################################################################
def post_resource(kind, template)
tmpl_str = File.read(template)
post_resource_str(kind, tmpl_str)
end
def post_resource_str(kind, tmpl_str)
body_str = OZonesClient::to_body(kind, tmpl_str)
url = URI.parse("#{@endpoint}/#{kind}")
req = Net::HTTP::Post.new(url.path)
req.body=body_str
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = OZonesClient::http_start(url, @timeout) do |http|
http.request(req)
end
return OZonesClient::parse_error(res, kind)
end
def put_resource(kind, id, tmpl_str)
body_str = OZonesClient::to_body(kind, tmpl_str)
url = URI.parse("#{@endpoint}/#{kind}/#{id}")
req = Net::HTTP::Put.new(url.path)
req.body=body_str
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = OZonesClient::http_start(url, @timeout) do |http|
http.request(req)
end
return OZonesClient::parse_error(res, kind)
end
def get_resource(kind, id)
url = URI.parse("#{@endpoint}/#{kind}/#{id}")
req = Net::HTTP::Get.new(url.path)
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = OZonesClient::http_start(url, @timeout) {|http|
http.request(req)
}
return OZonesClient::parse_error(res, kind)
end
def delete_resource(kind, id)
url = URI.parse("#{@endpoint}/#{kind}/#{id}")
req = Net::HTTP::Delete.new(url.path)
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = OZonesClient::http_start(url, @timeout) {|http|
http.request(req)
}
return OZonesClient::parse_error(res, kind)
end
end
# #########################################################################
# The Error Class represents a generic error in the OZones Client
# library. It contains a readable representation of the error.
# #########################################################################
class Error
attr_reader :message
# +message+ a description of the error
def initialize(message=nil)
@message=message
end
def to_s()
@message
end
end
# #########################################################################
# Error handling functions
# #########################################################################
def self.is_error?(value)
value.class==OZonesClient::Error
end
def self.is_http_error?(value)
value.class != Net::HTTPOK
end
def self.parse_error(value, kind)
if OZonesClient::is_error?(value)
return value
else
if OZonesClient::is_http_error?(value)
str = "Operating with #{kind.upcase} failed with HTTP error "
str = str + "code: #{value.code}\n"
if value.body
# Try to extract error message
begin
str << "Body: " <<
OZonesClient::parse_json(value.body,
"error")["message"]
rescue
str.gsub!("\nBody:","")
end
end
return OZonesClient::Error.new str
end
end
return value # If it is not an error, return it as-is
end
# #########################################################################
# Starts an http connection and calls the block provided. SSL flag
# is set if needed.
# #########################################################################
def self.http_start(url, timeout, &block)
http = Net::HTTP.new(url.host, url.port)
if timeout
http.read_timeout = timeout.to_i
end
if url.scheme=='https'
http.use_ssl = true
http.verify_mode=OpenSSL::SSL::VERIFY_NONE
end
begin
http.start do |connection|
block.call(connection)
end
rescue Errno::ECONNREFUSED => e
str = "Error connecting to server (#{e.to_s}).\n"
str << "Server: #{url.host}:#{url.port}"
return OZonesClient::Error.new(str)
rescue Errno::ETIMEDOUT => e
str = "Error timeout connecting to server (#{e.to_s}).\n"
str << "Server: #{url.host}:#{url.port}"
return OZonesClient::Error.new(str)
rescue Timeout::Error => e
str = "Error timeout while connected to server (#{e.to_s}).\n"
str << "Server: #{url.host}:#{url.port}"
return OZonesClient::Error.new(str)
end
end
##########################################################################
# JSON & Template utils
##########################################################################
def self.to_body(kind, tmpl_str)
tmpl = OpenNebula::Configuration.new(tmpl_str)
res = { "#{kind}" => tmpl.conf }
return JSON::generate(res)
end
def self.parse_json(json_str, root_element)
begin
hash = JSON.parse(json_str)
rescue Exception => e
return OZonesClient::Error.new(e.message)
end
if hash.has_key?(root_element)
return hash[root_element]
else
return OZonesClient::Error.new("Error parsing JSON: Wrong resource type")
end
end
def self.to_json(hash_to_convert)
begin
JSON.pretty_generate hash_to_convert
rescue Exception => e
OZonesClient::Error.new(e.message)
end
end
end

22
src/ozones/Client/lib/cli/ozones_helper.rb
View File

@ -14,14 +14,14 @@
# limitations under the License. # # limitations under the License. #
#--------------------------------------------------------------------------- # #--------------------------------------------------------------------------- #
require 'OZonesClient' require 'zona'
module OZonesHelper module OZonesHelper
class OZHelper class OZHelper
def initialize(user=nil, pass=nil, endpoint_str=nil, def initialize(user=nil, pass=nil, endpoint_str=nil,
timeout=nil, debug_flag=true) timeout=nil, debug_flag=true)
@client = OZonesClient::Client.new(user, @client = Zona::Client.new(user,
pass, pass,
endpoint_str, endpoint_str,
timeout, timeout,
@ -29,9 +29,9 @@ module OZonesHelper
end end
def create_resource(kind, template) def create_resource(kind, template)
rc = @client.post_resource(kind, template) rc = @client.post_resource_file(kind, template)
if OZonesClient::is_error?(rc) if Zona::is_error?(rc)
[-1, rc.message] [-1, rc.message]
else else
id = get_id(rc) id = get_id(rc)
@ -42,10 +42,10 @@ module OZonesHelper
def list_pool(kind, options) def list_pool(kind, options)
rc = @client.get_pool(kind) rc = @client.get_pool(kind)
if OZonesClient::is_error?(rc) if Zona::is_error?(rc)
[-1, rc.message] [-1, rc.message]
else else
pool=OZonesClient::parse_json(rc.body, kind.upcase + "_POOL") pool=Zona::OZonesJSON.parse_json(rc.body, kind.upcase + "_POOL")
format_pool(pool, options) format_pool(pool, options)
end end
end end
@ -53,10 +53,10 @@ module OZonesHelper
def show_resource(kind, id, options) def show_resource(kind, id, options)
rc = @client.get_resource(kind, id) rc = @client.get_resource(kind, id)
if OZonesClient::is_error?(rc) if Zona::is_error?(rc)
[-1, rc.message] [-1, rc.message]
else else
resource=OZonesClient::parse_json(rc.body, kind.upcase) resource=Zona::OZonesJSON.parse_json(rc.body, kind.upcase)
format_resource(resource, options) format_resource(resource, options)
end end
end end
@ -64,10 +64,10 @@ module OZonesHelper
def delete_resource(kind, id, options) def delete_resource(kind, id, options)
rc = @client.delete_resource(kind, id) rc = @client.delete_resource(kind, id)
if OZonesClient::is_error?(rc) if Zona::is_error?(rc)
[-1, rc.message] [-1, rc.message]
else else
message=OZonesClient::parse_json(rc.body, "message") message=Zona::OZonesJSON.parse_json(rc.body, "message")
[0, "#{message}"] [0, "#{message}"]
end end
end end
@ -78,7 +78,7 @@ module OZonesHelper
def get_id(rc) def get_id(rc)
id = rc.body.match('\"id\":(.*)$')[1].strip id = rc.body.match('\"ID\":(.*)$')[1].strip
if id[-1..-1] == "," if id[-1..-1] == ","
id = id[0..id.size-2] id = id[0..id.size-2]
end end

46
src/ozones/Client/lib/cli/ozones_helper/vdc_helper.rb
View File

@ -33,7 +33,7 @@ class VDCHelper < OZonesHelper::OZHelper
rc = @client.post_resource_str(@vdc_str, tmpl_str) rc = @client.post_resource_str(@vdc_str, tmpl_str)
if OZonesClient::is_error?(rc) if Zona::is_error?(rc)
[-1, rc.message] [-1, rc.message]
else else
id = get_id(rc) id = get_id(rc)
@ -56,13 +56,13 @@ class VDCHelper < OZonesHelper::OZHelper
def addhost(id, host_array, options) def addhost(id, host_array, options)
rc = @client.get_resource(@vdc_str, id) rc = @client.get_resource(@vdc_str, id)
if OZonesClient::is_error?(rc) if Zona::is_error?(rc)
return [-1, rc.message] return [-1, rc.message]
else else
vdc = OZonesClient::parse_json(rc.body, @vdc_str.upcase) vdc = Zona::OZonesJSON.parse_json(rc.body, @vdc_str.upcase)
end end
hosts = vdc['hosts'].split(',').collect!{|x| x.to_i} hosts = vdc[:HOSTS].split(',').collect!{|x| x.to_i}
host_array.concat(hosts).uniq! host_array.concat(hosts).uniq!
new_host = host_array.join(',') new_host = host_array.join(',')
@ -72,9 +72,9 @@ class VDCHelper < OZonesHelper::OZHelper
template << "FORCE=YES\n" template << "FORCE=YES\n"
end end
rc = @client.put_resource(@vdc_str, id, template) rc = @client.put_resource_str(@vdc_str, id, template)
if OZonesClient::is_error?(rc) if Zona::is_error?(rc)
return [-1, rc.message] return [-1, rc.message]
end end
@ -84,24 +84,20 @@ class VDCHelper < OZonesHelper::OZHelper
def delhost(id, host_array, options) def delhost(id, host_array, options)
rc = @client.get_resource(@vdc_str, id) rc = @client.get_resource(@vdc_str, id)
if OZonesClient::is_error?(rc) if Zona::is_error?(rc)
return [-1, rc.message] return [-1, rc.message]
else else
vdc = OZonesClient::parse_json(rc.body, @vdc_str.upcase) vdc = Zona::OZonesJSON.parse_json(rc.body, @vdc_str.upcase)
end end
hosts = vdc['hosts'].split(',').collect!{|x| x.to_i} hosts = vdc[:HOSTS].split(',').collect!{|x| x.to_i}
new_host = (hosts - host_array).join(',') new_host = (hosts - host_array).join(',')
template = "ID=#{id}\nHOSTS=#{new_host}\n" template = "ID=#{id}\nHOSTS=#{new_host}\n"
if options[:force] rc = @client.put_resource_str(@vdc_str, id, template)
template << "FORCE=YES\n"
end
rc = @client.put_resource(@vdc_str, id, template) if Zona.is_error?(rc)
if OZonesClient::is_error?(rc)
return [-1, rc.message] return [-1, rc.message]
end end
@ -116,12 +112,12 @@ class VDCHelper < OZonesHelper::OZHelper
CLIHelper.print_header(str_h1 % ["VDC #{vdc['name']} INFORMATION"]) CLIHelper.print_header(str_h1 % ["VDC #{vdc['name']} INFORMATION"])
puts str % ["ID ", vdc['id'].to_s] puts str % ["ID ", vdc[:ID].to_s]
puts str % ["NAME ", vdc['name'].to_s] puts str % ["NAME ", vdc[:NAME].to_s]
puts str % ["GROUP_ID ", vdc['group_id'].to_s] puts str % ["GROUP_ID ", vdc[:GROUP_ID].to_s]
puts str % ["ZONEID ", vdc['zones_id'].to_s] puts str % ["ZONEID ", vdc[:ZONES_ID].to_s]
puts str % ["VDCADMIN ", vdc['vdcadminname'].to_s] puts str % ["VDCADMIN ", vdc[:VDCADMINNAME].to_s]
puts str % ["HOST IDs ", vdc['hosts'].to_s] puts str % ["HOST IDs ", vdc[:HOSTS].to_s]
puts puts
return 0 return 0
@ -130,21 +126,21 @@ class VDCHelper < OZonesHelper::OZHelper
def format_pool(pool, options) def format_pool(pool, options)
st=CLIHelper::ShowTable.new(nil) do st=CLIHelper::ShowTable.new(nil) do
column :ID, "Identifier for VDC", :size=>4 do |d,e| column :ID, "Identifier for VDC", :size=>4 do |d,e|
d["id"] d[:ID]
end end
column :NAME, "Name of the VDC", :right, :size=>15 do |d,e| column :NAME, "Name of the VDC", :right, :size=>15 do |d,e|
d["name"] d[:NAME]
end end
column :ZONEID, "Id of the Zone where it belongs", column :ZONEID, "Id of the Zone where it belongs",
:right, :size=>40 do |d,e| :right, :size=>40 do |d,e|
d["zones_id"] d[:ZONES_ID]
end end
default :ID, :NAME, :ZONEID default :ID, :NAME, :ZONEID
end end
st.show(pool[@vdc_str.upcase], options) st.show(pool[:VDC], options)
return 0 return 0
end end

30
src/ozones/Client/lib/cli/ozones_helper/zones_helper.rb
View File

@ -36,17 +36,17 @@ class ZonesHelper < OZonesHelper::OZHelper
str_h1="%-61s" str_h1="%-61s"
str="%-15s: %-20s" str="%-15s: %-20s"
CLIHelper.print_header(str_h1 % ["ZONE #{zone['name']} INFORMATION"]) CLIHelper.print_header(str_h1 % ["ZONE #{zone[:NAME]} INFORMATION"])
puts str % ["ID ", zone['id'].to_s] puts str % ["ID ", zone[:ID].to_s]
puts str % ["NAME ", zone['name'].to_s] puts str % ["NAME ", zone[:NAME].to_s]
puts str % ["ZONE ADMIN ",zone['onename'].to_s] puts str % ["ZONE ADMIN ",zone[:ONENAME].to_s]
puts str % ["ZONE PASS ", zone['onepass'].to_s] puts str % ["ZONE PASS ", zone[:ONEPASS].to_s]
puts str % ["ENDPOINT ", zone['endpoint'].to_s] puts str % ["ENDPOINT ", zone[:ENDPOINT].to_s]
puts str % ["# VDCS ", zone['vdcs'].size.to_s] puts str % ["# VDCS ", zone[:VDCS].size.to_s]
puts puts
if zone['vdcs'].size == 0 if zone[:VDCS].size == 0
return [0, zone] return [0, zone]
end end
@ -54,17 +54,17 @@ class ZonesHelper < OZonesHelper::OZHelper
st=CLIHelper::ShowTable.new(nil) do st=CLIHelper::ShowTable.new(nil) do
column :ID, "Identifier for VDC", :size=>4 do |d,e| column :ID, "Identifier for VDC", :size=>4 do |d,e|
d["id"] d[:ID]
end end
column :NAME, "Name of the VDC", :right, :size=>15 do |d,e| column :NAME, "Name of the VDC", :right, :size=>15 do |d,e|
d["name"] d[:NAME]
end end
default :ID, :NAME default :ID, :NAME
end end
st.show(zone["vdcs"], options) st.show(zone[:VDCS], options)
return [0, zone] return [0, zone]
end end
@ -72,20 +72,20 @@ class ZonesHelper < OZonesHelper::OZHelper
def format_pool(pool, options) def format_pool(pool, options)
st=CLIHelper::ShowTable.new(nil) do st=CLIHelper::ShowTable.new(nil) do
column :ID, "Identifier for Zone", :size=>4 do |d,e| column :ID, "Identifier for Zone", :size=>4 do |d,e|
d["id"] d[:ID]
end end
column :NAME, "Name of the Zone", :right, :size=>15 do |d,e| column :NAME, "Name of the Zone", :right, :size=>15 do |d,e|
d["name"] d[:NAME]
end end
column :ENDPOINT, "Endpoint of the Zone", :right, :size=>40 do |d,e| column :ENDPOINT, "Endpoint of the Zone", :right, :size=>40 do |d,e|
d["endpoint"] d[:ENDPOINT]
end end
default :ID, :NAME, :ENDPOINT default :ID, :NAME, :ENDPOINT
end end
st.show(pool[@zone_str.upcase], options) st.show(pool[:ZONE], options)
return 0 return 0
end end

320
src/ozones/Client/lib/zona.rb Normal file
View File

@ -0,0 +1,320 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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 'rubygems'
require 'uri'
require 'net/https'
require 'OpenNebula/Configuration'
require 'zona/OZonesJSON'
require 'zona/OZonesPool'
require 'zona/OZonesElement'
require 'zona/ZonePool'
require 'zona/ZoneElement'
require 'zona/VDCPool'
require 'zona/VDCElement'
################################################################################
# This module contains all the OZones API related classes and utilities.
################################################################################
module Zona
############################################################################
# OZones Client provides functionality to send and retrieve information
# from the OZones server side. It is used by CLI and API to handle the
# http requests to the server and basic error control on the
# responses.
############################################################################
class Client
# Provides current version information.
# Should match server's oZones version.
OZONES_VERSION = <<EOT
oZones 1.0
Copyright 2002-2011, 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
EOT
# Initialize client instance
# @param [String] user oZones username
# @param [String] pass oZones password
# @param [String] endpoint Server endpoint
# @param [Integer] timeout client timout, defaults means no timeout
# @param [Boolean] debug_flag produce debug information
# @return [Client] Client instance
def initialize(user=nil, pass=nil, endpoint_str=nil,
timeout=nil, debug_flag=true)
@debug = debug_flag
@timeout = timeout
# Server location
if endpoint_str
@endpoint = endpoint_str
elsif ENV["OZONES_URL"]
@endpoint = ENV["OZONES_URL"]
else
@endpoint = "http://localhost:6121"
end
# Autentication
if user && pass
@ozonesauth = [user, pass]
elsif ENV['OZONES_AUTH']
@ozonesauth=File.read(ENV['OZONES_AUTH']).strip.split(':')
end
if !@ozonesauth
raise "No authorization data present"
end
if @ozonesauth.size != 2
raise "Authorization data malformed"
end
end
# Retrieves all elements of a kind (pool)
# @param [String] kind element kind
# @return [String, Zone::Error] Response string or Error
def get_pool(kind)
url = URI.parse(@endpoint+"/" + kind)
req = Net::HTTP::Get.new(url.path)
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = Client.http_start(url, @timeout) {|http|
http.request(req)
}
return Client.parse_error(res, kind)
end
# Creates a resource from an opennebula template file
# @param [String] kind resource kind: vdc,zone...
# @param [String] template path to template file
# @return [String, Zona::Error] Response string or Error
def post_resource_file(kind, template)
tmpl_str = File.read(template)
post_resource_str(kind, tmpl_str)
end
# Creates a resource from an OpenNebula template string
# @param [String] kind resource kind: vdc,zone...
# @param [String] tmpl_str OpenNebula template string
# @return [String, Zona::Error] Response string or Error
def post_resource_str(kind, tmpl_str)
tmpl_json = Zona.to_body(kind, tmpl_str)
post_resource(kind, tmpl_json)
end
# Creates a resource
# @param [String] kind resource kind: vdc, zone...
# @param [String] tmpl_json JSON template
# @return [String, Zona::Error] Response string or Error
def post_resource(kind, tmpl_json)
url = URI.parse("#{@endpoint}/#{kind}")
req = Net::HTTP::Post.new(url.path)
req.body=tmpl_json
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = Client.http_start(url, @timeout) do |http|
http.request(req)
end
return Client.parse_error(res, kind)
end
# Modifies a resource from an OpenNebula template string
# @param [String] kind resource kind: vdc, zone...
# @param [String] tmpl_str OpenNebula template string
# @return [String, Zona::Error] Response string or Error
def put_resource_str(kind, id, tmpl_str)
tmpl_json = Client.to_body(kind, tmpl_str)
put_resource(kind, id, tmpl_json)
end
# Modifies a resource
# @param [String] kind resource kind: vdc, zone...
# @param [String] tmpl_json JSON template
# @return [String, Zona::Error] Response string or Error
def put_resource(kind, id, tmpl_json)
url = URI.parse("#{@endpoint}/#{kind}/#{id}")
req = Net::HTTP::Put.new(url.path)
req.body=tmpl_json
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = Client.http_start(url, @timeout) do |http|
http.request(req)
end
return Client.parse_error(res, kind)
end
# Retrieves a resource
# @param [String] Kind resource kind: vdc, zone...
# @param [#to_i] id resource id
# @return [String, Zona::Error] Response string or Error
def get_resource(kind, id)
url = URI.parse("#{@endpoint}/#{kind}/#{id}")
req = Net::HTTP::Get.new(url.path)
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = Client.http_start(url, @timeout) {|http|
http.request(req)
}
return Client.parse_error(res, kind)
end
# Deletes a resource
# @param [String] kind resource kind: vdc, zone...
# @param [#to_i] id resource id
# @return [String, Zona::Error] Response string or Error
def delete_resource(kind, id)
url = URI.parse("#{@endpoint}/#{kind}/#{id}")
req = Net::HTTP::Delete.new(url.path)
req.basic_auth @ozonesauth[0], @ozonesauth[1]
res = Client.http_start(url, @timeout) {|http|
http.request(req)
}
return Client.parse_error(res, kind)
end
private
# Starts an http connection and calls the block provided. SSL flag
# is set if needed.
def self.http_start(url, timeout, &block)
http = Net::HTTP.new(url.host, url.port)
if timeout
http.read_timeout = timeout.to_i
end
if url.scheme=='https'
http.use_ssl = true
http.verify_mode=OpenSSL::SSL::VERIFY_NONE
end
begin
http.start do |connection|
block.call(connection)
end
rescue Errno::ECONNREFUSED => e
str = "Error connecting to server (#{e.to_s}).\n"
str << "Server: #{url.host}:#{url.port}"
return Error.new(str)
rescue Errno::ETIMEDOUT => e
str = "Error timeout connecting to server (#{e.to_s}).\n"
str << "Server: #{url.host}:#{url.port}"
return Error.new(str)
rescue Timeout::Error => e
str = "Error timeout while connected to server (#{e.to_s}).\n"
str << "Server: #{url.host}:#{url.port}"
return Error.new(str)
rescue Errno::ENETUNREACH => e
str = "Error trying to reach network (#{e.to_s}).\n"
str << "Server: #{url.host}:#{url.port}"
return Error.new(str)
end
end
# Parses a response
# @param [String] value response string
# @param [String] kind resource kind
# @return [String, Zona::Error] Returns the value or Error if found
def self.parse_error(value, kind)
if Zona.is_error?(value)
return value
else
if Zona.is_http_error?(value)
str = "Operating with #{kind} failed with HTTP error"
str = " " + str + "code: #{value.code}\n"
if value.body
# Try to extract error message
begin
str << "Body: " <<
OZonesJSON.parse_json(value.body,
"error")["message"]
rescue
str.gsub!("\nBody:","")
end
end
return Error.new(str)
end
end
value # If it is not an error, return it as-is
end
end
# Turns a OpenNebula template string into a JSON string
# @param [String] kind element kind
# @param [String] tmpl_str template
# @return [String, Zona::Error] JSON string or Error
def self.to_body(kind, tmpl_str)
tmpl = OpenNebula::Configuration.new(tmpl_str)
res = { "#{kind.upcase}" => tmpl.conf }
return OZonesJSON.to_json(res)
end
# @return [Boolean] Returns true if instance of {Zona::Error}
def self.is_error?(value)
value.class==Zona::Error
end
# @return [Boolean] Returns true if HTTP return code is not OK
def self.is_http_error?(value)
value.class != Net::HTTPOK
end
# The Error Class represents a generic error in the Zona
# library. It contains a readable representation of the error.
class Error
attr_reader :message
# @param [String] A description of the error
def initialize(message=nil)
@message=message
end
# @return [String] Error message description
def to_s()
@message
end
end
end

105
src/ozones/Client/lib/zona/OZonesElement.rb Normal file
View File

@ -0,0 +1,105 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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. #
#--------------------------------------------------------------------------- #
module Zona
# Standard abstraction of an OZones element. To be inherited.
class OZonesElement < JSONElement
protected
# Initializes an OZones Element instance. Tries to set @pe_id and @name
# @param [Hash] hash element description
# @param [Zona::Client] client OZones client
# @return [String] Element's name or nil
def initialize(hash, client)
@client = client
@json_hash = hash
@pe_id = self[:ID] ? self[:ID].to_i : nil
@name = self[:NAME] ? self[:NAME] : nil
end
# Retrieves details about an object and fills in
# the information hash
# @param [String] kind element kind: zone, vdc...
# @param [String] root_element root element of the JSON object description
# @return [Zona::Error] nil or Error
def info(kind, root_element)
return Error.new('ID not defined') if !@pe_id
rc = @client.get_resource(kind,@pe_id)
if !Zona.is_error?(rc)
initialize_json(rc.body,root_element)
rc = nil
@pe_id = self[:ID] ? self[:ID].to_i : nil
@name = self[:NAME] ? self[:NAME] : nil
end
rc
end
# Allocates a new element from a hash description
# @param [String] kind element kind: zone, vdc...
# @param [Hash] tmpl_hash element template hash
# @return [Zona::Error] nil or Error
def allocate_hash(kind, tmpl_hash)
allocate(kind, tmpl_hash.to_json)
end
# Allocates a new element from a JSON description
# @param [String] kind element kind: zone, vdc...
# @param [String] tmpl_json element JSON template
# @return [Zona::Error] nil or Error
def allocate(kind, tmpl_json)
rc = @client.post_resource(kind, tmpl_json)
if !Zona.is_error?(rc)
initialize_json(rc.body,kind.upcase)
@pe_id = self[:ID].to_i
rc = nil
end
rc
end
# Deletes current element
# @param [String] kind element kind: zone, vdc...
# @return [Zona::Error] nil or Error
def delete(kind)
return Error.new('ID not defined') if !@pe_id
rc = @client.delete_resource(kind,@pe_id)
return rc if Zona.is_error?(rc)
nil
end
public
attr_reader :pe_id, :name
# Creates a new element with the custom ID
# @param [#to_i] id element ID
# @param [Zona::Client] client OZones Client for this element
# @return [OZonesElement] A new element object
def self.new_with_id(id, client=nil)
self.new(self.build_json(id.to_i),client)
end
end
end

117
src/ozones/Client/lib/zona/OZonesJSON.rb Normal file
View File

@ -0,0 +1,117 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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. #
#--------------------------------------------------------------------------- #
module Zona
require 'json'
# Several class methods regarding the handling of JSON descriptions
# for the OZones utilities.
class OZonesJSON
# Build an element description hash.
# @param [String] json_str JSON description of the element
# @param [#to_sym] root_element root element of the JSON object
# @return [Hash,Zona::Error] The parsed JSON hash, or Error
def self.build_json(json_str, root_element)
begin
parser = JSON.parser.new(json_str, {:symbolize_names => true})
hash = parser.parse
root_sym = root_element.to_sym
if hash.has_key?(root_sym)
return hash[root_sym]
end
Error.new("Error parsing JSON:\ root element not present")
rescue => e
Error.new(e.message)
end
end
# @see build_json
def self.parse_json(json_str, root_element)
OZonesJSON.build_json(json_str, root_element)
end
# Generates a pretty JSON string from a hash
# @param [Hash] hash_to_convert a hash to be converted
# @return [String, Zona::Error] JSON string or Error if conversion fails
def self.to_json(hash_to_convert)
begin
JSON.pretty_generate(hash_to_convert)
rescue Exception => e
Error.new(e.message)
end
end
end
# This class represents an element described by a JSON string
# In practice, this is represented by a hash,
# result of parsing the JSON string.
class JSONElement
# Initializes an instance
# @param [Hash] json_hash a hash with the object description
def initialize(json_hash=nil)
@json_hash=json_hash
end
# Initializes an instance with a JSON description
# @param [String] json_str JSON description
# @param [#to_sym] root_element root element in the element description
def initialize_json(json_str, root_element)
rc = OZonesJSON.build_json(json_str,root_element)
@json_hash = rc
if Zona.is_error?(rc) || (rc.size == 0)
@json_hash=nil
end
end
# Accesses the value of a JSON element key
# @param [#to_sym] key
# @return [String] Value
def [](key)
@json_hash[key.to_sym]
end
end
# This class represents a collection of JSON Elements and it is itself one
class JSONPool < JSONElement
# Initializes an instance
# @param [Hash] json_hash a hash with the object description
def initialize(json_hash=nil)
super(json_hash)
end
# Allows to iterate through the elements of a JSONPool
# @param [Block] block a block to be called in each iteration
def each_element(block)
@json_hash[@element_name].each do |elem|
block.call self.factory(elem)
end
end
end
end

68
src/ozones/Client/lib/zona/OZonesPool.rb Normal file
View File

@ -0,0 +1,68 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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. #
#--------------------------------------------------------------------------- #
module Zona
# Standard pool abstraction. To be inherited.
class OZonesPool < JSONPool
protected
# Initializes a Pool instance
# @param [#to_sym] pool pool name tag
# @param [#to_sym] pool pool elements name tag
# @param [Zona::Client] client OZones Client
def initialize(pool,element,client)
super(nil)
@client = client
@pool_name = pool.to_sym
@element_name = element.to_sym
end
# Produces a new Pool element with the provided description
# @param [String] element_json JSON string of the element
# @return [String] Element's name or nil
def factory(element_json)
OZonesElement.new(element_json, @client)
end
# Retrieves the Pool information
# @param [String] kind pool kind: vdc, zone...
# @return [Zona:Error] nil or Error
def info(kind)
rc = @client.get_pool(kind)
if !Zona.is_error?(rc)
initialize_json(rc.body,@pool_name)
rc=nil
end
rc
end
public
# Allows iteration on pools elements
# @param [Block] block a block to call for each iteration
def each(&block)
each_element(block) if @json_hash
end
end
end

124
src/ozones/Client/lib/zona/VDCElement.rb Normal file
View File

@ -0,0 +1,124 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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. #
#--------------------------------------------------------------------------- #
module Zona
# This class describes a single VDC element. It can be used to
# allocate, delete, add hosts, remove hosts and retrieve full information
# for a VDC.
class VDC < OZonesElement
# String describing the kind of this resource
# Should become part of the requests to server: get /vdc/...
VDC_KIND = "vdc"
# Builds minimal JSON description for a VDC
# @param [Integer] pe_id VDC's ID
# @return [Hash,Zona::Error] Hash description of the object, or Error
def self.build_json(pe_id=nil)
if pe_id
json = "{\"VDC\":{\"ID\":#{pe_id}}}"
else
json = '{"VDC":{}}'
end
OZonesJSON.build_json(json,:VDC)
end
# Initializes a VDC object instance
# @param [Hash] hash VDC description
# @param [Zona::Client] client OZones Client
# @return [String] Element's name or nil
def initialize(hash, client)
super(hash, client)
end
# Retrieves details about this object and fills in
# the information hash
# @return [Zona::Error] nil or Error
def info
super(VDC_KIND,:VDC)
end
# Allocates a new element from a hash description
# @param [Hash] template element description
# @return [Zona::Error] nil or Error
def allocate_hash(template)
super(VDC_KIND,template)
end
# Allocates a new element from a JSON description
# @param [String] template element description
# @return [Zona::Error] nil or Error
def allocate(template)
super(VDC_KIND,template)
end
# Deletes current element
# @return [Zona::Error] nil or Error
def delete
super(VDC_KIND)
end
# Adds hosts to a VDC. The specified hosts are added to the VDC's
# current ones.
# @param [Array<#to_i>] hosts_array array of hosts IDs
# in the zone to be added
# @param [Hash] options a hash of options
# @option options [Boolean] :force allows hosts to add hosts
# which already belong to other VDCs
# @return [Zona::Error] nil or Error
def addhosts(hosts_array,options={})
return Error.new('VDC not info-ed') if !@json_hash
# array of hosts, integers
hosts = self[:HOSTS].split(',').collect!{|x| x.to_i}
hosts.concat(hosts_array).uniq!
new_hosts = hosts.join(',')
template = {:ID => @pe_id, :HOSTS => new_hosts}
template[:FORCE] = "YES" if options[:FORCE]
template = {:VDC => template}
rc = @client.put_resource(VDC_KIND,@pe_id,template.to_json)
return rc if Zona.is_error?(rc)
nil
end
# Delete hosts from a VDC. The specified hosts are removed from the VDC.
# @param [Array<#to_i>] hosts_array array of the VDC's hosts IDs
# to be removed. If a host is not in the VDC, then it is ignored.
# @return [Zona::Error] nil or Error
def delhosts(hosts_array)
return Error.new('VDC not info-ed') if !@json_hash
hosts = self[:HOSTS].split(',').collect!{|x| x.to_i}
new_hosts = (hosts - hosts_array).join(',')
template = {:VDC => {:ID => @pe_id, :HOSTS => new_hosts}}
rc = @client.put_resource(VDC_KIND,@pe_id,template.to_json)
return rc if Zona.is_error?(rc)
nil
end
alias :addhost :addhosts
alias :delhost :delhosts
end
end

46
src/ozones/Client/lib/zona/VDCPool.rb Normal file
View File

@ -0,0 +1,46 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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. #
#--------------------------------------------------------------------------- #
module Zona
# This class represents a set of VDCs. It allows to list the defined
# VDCs and iterate on them.
class VDCPool < OZonesPool
# String describing the kind of this resource
VDC_POOL_KIND="vdc"
# Initializes a VDC Pool instance
# @param [Zona::Client] client OZones Client
def initialize(client)
super(:VDC_POOL, :VDC, client)
end
# Produces a new VDC element with the provided description
# @param [String] element_json JSON string of the element
# @return [String] Element's name or nil
def factory(element_json)
VDC.new(element_json,@client)
end
# Retrieves the information for this pool
# @return [Zona:Error] nil or Error
def info
super(VDC_POOL_KIND)
end
end
end

74
src/ozones/Client/lib/zona/ZoneElement.rb Normal file
View File

@ -0,0 +1,74 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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. #
#--------------------------------------------------------------------------- #
module Zona
# This class describes a single OZones Zone element. It can be used to
# allocate, delete and retrieve full information for a Zone.
class Zone < OZonesElement
# String describing the kind of this resource
ZONE_KIND = "zone"
# Builds minimal JSON description for a Zone
# @param [#to_i] pe_id zone's ID
# @return [Hash,Zona::Error] Hash description of the object, or Error
def self.build_json(pe_id=nil)
if pe_id
json = "{\"ZONE\":{\"ID\":#{pe_id}}}"
else
json = '{"ZONE":{}}'
end
OZonesJSON.build_json(json,:ZONE)
end
# Initializes a Zone object instance
# @param [Hash] hash zone description
# @param [Zona::Client] client OZones Client
# @return [String] Element's name or nil
def initialize(hash, client)
super(hash, client)
end
# Retrieves details about this object and fills in
# the information hash
# @return [Zona::Error] nil or Error
def info
super(ZONE_KIND,:ZONE)
end
# Allocates a new element from a hash description
# @param [Hash] template element description
# @return [Zona::Error] nil or Error
def allocate_hash(template)
super(ZONE_KIND,template)
end
# Allocates a new element from a JSON description
# @param [String] template element description
# @return [Zona::Error] nil or Error
def allocate(template)
super(ZONE_KIND,template)
end
# Deletes current element
# @return [Zona::Error] nil or Error
def delete
super(ZONE_KIND)
end
end
end

46
src/ozones/Client/lib/zona/ZonePool.rb Normal file
View File

@ -0,0 +1,46 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2011, 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. #
#--------------------------------------------------------------------------- #
module Zona
# This class represents a set of Zones. It allows to list the defined
# Zones and iterate on them.
class ZonePool < OZonesPool
# String describing the kind of this resource
ZONE_POOL_KIND = "zone"
# Initializes a Zone Pool instance
# @param [Zona::Client] client OZones Client
def initialize(client)
super(:ZONE_POOL, :ZONE, client)
end
# Produces a new Zone element with the provided description
# @param [String] element_json JSON string of the element
# @return [String] Element's name or nil
def factory(element_json)
Zone.new(element_json,@client)
end
# Retrieves the information for this pool
# @return [Zona:Error] nil or Error
def info
super(ZONE_POOL_KIND)
end
end
end

2
src/ozones/Server/lib/OZones.rb
View File

@ -67,5 +67,3 @@ module OZones
return JSON.pretty_generate({:message => str}) return JSON.pretty_generate({:message => str})
end end
end end

4
src/ozones/Server/lib/OZones/AggregatedPool.rb
View File

@ -35,8 +35,8 @@ module OZones
zone_pool_hash = zone.to_hash["ZONE"] zone_pool_hash = zone.to_hash["ZONE"]
client = OpenNebula::Client.new( client = OpenNebula::Client.new(
zone.onename + ":" + zone.onepass, zone.ONENAME + ":" + zone.ONEPASS,
zone.endpoint, zone.ENDPOINT,
false) false)
pool = factory(client) pool = factory(client)

14
src/ozones/Server/lib/OZones/ApacheWritter.rb
View File

@ -26,13 +26,13 @@ module OZones
OZones::Zones.all.each{|zone| OZones::Zones.all.each{|zone|
zone.vdcs.all.each{|vdc| zone.vdcs.all.each{|vdc|
htaccess << "RewriteRule ^#{vdc.name} " + htaccess << "RewriteRule ^#{vdc.NAME} " +
"#{zone.endpoint} [P]\n" "#{zone.ENDPOINT} [P]\n"
if zone.sunsendpoint != nil if zone.SUNSENDPOINT != nil
htaccess << "RewriteRule ^sunstone_#{vdc.name}/(.+) " + htaccess << "RewriteRule ^sunstone_#{vdc.NAME}/(.+) " +
"#{zone.sunsendpoint}/$1 [P]\n" "#{zone.SUNSENDPOINT}/$1 [P]\n"
htaccess << "RewriteRule ^sunstone_#{vdc.name} " + htaccess << "RewriteRule ^sunstone_#{vdc.NAME} " +
"#{zone.sunsendpoint}/ [P]\n" "#{zone.SUNSENDPOINT}/ [P]\n"
end end
} }
} }

89
src/ozones/Server/lib/OZones/VDC.rb
View File

@ -21,13 +21,13 @@ module OZones
include OpenNebulaJSON::JSONUtils include OpenNebulaJSON::JSONUtils
extend OpenNebulaJSON::JSONUtils extend OpenNebulaJSON::JSONUtils
property :id, Serial property :ID, Serial
property :name, String, :required => true, :unique => true property :NAME, String, :required => true, :unique => true
property :group_id, Integer property :GROUP_ID, Integer
property :vdcadminname, String, :required => true property :VDCADMINNAME, String, :required => true
property :vdcadmin_id, Integer property :VDCADMIN_ID, Integer
property :acls, String property :ACLS, String
property :hosts, String property :HOSTS, String
belongs_to :zones belongs_to :zones
@ -36,14 +36,27 @@ module OZones
zonePoolHash["VDC_POOL"] = Hash.new zonePoolHash["VDC_POOL"] = Hash.new
zonePoolHash["VDC_POOL"]["VDC"] = Array.new unless self.all.empty? zonePoolHash["VDC_POOL"]["VDC"] = Array.new unless self.all.empty?
self.all.each{|vdc| self.all.each{|vdc|
zonePoolHash["VDC_POOL"]["VDC"] << vdc.attributes # Hack! zones_ID does not respect the
# "all capital letters" policy
attrs = vdc.attributes.clone
attrs[:ZONES_ID] = vdc.attributes[:zones_ID]
attrs.delete(:zones_ID)
zonePoolHash["VDC_POOL"]["VDC"] << attrs
} }
return zonePoolHash return zonePoolHash
end end
def to_hash def to_hash
vdc_attributes = Hash.new vdc_attributes = Hash.new
vdc_attributes["VDC"] = attributes
# Hack! zones_ID does not respect the
# "all capital letters" policy
attrs = attributes.clone
attrs[:ZONES_ID] = attributes[:zones_ID]
attrs.delete(:zones_ID)
vdc_attributes["VDC"] = attrs
return vdc_attributes return vdc_attributes
end end
end end
@ -57,7 +70,7 @@ module OZones
####################################################################### #######################################################################
# Constants # Constants
####################################################################### #######################################################################
VDC_ATTRS = [:vdcadminname, :vdcadminpass, :name, :hosts] VDC_ATTRS = [:VDCADMINNAME, :VDCADMINPASS, :NAME, :HOSTS]
attr_reader :vdc attr_reader :vdc
attr_reader :zone attr_reader :zone
@ -72,14 +85,14 @@ module OZones
raise "VDC with id #{vdcid} not found." raise "VDC with id #{vdcid} not found."
end end
@zone = OZones::Zones.get(@vdc.zones_id) @zone = OZones::Zones.get(@vdc.zones_ID)
else else
@zone = zone @zone = zone
end end
@client = OpenNebula::Client.new( @client = OpenNebula::Client.new(
"#{@zone.onename}:#{@zone.onepass}", "#{@zone.ONENAME}:#{@zone.ONEPASS}",
@zone.endpoint, @zone.ENDPOINT,
false) false)
end end
@ -102,24 +115,24 @@ module OZones
#Create a vdc record #Create a vdc record
@vdc = Vdc.new @vdc = Vdc.new
vdcpass = Digest::SHA1.hexdigest(vdc_data.delete(:vdcadminpass)) vdcpass = Digest::SHA1.hexdigest(vdc_data.delete(:VDCADMINPASS))
@vdc.attributes = vdc_data @vdc.attributes = vdc_data
# Create a group in the zone with the VDC name # Create a group in the zone with the VDC name
group = OpenNebula::Group.new(OpenNebula::Group.build_xml, @client) group = OpenNebula::Group.new(OpenNebula::Group.build_xml, @client)
rc = group.allocate(@vdc.name) rc = group.allocate(@vdc.NAME)
return rc if OpenNebula.is_error?(rc) return rc if OpenNebula.is_error?(rc)
@vdc.group_id = group.id @vdc.GROUP_ID = group.id
# Create the VDC admin user in the Zone # Create the VDC admin user in the Zone
user = OpenNebula::User.new(OpenNebula::User.build_xml, @client) user = OpenNebula::User.new(OpenNebula::User.build_xml, @client)
rc = user.allocate(@vdc.vdcadminname, vdcpass) rc = user.allocate(@vdc.VDCADMINNAME, vdcpass)
return rollback(group, nil, nil, rc) if OpenNebula.is_error?(rc) return rollback(group, nil, nil, rc) if OpenNebula.is_error?(rc)
@vdc.vdcadmin_id = user.id @vdc.VDCADMIN_ID = user.id
# Change primary group of the admin user to the VDC group # Change primary group of the admin user to the VDC group
rc = user.chgrp(group.id) rc = user.chgrp(group.id)
@ -132,7 +145,7 @@ module OZones
rc, acls_str = create_acls(rules) rc, acls_str = create_acls(rules)
return rollback(group, user,acls_str,rc) if OpenNebula.is_error?(rc) return rollback(group, user,acls_str,rc) if OpenNebula.is_error?(rc)
@vdc.acls = acls_str @vdc.ACLS = acls_str
return true return true
end end
@ -150,13 +163,13 @@ module OZones
up.info up.info
up.each{|user| up.each{|user|
if user['GID'].to_i == @vdc.group_id if user['GID'].to_i == @vdc.GROUP_ID
user.delete user.delete
end end
} }
# Delete the group # Delete the group
OpenNebula::Group.new_with_id(@vdc.group_id, @client).delete OpenNebula::Group.new_with_id(@vdc.GROUP_ID, @client).delete
return @vdc.destroy return @vdc.destroy
end end
@ -165,18 +178,18 @@ module OZones
def clean_bootstrap def clean_bootstrap
delete_acls delete_acls
OpenNebula::User.new_with_id(@vdc.vdcadmin_id, @client).delete OpenNebula::User.new_with_id(@vdc.VDCADMIN_ID, @client).delete
OpenNebula::Group.new_with_id(@vdc.group_id, @client).delete OpenNebula::Group.new_with_id(@vdc.GROUP_ID, @client).delete
end end
def update(host_list) def update(host_list)
# Delete existing host ACLs # Delete existing host ACLs
delete_host_acls delete_host_acls
if @vdc.acls =~ /((\d+,){#{HOST_ACL_FIRST_ID}}).*/ if @vdc.ACLS =~ /((\d+,){#{HOST_ACL_FIRST_ID}}).*/
newacls = $1.chop newacls = $1.chop
else else
newacls = @vdc.acls.clone newacls = @vdc.ACLS.clone
end end
# Create new ACLs. TODO Rollback ACL creation # Create new ACLs. TODO Rollback ACL creation
@ -194,8 +207,8 @@ module OZones
#Update the VDC Record #Update the VDC Record
begin begin
@vdc.raise_on_save_failure = true @vdc.raise_on_save_failure = true
@vdc.hosts = host_list @vdc.HOSTS = host_list
@vdc.acls = newacls @vdc.ACLS = newacls
@vdc.save @vdc.save
rescue => e rescue => e
@ -218,12 +231,12 @@ module OZones
rule_str = Array.new rule_str = Array.new
# Grant permissions to the group # Grant permissions to the group
rule_str << "@#{@vdc.group_id} VM+NET+IMAGE+TEMPLATE/* " \ rule_str << "@#{@vdc.GROUP_ID} VM+NET+IMAGE+TEMPLATE/* " \
"CREATE+INFO_POOL_MINE" "CREATE+INFO_POOL_MINE"
# Grant permissions to the vdc admin # Grant permissions to the vdc admin
rule_str << "##{@vdc.vdcadmin_id} USER/* CREATE" rule_str << "##{@vdc.VDCADMIN_ID} USER/* CREATE"
rule_str << "##{@vdc.vdcadmin_id} USER/@#{@vdc.group_id} " \ rule_str << "##{@vdc.VDCADMIN_ID} USER/@#{@vdc.GROUP_ID} " \
"MANAGE+DELETE+INFO" "MANAGE+DELETE+INFO"
############################################################### ###############################################################
@ -238,12 +251,12 @@ module OZones
rule_str = Array.new rule_str = Array.new
if host_list == nil if host_list == nil
host_list = @vdc.hosts host_list = @vdc.HOSTS
end end
# Grant permissions to use the vdc hosts # Grant permissions to use the vdc hosts
host_list.split(',').each{|hostid| host_list.split(',').each{|hostid|
rule_str << "@#{@vdc.group_id} HOST/##{hostid} USE" rule_str << "@#{@vdc.GROUP_ID} HOST/##{hostid} USE"
} }
return rule_str return rule_str
@ -254,7 +267,7 @@ module OZones
####################################################################### #######################################################################
# Deletes ACLs for the hosts # Deletes ACLs for the hosts
def delete_host_acls def delete_host_acls
host_acls = @vdc.acls.split(',')[HOST_ACL_FIRST_ID..-1] host_acls = @vdc.ACLS.split(',')[HOST_ACL_FIRST_ID..-1]
if host_acls if host_acls
host_acls.each{|acl| host_acls.each{|acl|
@ -265,7 +278,7 @@ module OZones
# Delete ACLs # Delete ACLs
def delete_acls def delete_acls
@vdc.acls.split(",").each{|acl| @vdc.ACLS.split(",").each{|acl|
OpenNebula::Acl.new_with_id(acl.to_i, @client).delete OpenNebula::Acl.new_with_id(acl.to_i, @client).delete
} }
end end
@ -276,7 +289,7 @@ module OZones
ip.info ip.info
ip.each{|image| ip.each{|image|
image.delete if image['GID'].to_i == @vdc.group_id image.delete if image['GID'].to_i == @vdc.GROUP_ID
} }
end end
@ -286,7 +299,7 @@ module OZones
tp.info tp.info
tp.each{|template| tp.each{|template|
template.delete if template['GID'].to_i == @vdc.group_id template.delete if template['GID'].to_i == @vdc.GROUP_ID
} }
end end
@ -296,7 +309,7 @@ module OZones
vmp.info vmp.info
vmp.each{|vm| vmp.each{|vm|
vm.delete if vm['GID'].to_i == @vdc.group_id vm.delete if vm['GID'].to_i == @vdc.GROUP_ID
} }
end end
@ -306,7 +319,7 @@ module OZones
vnp.info vnp.info
vnp.each{|vn| vnp.each{|vn|
vnp.delete if vn['GID'].to_i == @vdc.group_id vnp.delete if vn['GID'].to_i == @vdc.GROUP_ID
} }
end end

42
src/ozones/Server/lib/OZones/Zones.rb
View File

@ -24,19 +24,19 @@ module OZones
####################################################################### #######################################################################
# Data Model for the Zone # Data Model for the Zone
####################################################################### #######################################################################
property :id, Serial property :ID, Serial
property :name, String, :required => true, :unique => true property :NAME, String, :required => true, :unique => true
property :onename, String, :required => true property :ONENAME, String, :required => true
property :onepass, String, :required => true property :ONEPASS, String, :required => true
property :endpoint, String, :required => true property :ENDPOINT, String, :required => true
property :sunsendpoint, String property :SUNSENDPOINT, String
has n, :vdcs has n, :vdcs
####################################################################### #######################################################################
# Constants # Constants
####################################################################### #######################################################################
ZONE_ATTRS = [:onename, :onepass, :endpoint, :name] ZONE_ATTRS = [:ONENAME, :ONEPASS, :ENDPOINT, :NAME]
####################################################################### #######################################################################
# JSON Functions # JSON Functions
@ -48,7 +48,7 @@ module OZones
self.all.each{|zone| self.all.each{|zone|
zonePoolHash["ZONE_POOL"]["ZONE"] << zonePoolHash["ZONE_POOL"]["ZONE"] <<
zone.attributes.merge({:numbervdcs => zone.vdcs.all.size}) zone.attributes.merge({:NUMBERVDCS => zone.vdcs.all.size})
} }
return zonePoolHash return zonePoolHash
@ -57,10 +57,10 @@ module OZones
def to_hash def to_hash
zone_attributes = Hash.new zone_attributes = Hash.new
zone_attributes["ZONE"] = attributes zone_attributes["ZONE"] = attributes
zone_attributes["ZONE"][:vdcs] = Array.new zone_attributes["ZONE"][:VDCS] = Array.new
self.vdcs.all.each{|vdc| self.vdcs.all.each{|vdc|
zone_attributes["ZONE"][:vdcs]<<vdc.attributes zone_attributes["ZONE"][:VDCS]<< vdc.attributes
} }
return zone_attributes return zone_attributes
@ -69,12 +69,7 @@ module OZones
####################################################################### #######################################################################
# Zone Data Management # Zone Data Management
####################################################################### #######################################################################
def self.create(data) def self.create(zone_data)
zone_data = Hash.new
data.each{|key,value|
zone_data[key.downcase.to_sym] = value
}
ZONE_ATTRS.each { |param| ZONE_ATTRS.each { |param|
if !zone_data[param] if !zone_data[param]
@ -84,17 +79,20 @@ module OZones
} }
# Digest and check credentials # Digest and check credentials
zone_data[:onepass] = Digest::SHA1.hexdigest(zone_data[:onepass]) zone_data[:ONEPASS] = Digest::SHA1.hexdigest(zone_data[:ONEPASS])
rc = OpenNebulaZone::check_oneadmin(zone_data[:onename], $stderr.puts zone_data
zone_data[:onepass],
zone_data[:endpoint]) rc = OpenNebulaZone::check_oneadmin(zone_data[:ONENAME],
zone_data[:ONEPASS],
zone_data[:ENDPOINT])
if OpenNebula.is_error?(rc) if OpenNebula.is_error?(rc)
return OZones::Error.new("Error: Couldn't create zone. "\ return OZones::Error.new("Error: Couldn't create zone. "\
"Reason: #{rc.message}") "Reason: #{rc.message}")
end end
# Create the zone # Create the zone
begin begin
zone = Zones.new zone = Zones.new
@ -124,8 +122,8 @@ module OZones
end end
@client = OpenNebula::Client.new( @client = OpenNebula::Client.new(
"#{@zone.onename}:#{@zone.onepass}", "#{@zone.ONENAME}:#{@zone.ONEPASS}",
@zone.endpoint, @zone.ENDPOINT,
false) false)
end end

51
src/ozones/Server/models/OzonesServer.rb
View File

@ -77,25 +77,20 @@ class OzonesServer
############################################################################ ############################################################################
def create_vdc (body,pr) def create_vdc (body,pr)
#Setup POST data #Setup POST data
data = parse_json(body,"vdc") vdc_data = parse_json_sym(body,:VDC)
if OpenNebula.is_error?(data) if OpenNebula.is_error?(vdc_data)
return [400, OZones::Error.new("Error: Couldn't update vdc. " \ return [400, OZones::Error.new("Error: Couldn't update vdc. " \
"Reason: #{data.message}.").to_json] "Reason: #{data.message}.").to_json]
end end
vdc_data = Hash.new
data.each{|key,value|
vdc_data[key.downcase.to_sym] = value
}
#Get the Zone that will host the VDC. And check resouces #Get the Zone that will host the VDC. And check resouces
zoneid = vdc_data.delete(:zoneid) zoneid = vdc_data.delete(:ZONEID)
force = vdc_data.delete(:force) force = vdc_data.delete(:FORCE)
if !zoneid if !zoneid
return [400, OZones::Error.new("Error: Couldn't create vdc. " \ return [400,
OZones::Error.new("Error: Couldn't create vdc. " \
"Mandatory attribute zoneid missing.").to_json] "Mandatory attribute zoneid missing.").to_json]
end end
@ -106,9 +101,10 @@ class OzonesServer
end end
if (!force or force.upcase!="YES") and if (!force or force.upcase!="YES") and
!host_uniqueness?(zone, vdc_data[:hosts]) !host_uniqueness?(zone, vdc_data[:HOSTS])
return [403, OZones::Error.new("Error: Couldn't create vdc. " \ return [403,
OZones::Error.new("Error: Couldn't create vdc. " \
"Hosts are not unique, use force to override").to_json] "Hosts are not unique, use force to override").to_json]
end end
@ -130,7 +126,8 @@ class OzonesServer
rescue => e rescue => e
vdc.clean_bootstrap vdc.clean_bootstrap
return [400, OZones::Error.new("Error: Couldn't create " \ return [400,
OZones::Error.new("Error: Couldn't create " \
"vdc. Zone could not be saved: #{e.message}").to_json] "vdc. Zone could not be saved: #{e.message}").to_json]
end end
@ -140,7 +137,7 @@ class OzonesServer
def create_zone(body, pr) def create_zone(body, pr)
#Setup POST data #Setup POST data
data = parse_json(body,"zone") data = parse_json_sym(body,:ZONE)
if OpenNebula.is_error?(data) if OpenNebula.is_error?(data)
return [400, OZones::Error.new("Error: Couldn't update vdc. " \ return [400, OZones::Error.new("Error: Couldn't update vdc. " \
@ -162,21 +159,15 @@ class OzonesServer
############################################################################ ############################################################################
def update_vdc(vdc_id, body) def update_vdc(vdc_id, body)
#Setup PUT data #Setup PUT data
data = parse_json(body,"vdc") vdc_data = parse_json_sym(body,:VDC)
if OpenNebula.is_error?(data) if OpenNebula.is_error?(vdc_data)
return [400, OZones::Error.new("Error: Couldn't update vdc. " \ return [400, OZones::Error.new("Error: Couldn't update vdc. " \
"Reason: #{data.message}.").to_json] "Reason: #{data.message}.").to_json]
end end
vdc_data = Hash.new hosts = vdc_data.delete(:HOSTS)
force = vdc_data.delete(:FORCE)
data.each{|key,value|
vdc_data[key.downcase.to_sym]=value
}
hosts = vdc_data.delete(:hosts)
force = vdc_data.delete(:force)
# Check parameters # Check parameters
if !hosts if !hosts
@ -195,7 +186,8 @@ class OzonesServer
if (!force or force.upcase != "YES") and if (!force or force.upcase != "YES") and
!host_uniqueness?(vdc.zone, hosts, vdc_id.to_i) !host_uniqueness?(vdc.zone, hosts, vdc_id.to_i)
return [403, OZones::Error.new("Error: Couldn't update vdc. " \ return [403,
OZones::Error.new("Error: Couldn't update vdc. " \
"Hosts are not unique, use force to override").to_json] "Hosts are not unique, use force to override").to_json]
end end
@ -236,7 +228,8 @@ class OzonesServer
if zone if zone
rc = zone.destroy rc = zone.destroy
else else
return [404, OZones::Error.new("Error: Can not delete " \ return [404,
OZones::Error.new("Error: Can not delete " \
"zone. Reason: zone #{id} not found").to_json] "zone. Reason: zone #{id} not found").to_json]
end end
@ -260,8 +253,8 @@ class OzonesServer
all_hosts = "" all_hosts = ""
zone.vdcs.all.each{|vdc| zone.vdcs.all.each{|vdc|
if vdc.hosts != nil and !vdc.hosts.empty? and vdc.id != vdc_id if vdc.HOSTS != nil and !vdc.HOSTS.empty? and vdc.id != vdc_id
all_hosts << ',' << vdc.hosts all_hosts << ',' << vdc.HOSTS
end end
} }

2
src/ozones/Server/ozones-server.rb
View File

@ -281,5 +281,3 @@ end
delete '/zone/:id' do delete '/zone/:id' do
@OzonesServer.delete_zone(params[:id], @pr) @OzonesServer.delete_zone(params[:id], @pr)
end end

12
src/ozones/Server/public/js/plugins/aggregated-tab.js
View File

@ -416,7 +416,7 @@ function hostsListCB(req,list){
return; return;
}; };
var host_json = oZones.Helper.pool("HOST",this.ZONE); var host_json = oZones.Helper.pool("HOST",this.ZONE);
updateHostsList(req, host_json,'#datatable_agg_hosts',this.ZONE.id,this.ZONE.name); updateHostsList(req, host_json,'#datatable_agg_hosts',this.ZONE.ID,this.ZONE.NAME);
updateZonesDashboard("hosts",host_json); updateZonesDashboard("hosts",host_json);
}); });
} }
@ -429,7 +429,7 @@ function vmsListCB(req,list){
return; return;
}; };
var vms_json = oZones.Helper.pool("VM",this.ZONE); var vms_json = oZones.Helper.pool("VM",this.ZONE);
updateVMsList(req, vms_json,'#datatable_agg_vms',this.ZONE.id,this.ZONE.name); updateVMsList(req, vms_json,'#datatable_agg_vms',this.ZONE.ID,this.ZONE.NAME);
updateZonesDashboard("vms",vms_json); updateZonesDashboard("vms",vms_json);
}); });
} }
@ -442,7 +442,7 @@ function vnsListCB(req,list){
return; return;
}; };
var vn_json = oZones.Helper.pool("VNET",this.ZONE); var vn_json = oZones.Helper.pool("VNET",this.ZONE);
updateVNsList(req, vn_json,'#datatable_agg_vnets',this.ZONE.id,this.ZONE.name); updateVNsList(req, vn_json,'#datatable_agg_vnets',this.ZONE.ID,this.ZONE.NAME);
updateZonesDashboard("vnets",vn_json); updateZonesDashboard("vnets",vn_json);
}); });
} }
@ -455,7 +455,7 @@ function imagesListCB(req,list){
return; return;
}; };
var image_json = oZones.Helper.pool("IMAGE",this.ZONE); var image_json = oZones.Helper.pool("IMAGE",this.ZONE);
updateImagesList(req,image_json,'#datatable_agg_images',this.ZONE.id,this.ZONE.name); updateImagesList(req,image_json,'#datatable_agg_images',this.ZONE.ID,this.ZONE.NAME);
updateZonesDashboard("images",image_json); updateZonesDashboard("images",image_json);
}); });
} }
@ -468,7 +468,7 @@ function usersListCB(req,list){
return; return;
}; };
var user_json = oZones.Helper.pool("USER",this.ZONE); var user_json = oZones.Helper.pool("USER",this.ZONE);
updateUsersList(req,user_json,'#datatable_agg_users',this.ZONE.id,this.ZONE.name); updateUsersList(req,user_json,'#datatable_agg_users',this.ZONE.ID,this.ZONE.NAME);
updateZonesDashboard("users",user_json); updateZonesDashboard("users",user_json);
}); });
} }
@ -481,7 +481,7 @@ function templatesListCB(req,list){
return; return;
}; };
var template_json = oZones.Helper.pool("VMTEMPLATE",this.ZONE); var template_json = oZones.Helper.pool("VMTEMPLATE",this.ZONE);
updateTemplatesList(req,template_json,'#datatable_agg_templates',this.ZONE.id,this.ZONE.name); updateTemplatesList(req,template_json,'#datatable_agg_templates',this.ZONE.ID,this.ZONE.NAME);
updateZonesDashboard("templates",template_json); updateZonesDashboard("templates",template_json);
}); });
} }

52
src/ozones/Server/public/js/plugins/vdcs-tab.js
View File

@ -224,11 +224,11 @@ function vdcElementArray(vdc_json){
var vdc = vdc_json.VDC; var vdc = vdc_json.VDC;
return [ return [
'<input type="checkbox" id="vdc_'+vdc.id+'" name="selected_items" value="'+vdc.id+'"/>', '<input type="checkbox" id="vdc_'+vdc.ID+'" name="selected_items" value="'+vdc.ID+'"/>',
vdc.id, vdc.ID,
vdc.name, vdc.NAME,
vdc.zones_id, vdc.ZONES_ID,
vdc.hosts ? vdc.hosts : "none" vdc.HOSTS ? vdc.HOSTS : "none"
]; ];
} }
@ -253,7 +253,7 @@ function addVDCElement(req,vdc_json){
} }
function updateVDCElement(request, vdc_json){ function updateVDCElement(request, vdc_json){
var id = vdc_json.VDC.id; var id = vdc_json.VDC.ID;
var element = vdcElementArray(vdc_json); var element = vdcElementArray(vdc_json);
updateSingleElement(element,dataTable_vdcs,'#vdc_'+id); updateSingleElement(element,dataTable_vdcs,'#vdc_'+id);
} }
@ -276,36 +276,36 @@ function updateVDCInfo(req,vdc_json){
content : content :
'<table id="info_vdc_table" class="info_table">\ '<table id="info_vdc_table" class="info_table">\
<thead>\ <thead>\
<tr><th colspan="2">Virtual Data Center - '+vdc.name+'</th></tr>\ <tr><th colspan="2">Virtual Data Center - '+vdc.NAME+'</th></tr>\
</thead>\ </thead>\
<tbody>\ <tbody>\
<tr>\ <tr>\
<td class="key_td">ID</td>\ <td class="key_td">ID</td>\
<td class="value_td">'+vdc.id+'</td>\ <td class="value_td">'+vdc.ID+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">Name</td>\ <td class="key_td">Name</td>\
<td class="value_td">'+vdc.name+'</td>\ <td class="value_td">'+vdc.NAME+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">Zone ID</td>\ <td class="key_td">Zone ID</td>\
<td class="value_td">'+vdc.zones_id+'</td>\ <td class="value_td">'+vdc.ZONES_ID+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">Hosts</td>\ <td class="key_td">Hosts</td>\
<td class="value_td">'+(vdc.hosts? vdc.hosts : "none")+'</td>\ <td class="value_td">'+(vdc.HOSTS? vdc.HOSTS : "none")+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">Admin name</td>\ <td class="key_td">Admin name</td>\
<td class="value_td">'+vdc.vdcadminname+'</td>\ <td class="value_td">'+vdc.VDCADMINNAME+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">Group ID</td>\ <td class="key_td">Group ID</td>\
<td class="value_td">'+vdc.group_id+'</td>\ <td class="value_td">'+vdc.GROUP_ID+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">ACLs</td>\ <td class="key_td">ACLs</td>\
<td class="value_td">'+vdc.acls+'</td>\ <td class="value_td">'+vdc.ACLS+'</td>\
</tr>\ </tr>\
</tbody>\ </tbody>\
</table>' </table>'
@ -461,16 +461,16 @@ function setupCreateVDCDialog(){
}; };
var vdc_json = { var vdc_json = {
"vdc" : { "VDC" : {
"name" : name, "NAME" : name,
"zoneid" : zoneid, "ZONEID" : zoneid,
"vdcadminname" : vdcadminname, "VDCADMINNAME" : vdcadminname,
"vdcadminpass" : vdcadminpass, "VDCADMINPASS" : vdcadminpass,
"force" : force "FORCE" : force
} }
}; };
if (hosts.length){ if (hosts.length){
vdc_json["vdc"]["hosts"]=hosts; vdc_json["VDC"]["HOSTS"]=hosts;
}; };
Sunstone.runAction("VDC.create",vdc_json); Sunstone.runAction("VDC.create",vdc_json);
@ -549,15 +549,15 @@ function setupUpdateVDCDialog(){
}; };
var vdc_json = { var vdc_json = {
"vdc" : { "VDC" : {
"id": id, "ID": id,
"force": force, "FORCE": force,
"hosts": hosts "HOSTS": ""
} }
}; };
if (hosts.length){ if (hosts.length){
vdc_json["vdc"]["hosts"]=hosts; vdc_json["VDC"]["HOSTS"]=hosts;
}; };
Sunstone.runAction("VDC.update",id,vdc_json); Sunstone.runAction("VDC.update",id,vdc_json);
dialog.dialog('close'); dialog.dialog('close');

46
src/ozones/Server/public/js/plugins/zones-tab.js
View File

@ -228,10 +228,10 @@ function zoneElementArray(zone_json){
var zone = zone_json.ZONE; var zone = zone_json.ZONE;
return [ return [
'<input type="checkbox" id="zone_'+zone.id+'" name="selected_items" value="'+zone.id+'"/>', '<input type="checkbox" id="zone_'+zone.ID+'" name="selected_items" value="'+zone.ID+'"/>',
zone.id, zone.ID,
zone.name, zone.NAME,
zone.endpoint zone.ENDPOINT
]; ];
} }
@ -281,32 +281,32 @@ function updateZoneInfo(req,zone_json){
content : content :
'<table id="info_zone_table" class="info_table">\ '<table id="info_zone_table" class="info_table">\
<thead>\ <thead>\
<tr><th colspan="2">Zone information - '+zone.name+'</th></tr>\ <tr><th colspan="2">Zone information - '+zone.NAME+'</th></tr>\
</thead>\ </thead>\
<tbody>\ <tbody>\
<tr>\ <tr>\
<td class="key_td">ID</td>\ <td class="key_td">ID</td>\
<td class="value_td">'+zone.id+'</td>\ <td class="value_td">'+zone.ID+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">Administrator</td>\ <td class="key_td">Administrator</td>\
<td class="value_td">'+zone.onename+'</td>\ <td class="value_td">'+zone.ONENAME+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">Password</td>\ <td class="key_td">Password</td>\
<td class="value_td">'+zone.onepass+'</td>\ <td class="value_td">'+zone.ONEPASS+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">Endpoint</td>\ <td class="key_td">Endpoint</td>\
<td class="value_td">'+zone.endpoint+'</td>\ <td class="value_td">'+zone.ENDPOINT+'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">Sunstone endpoint</td>\ <td class="key_td">Sunstone endpoint</td>\
<td class="value_td"><a href="'+zone.sunsendpoint+'" target="_blank">'+zone.sunsendpoint+'<span class="ui-icon ui-icon-extlink" style="display:inline-block;" /></a></td>\ <td class="value_td">'+ (zone.SUNSENDPOINT.length? '<a href="'+zone.SUNSENDPOINT+'" target="_blank">'+zone.SUNSENDPOINT+'<span class="ui-icon ui-icon-extlink" style="display:inline-block;" /></a>' : "") +'</td>\
</tr>\ </tr>\
<tr>\ <tr>\
<td class="key_td">#VDCs</td>\ <td class="key_td">#VDCs</td>\
<td class="value_td">'+zone.vdcs.length+'</td>\ <td class="value_td">'+zone.VDCS.length+'</td>\
</tr>\ </tr>\
</tbody>\ </tbody>\
</table>' </table>'
@ -524,12 +524,12 @@ function updateZoneInfo(req,zone_json){
/*End init dataTables*/ /*End init dataTables*/
//Retrieve pools in the meantime //Retrieve pools in the meantime
Sunstone.runAction("Zone.host",zone.id); Sunstone.runAction("Zone.host",zone.ID);
Sunstone.runAction("Zone.vmtemplate",zone.id); Sunstone.runAction("Zone.vmtemplate",zone.ID);
Sunstone.runAction("Zone.vms",zone.id); Sunstone.runAction("Zone.vms",zone.ID);
Sunstone.runAction("Zone.vnet",zone.id); Sunstone.runAction("Zone.vnet",zone.ID);
Sunstone.runAction("Zone.image",zone.id); Sunstone.runAction("Zone.image",zone.ID);
Sunstone.runAction("Zone.user",zone.id); Sunstone.runAction("Zone.user",zone.ID);
} }
@ -559,12 +559,12 @@ function setupCreateZoneDialog(){
} }
var zone_json = { var zone_json = {
"zone": { "ZONE": {
"name": name, "NAME": name,
"endpoint": endpoint, "ENDPOINT": endpoint,
"onename": onename, "ONENAME": onename,
"onepass": onepass, "ONEPASS": onepass,
"sunsendpoint" : sunsendpoint "SUNSENDPOINT" : sunsendpoint
} }
}; };

16
src/sunstone/models/OpenNebulaJSON/JSONUtils.rb
View File

@ -41,6 +41,22 @@ module OpenNebulaJSON
end end
end end
def parse_json_sym(json_str, root_element)
begin
parser = JSON.parser.new(json_str, {:symbolize_names => true})
hash = parser.parse
if hash.has_key?(root_element)
return hash[root_element]
end
Error.new("Error parsing JSON:\ root element not present")
rescue => e
Error.new(e.message)
end
end
def template_to_str(attributes, indent=true) def template_to_str(attributes, indent=true)
if indent if indent
ind_enter="\n" ind_enter="\n"