shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hector Sanjuan 2012-05-08 11:49:51 +02:00
commit 1edbc67c35
23 changed files with 327 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/etc/init.d/one.debian
View File

@ -64,6 +64,9 @@ case "$1" in
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
status)
status_of_proc "oned" "$NAME" && exit 0 || exit $?
;;
restart|force-reload)
#
# If the "reload" option is implemented then remove the
@ -87,7 +90,7 @@ case "$1" in
esac
;;
*)
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
exit 3
;;
esac

5
share/etc/init.d/one.ubuntu
View File

@ -64,6 +64,9 @@ case "$1" in
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
status)
status_of_proc "oned" "$NAME" && exit 0 || exit $?
;;
restart|force-reload)
#
# If the "reload" option is implemented then remove the
@ -87,7 +90,7 @@ case "$1" in
esac
;;
*)
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
exit 3
;;
esac

42
share/install_gems/install_gems
View File

@ -92,6 +92,45 @@ def good_gem_version?
version>=Gem::Version.new('1.3.6')
end
def select_distribution
items=[]
counter=0
puts(<<-EOT.unindent(8))
Select your distribution or press enter to continue without
installing dependencies.
EOT
DISTRIBUTIONS.each do |name, dist|
names=dist[:id].map do |r|
if Regexp===r
r.source.gsub(/[^\w\d]/, '')
else
r
end
end.join('/')
text="#{items.length}. #{names}"
items << name
puts text
end
puts
options=(0..items.length).to_a.map {|k| k.to_s }
option=STDIN.readline[0,1]
if options.include?(option)
item=items[option.to_i]
[item, DISTRIBUTIONS[items[option.to_i]]]
else
nil
end
end
def install_rubygems
if !good_gem_version?
puts(<<-EOT.unindent())
@ -288,6 +327,9 @@ def install_gems(packages)
end
dist=detect_distro
if !dist
dist=select_distribution
end
install_dependencies(gems_list, dist)

3
src/dm/DispatchManagerActions.cc
View File

@ -602,9 +602,6 @@ int DispatchManager::resched(int vid, bool do_resched)
if (vm->get_state() == VirtualMachine::ACTIVE &&
vm->get_lcm_state() == VirtualMachine::RUNNING )
{
Nebula& nd = Nebula::instance();
LifeCycleManager * lcm = nd.get_lcm();
vm->set_resched(do_resched);
vmpool->update(vm);
}

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

@ -157,9 +157,9 @@ class VDCHelper < OZonesHelper::OZHelper
puts str % ["CLUSTER_ID ", vdc[:CLUSTER_ID].to_s]
puts str % ["GROUP_ID ", vdc[:GROUP_ID].to_s]
puts str % ["VDCADMIN ", vdc[:VDCADMINNAME].to_s]
puts str % ["HOSTS ", vdc[:RESOURCES][:HOSTS].to_s]
puts str % ["DATASTORES ", vdc[:RESOURCES][:DATASTORES].to_s]
puts str % ["NETWORKS ", vdc[:RESOURCES][:NETWORKS].to_s]
puts str % ["HOSTS ", vdc[:RESOURCES][:HOSTS].join(',')]
puts str % ["DATASTORES ", vdc[:RESOURCES][:DATASTORES].join(',')]
puts str % ["NETWORKS ", vdc[:RESOURCES][:NETWORKS].join(',')]
puts
return 0

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

@ -44,6 +44,8 @@ class ZonesHelper < OZonesHelper::OZHelper
puts str % ["ZONE ADMIN ",zone[:ONENAME].to_s]
puts str % ["ZONE PASS ", zone[:ONEPASS].to_s]
puts str % ["ENDPOINT ", zone[:ENDPOINT].to_s]
puts str % ["SUNSENDPOINT ", zone[:SUNSENDPOINT].to_s]
puts str % ["SELFENDPOINT ", zone[:SELFENDPOINT].to_s]
puts str % ["# VDCS ", zone[:VDCS].size.to_s]
puts

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

@ -34,26 +34,24 @@ module OZones
zone_pool_hash = zone.to_hash["ZONE"]
client = OpenNebula::Client.new("#{zone.ONENAME}:#{zone.ONEPASS}",
zone.ENDPOINT)
client = OpenNebula::Client.new("#{zone.ONENAME}:#{zone.ONEPASS}",
zone.ENDPOINT)
pool = factory(client)
if OpenNebula.is_error?(pool)
zone_pool_hash.merge!(pool.to_hash)
next
end
rc = pool.info
if !rc
zone_pool_hash.merge!(pool.to_hash)
elsif OpenNebula.is_error?(rc)
error = "Error communicating with #{zone.NAME}."
error << " Retrieving #{self.class.name.split('::').last}: "
error << "#{rc.to_str}"
zone_pool_hash.merge!({:error => {:message => error}})
else
zone_pool_hash.merge!(rc.to_hash)
end
@sup_aggregated_pool[@tag]["ZONE"] << zone_pool_hash
}
end

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

@ -24,8 +24,8 @@ module OZones
def update
htaccess = "RewriteEngine On\n"
OZones::Zones.all.each{|zone|
zone.vdcs.all.each{|vdc|
OZones::Zones.each{|zone|
zone.vdcs.each{|vdc|
htaccess << "RewriteRule ^#{vdc.NAME} " +
"#{zone.ENDPOINT} [P]\n"

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

@ -22,28 +22,42 @@ module OZones
# ID, NAME, the GROUP backing the VDC, the admin credentials and the VDC
# resources. VDC resources are stored in JSON document in the DB and used as
# a hash in the VDC.
class Vdc
include DataMapper::Resource
class Vdc < Sequel::Model
include OpenNebulaJSON::JSONUtils
extend OpenNebulaJSON::JSONUtils
property :ID, Serial
property :NAME, String, :required => true, :unique => true
property :GROUP_ID, Integer
property :VDCADMINNAME, String, :required => true
property :VDCADMIN_ID, Integer
property :CLUSTER_ID, Integer
property :RESOURCES, Text
plugin :schema
plugin :validation_helpers
belongs_to :zones
set_schema do
primary_key :ID
String :NAME, :unique => true
Integer :GROUP_ID
foreign_key :ZONES_ID, :zones, :key => :ID
String :VDCADMINNAME
Integer :VDCADMIN_ID
Integer :CLUSTER_ID
String :RESOURCES, :text => true
end
create_table unless table_exists?
many_to_one :zone, :class => 'OZones::Zones', :key => :ZONES_ID
def validate
super
validates_presence [:NAME, :VDCADMINNAME]
validates_unique :NAME
end
def resources
rsrc_json = self.RESOURCES
parser = JSON.parser.new(rsrc_json, {:symbolize_names => true})
parser.parse
end
end
def resources=(rsrc_hash)
self.RESOURCES = JSON.generate(rsrc_hash)
end
@ -55,11 +69,7 @@ module OZones
zonePoolHash["VDC_POOL"]["VDC"] = Array.new unless self.all.empty?
self.all.each{ |vdc|
# 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)
attrs = vdc.values.clone
rsrc_json = attrs.delete(:RESOURCES)
parser = JSON.parser.new(rsrc_json, {:symbolize_names=>true})
@ -74,11 +84,7 @@ module OZones
def to_hash
vdc_attributes = Hash.new
# Hack! zones_ID does not respect the "all capital letters" policy
attrs = attributes.clone
attrs[:ZONES_ID] = attributes[:zones_ID]
attrs.delete(:zones_ID)
attrs = @values.clone
rsrc_json = attrs.delete(:RESOURCES)
parser = JSON.parser.new(rsrc_json, {:symbolize_names=>true})
@ -99,9 +105,9 @@ module OZones
#######################################################################
# Constants
#######################################################################
VDC_ATTRS = [:VDCADMINNAME,
:VDCADMINPASS,
:NAME,
VDC_ATTRS = [:VDCADMINNAME,
:VDCADMINPASS,
:NAME,
:CLUSTER_ID,
:RESOURCES]
@ -111,13 +117,13 @@ module OZones
#Creates an OpenNebula VDC, using its ID, vdcid and the associated zone
def initialize(vdcid, zone = nil)
if vdcid != -1
@vdc = Vdc.get(vdcid)
@vdc = Vdc[vdcid]
if !@vdc
raise "VDC with id #{vdcid} not found."
end
@zone = OZones::Zones.get(@vdc.zones_ID)
@zone = OZones::Zones[@vdc.ZONES_ID]
else
@zone = zone
end
@ -150,9 +156,17 @@ module OZones
#-------------------------------------------------------------------
# Create a vdc record & check cluster consistency
#-------------------------------------------------------------------
@vdc = Vdc.new
begin
@vdc.attributes = vdc_data
@vdc = Vdc.new
@vdc.update(vdc_data)
@vdc.ZONES_ID = @zone.ID
rescue => e
return OpenNebula::Error.new(e.message)
end
rc = resources_in_cluster?(rsrc)
@ -198,10 +212,11 @@ module OZones
rc, acl_ids = create_acls(rules)
return rollback(group, user, acl_ids,rc) if OpenNebula.is_error?(rc)
OzonesServer::logger.debug {"ACLs #{acl_ids} created"}
OzonesServer::logger.debug {"ACLs #{acl_ids} created"}
rsrc[:ACLS] = acl_ids
@vdc.resources = rsrc
@vdc.save
return true
end
@ -283,10 +298,8 @@ module OZones
#Update the VDC Record
# ------------------------------------------------------------------
begin
@vdc.raise_on_save_failure = true
@vdc.resources = rsrc_hash
@vdc.save
@vdc.save(:raise_on_failure => true)
rescue => e
return OpenNebula::Error.new(e.message)
end

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

@ -16,29 +16,42 @@
module OZones
class Zones
include DataMapper::Resource
class Zones < Sequel::Model
include OpenNebulaJSON::JSONUtils
extend OpenNebulaJSON::JSONUtils
plugin :schema
plugin :validation_helpers
#######################################################################
# Data Model for the Zone
#######################################################################
property :ID, Serial
property :NAME, String, :required => true, :unique => true
property :ONENAME, String, :required => true
property :ONEPASS, String, :required => true
property :ENDPOINT, String, :required => true
property :SUNSENDPOINT, String
property :SELFENDPOINT, String
set_schema do
primary_key :ID
String :NAME, :unique => true
String :ONENAME
String :ONEPASS
String :ENDPOINT
String :SUNSENDPOINT
String :SELFENDPOINT
end
has n, :vdcs
create_table unless table_exists?
one_to_many :vdcs, :class => 'OZones::Vdc', :key => :ZONES_ID
#######################################################################
# Constants
#######################################################################
ZONE_ATTRS = [:ONENAME, :ONEPASS, :ENDPOINT, :NAME]
def validate
super
validates_presence ZONE_ATTRS
validates_unique :NAME
end
#######################################################################
# JSON Functions
#######################################################################
@ -47,11 +60,11 @@ module OZones
zonePoolHash["ZONE_POOL"] = Hash.new
zonePoolHash["ZONE_POOL"]["ZONE"] = Array.new unless self.all.empty?
self.all.each{|zone|
zattr = zone.attributes.clone
self.each{|zone|
zattr = zone.values.clone
zattr[:ONEPASS] = Zones.encrypt(zattr[:ONEPASS])
zattr[:NUMBERVDCS] = zone.vdcs.all.size
zattr[:NUMBERVDCS] = zone.vdcs.size
zonePoolHash["ZONE_POOL"]["ZONE"] << zattr
}
@ -62,12 +75,12 @@ module OZones
def to_hash
zattr = Hash.new
zattr["ZONE"] = attributes.clone
zattr["ZONE"] = @values.clone
zattr["ZONE"][:ONEPASS] = Zones.encrypt(zattr["ZONE"][:ONEPASS])
zattr["ZONE"][:VDCS] = Array.new
self.vdcs.all.each{|vdc|
zattr["ZONE"][:VDCS]<< vdc.attributes.clone
self.vdcs.each{|vdc|
zattr["ZONE"][:VDCS]<< vdc.values.clone
}
return zattr
@ -111,10 +124,7 @@ module OZones
# Create the zone
begin
zone = Zones.new
zone.raise_on_save_failure = true
zone.attributes = zone_data
zone.save
zone.update(zone_data)
rescue => e
return OZones::Error.new(e.message)
end
@ -165,7 +175,7 @@ module OZones
##########################################################################
class OpenNebulaZone
def initialize(zoneid)
@zone = Zones.get(zoneid)
@zone = Zones[zoneid]
if !@zone
raise "Error: Zone with id #{zoneid} not found"
@ -199,7 +209,13 @@ module OZones
return [404, error.to_json]
end
pool.info
rc = pool.info
if OpenNebula.is_error?(rc)
error = "Error communicating with #{@zone.NAME}."
error << " Retrieving #{pool_kind} pool: "
error << "#{rc.to_str}"
return [500, OZones::Error.new(error).to_json]
end
return [200, pool.to_json]
end

19
src/ozones/Server/models/Auth.rb
View File

@ -14,12 +14,21 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
class Auth
class Auth < Sequel::Model
plugin :schema
plugin :validation_helpers
include DataMapper::Resource
set_schema do
primary_key :id
String :name, :unique => true
String :password
end
property :id, Serial
property :name, String, :required => true, :unique => true
property :password, String, :required => true
create_table unless table_exists?
def validate
super
validates_unique(:name)
validates_presence [:name, :password]
end
end

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

@ -36,7 +36,7 @@ class OzonesServer < CloudServer
# Gets a VDC
def get_vdc(id)
vdc = OZones::Vdc.get(id)
vdc = OZones::Vdc[id]
if vdc
return [200, vdc.to_json]
@ -53,7 +53,7 @@ class OzonesServer < CloudServer
#Gets a zone
def get_zone(id)
zone = OZones::Zones.get(id)
zone = OZones::Zones[id]
if zone
return [200, zone.to_json]
@ -101,7 +101,7 @@ class OzonesServer < CloudServer
"Mandatory attribute zoneid missing.").to_json]
end
zone = OZones::Zones.get(zoneid)
zone = OZones::Zones[zoneid]
if !zone
return [404, OZones::Error.new("Error: Couldn't create vdc. " \
"Zone #{zoneid} not found.").to_json]
@ -126,11 +126,10 @@ class OzonesServer < CloudServer
#-----------------------------------------------------------------------
#Update the zone and save the vdc
#-----------------------------------------------------------------------
zone.raise_on_save_failure = true
zone.vdcs << vdc.vdc
begin
zone.save
zone.save(:raise_on_failture => true)
rescue => e
#vdc.clean_bootstrap
logger.error {"create_vdc: #{e.resource.errors.inspect}"}
@ -231,7 +230,7 @@ class OzonesServer < CloudServer
end
def delete_zone(id, pr)
zone = OZones::Zones.get(id)
zone = OZones::Zones[id]
if zone
rc = zone.destroy
@ -264,7 +263,7 @@ class OzonesServer < CloudServer
all_hosts = Array.new
zone.vdcs.all(:CLUSTER_ID =>c_id).each{ |vdc|
zone.vdcs(:CLUSTER_ID =>c_id).each{ |vdc|
rsrc = vdc.resources
if !rsrc[:HOSTS].empty? and vdc.ID != vdc_data[:ID]

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

@ -51,7 +51,7 @@ require 'sinatra'
require 'yaml'
require 'rubygems'
require 'data_mapper'
require 'sequel'
require 'digest/sha1'
require 'OzonesServer'
@ -102,18 +102,16 @@ enable_logging OZONES_LOG, settings.config[:debug_level].to_i
##############################################################################
# DB bootstrapping
##############################################################################
if config[:dbdebug]
DataMapper::Logger.new($stdout, :debug)
end
DataMapper.setup(:default, db_url)
DB = Sequel.connect(db_url)
if config[:dbdebug]
DB.loggers << settings.logger
end
require 'OZones'
require 'Auth'
DataMapper.finalize
DataMapper.auto_upgrade!
if Auth.all.size == 0
if ENV['OZONES_AUTH'] && File.exist?(ENV['OZONES_AUTH'])
credentials = IO.read(ENV['OZONES_AUTH']).strip.split(':')
@ -123,9 +121,10 @@ if Auth.all.size == 0
exit -1
end
credentials[1] = Digest::SHA1.hexdigest(credentials[1])
@auth=Auth.create({:name => credentials[0],
:password => credentials[1]})
@auth.save
@auth=Auth.new
@auth.name = credentials[0]
@auth.password = credentials[1]
@auth.save(:raise_on_failure => true)
else
error_m = "oZones admin credentials not set, missing OZONES_AUTH file."
settings.logger.error { error_m }

68
src/ozones/test/examples/pool/vdcpool0.json
View File

@ -2,13 +2,9 @@
"VDC_POOL": {
"VDC": [
{
"NAME": "vdcA",
"VDCADMINNAME": "vdcadminA",
"VDCADMIN_ID": 2,
"ID": 1,
"RESOURCES": {
"DATASTORES": [
100
],
"HOSTS": [
0,
1,
@ -27,21 +23,21 @@
8,
9,
10
]
},
"GROUP_ID": 100,
"ZONES_ID": 1,
"VDCADMINNAME": "vdcadminA",
"CLUSTER_ID": 100
},
{
"NAME": "vdcB",
"VDCADMIN_ID": 2,
"ID": 2,
"RESOURCES": {
],
"DATASTORES": [
100
],
]
},
"NAME": "vdcA",
"CLUSTER_ID": 100,
"ZONES_ID": 1,
"ID": 1,
"GROUP_ID": 100
},
{
"VDCADMINNAME": "vdcadminB",
"VDCADMIN_ID": 2,
"RESOURCES": {
"HOSTS": [
1
],
@ -56,21 +52,21 @@
6,
7,
8
]
},
"GROUP_ID": 100,
"ZONES_ID": 2,
"VDCADMINNAME": "vdcadminB",
"CLUSTER_ID": 100
},
{
"NAME": "vdcC",
"VDCADMIN_ID": 3,
"ID": 3,
"RESOURCES": {
],
"DATASTORES": [
100
],
]
},
"NAME": "vdcB",
"CLUSTER_ID": 100,
"ZONES_ID": 2,
"ID": 2,
"GROUP_ID": 100
},
{
"VDCADMINNAME": "vdcadminC",
"VDCADMIN_ID": 3,
"RESOURCES": {
"HOSTS": [
3
],
@ -85,12 +81,16 @@
15,
16,
17
],
"DATASTORES": [
100
]
},
"GROUP_ID": 101,
"NAME": "vdcC",
"CLUSTER_ID": 100,
"ZONES_ID": 1,
"VDCADMINNAME": "vdcadminC",
"CLUSTER_ID": 100
"ID": 3,
"GROUP_ID": 101
}
]
}

42
src/ozones/test/examples/pool/vdcpool_deleted.json
View File

@ -2,13 +2,9 @@
"VDC_POOL": {
"VDC": [
{
"NAME": "vdcA",
"VDCADMINNAME": "vdcadminA",
"VDCADMIN_ID": 2,
"ID": 1,
"RESOURCES": {
"DATASTORES": [
100
],
"HOSTS": [
0,
1,
@ -27,21 +23,21 @@
8,
9,
10
]
},
"GROUP_ID": 100,
"ZONES_ID": 1,
"VDCADMINNAME": "vdcadminA",
"CLUSTER_ID": 100
},
{
"NAME": "vdcB",
"VDCADMIN_ID": 2,
"ID": 2,
"RESOURCES": {
],
"DATASTORES": [
100
],
]
},
"NAME": "vdcA",
"CLUSTER_ID": 100,
"ZONES_ID": 1,
"ID": 1,
"GROUP_ID": 100
},
{
"VDCADMINNAME": "vdcadminB",
"VDCADMIN_ID": 2,
"RESOURCES": {
"HOSTS": [
1
],
@ -56,12 +52,16 @@
6,
7,
8
],
"DATASTORES": [
100
]
},
"GROUP_ID": 100,
"NAME": "vdcB",
"CLUSTER_ID": 100,
"ZONES_ID": 2,
"VDCADMINNAME": "vdcadminB",
"CLUSTER_ID": 100
"ID": 2,
"GROUP_ID": 100
}
]
}

28
src/ozones/test/examples/pool/zonepool0.json
View File

@ -2,24 +2,24 @@
"ZONE_POOL": {
"ZONE": [
{
"NAME": "zoneA",
"SUNSENDPOINT": "http://localhost:9869",
"SELFENDPOINT": null,
"ONENAME": "oneadminA",
"ID": 1,
"ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==",
"ENDPOINT": "http://localhost:2666/RPC2",
"NUMBERVDCS": 0
"SUNSENDPOINT": "http://localhost:9869",
"NAME": "zoneA",
"SELFENDPOINT": null,
"NUMBERVDCS": 0,
"ID": 1,
"ONENAME": "oneadminA",
"ONEPASS": "e/TkohQckqFcmcWFwrirUapdiLkg87GHPafKnxkzznk="
},
{
"NAME": "zoneB",
"SUNSENDPOINT": null,
"SELFENDPOINT": null,
"ONENAME": "oneadminB",
"ID": 2,
"ONEPASS": "8Si8vlo2P3qn5/SNxkMkDg==",
"ENDPOINT": "http://localhost:2667/RPC2",
"NUMBERVDCS": 0
"SUNSENDPOINT": null,
"NAME": "zoneB",
"SELFENDPOINT": null,
"NUMBERVDCS": 0,
"ID": 2,
"ONENAME": "oneadminB",
"ONEPASS": "DrnuZMnmOFVeYTXTVwTgEmOGw2orTjaU/f1NyuNKlQY="
}
]
}

14
src/ozones/test/examples/pool/zonepool_deleted.json
View File

@ -2,14 +2,14 @@
"ZONE_POOL": {
"ZONE": [
{
"NAME": "zoneA",
"SUNSENDPOINT": "http://localhost:9869",
"SELFENDPOINT": null,
"ONENAME": "oneadminA",
"ID": 1,
"ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==",
"ENDPOINT": "http://localhost:2666/RPC2",
"NUMBERVDCS": 0
"SUNSENDPOINT": "http://localhost:9869",
"NAME": "zoneA",
"SELFENDPOINT": null,
"NUMBERVDCS": 0,
"ID": 1,
"ONENAME": "oneadminA",
"ONEPASS": "e/TkohQckqFcmcWFwrirUapdiLkg87GHPafKnxkzznk="
}
]
}

16
src/ozones/test/examples/vdc/vdc0.json
View File

@ -1,12 +1,8 @@
{
"VDC": {
"NAME": "vdcA",
"VDCADMINNAME": "vdcadminA",
"VDCADMIN_ID": 2,
"ID": 1,
"RESOURCES": {
"DATASTORES": [
100
],
"HOSTS": [
0,
1,
@ -25,11 +21,15 @@
8,
9,
10
],
"DATASTORES": [
100
]
},
"GROUP_ID": 100,
"NAME": "vdcA",
"CLUSTER_ID": 100,
"ZONES_ID": 1,
"VDCADMINNAME": "vdcadminA",
"CLUSTER_ID": 100
"ID": 1,
"GROUP_ID": 100
}
}

12
src/ozones/test/examples/zone/zone0.json
View File

@ -1,14 +1,14 @@
{
"ZONE": {
"NAME": "zoneA",
"ENDPOINT": "http://localhost:2666/RPC2",
"SUNSENDPOINT": "http://localhost:9869",
"NAME": "zoneA",
"SELFENDPOINT": null,
"ID": 1,
"ONENAME": "oneadminA",
"VDCS": [
],
"SELFENDPOINT": null,
"ONENAME": "oneadminA",
"ID": 1,
"ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==",
"ENDPOINT": "http://localhost:2666/RPC2"
"ONEPASS": "e/TkohQckqFcmcWFwrirUapdiLkg87GHPafKnxkzznk="
}
}

25
src/ozones/test/spec/VDCManagement_spec.rb
View File

@ -154,13 +154,25 @@ module OZones
it "should be able to retrieve the vdc pool" do
vdcpool = @vdchelper.list_pool({:json => true})
vdcpool[0].should eql(0)
vdcpool[1].should eql(File.read(TESTS_PATH+"examples/pool/vdcpool0.json"))
got = vdcpool[1]
expected = File.read(TESTS_PATH+"examples/pool/vdcpool0.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should be able to retrieve a particular vdc" do
vdc = @vdchelper.show_resource(1, {:json => true})
vdc[0].should eql(0)
vdc[1].should eql(File.read(TESTS_PATH+"examples/vdc/vdc0.json"))
got = vdc[1]
expected = File.read(TESTS_PATH+"examples/vdc/vdc0.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should allow deleting a vdc" do
@ -168,8 +180,13 @@ module OZones
rc[0].should eql(0)
rc = @vdchelper.list_pool({:json => true})
rc[0].should eql(0)
rc[1].should eql(File.read(TESTS_PATH+
"examples/pool/vdcpool_deleted.json"))
got = rc[1]
expected = File.read(TESTS_PATH+"examples/pool/vdcpool_deleted.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should fail on non-existing vdc deletion" do

26
src/ozones/test/spec/ZoneManagement_spec.rb
View File

@ -72,14 +72,25 @@ module OZones
it "should be able to retrieve the zone pool" do
zonepool = @helper.list_pool({:json => true})
zonepool[0].should eql(0)
zonepool[1].should eql(File.read(TESTS_PATH+
"examples/pool/zonepool0.json"))
got = zonepool[1]
expected = File.read(TESTS_PATH+"examples/pool/zonepool0.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should be able to retrieve a particular zone" do
zone = @helper.show_resource(1,{:json => true})
zone[0].should eql(0)
zone[1].should eql(File.read(TESTS_PATH+"examples/zone/zone0.json"))
got = zone[1]
expected = File.read(TESTS_PATH+"examples/zone/zone0.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should allow deleting a zone" do
@ -87,8 +98,13 @@ module OZones
rc[0].should eql(0)
rc = @helper.list_pool({:json => true})
rc[0].should eql(0)
rc[1].should eql(File.read(TESTS_PATH+
"examples/pool/zonepool_deleted.json"))
got = rc[1]
expected = File.read(TESTS_PATH+"examples/pool/zonepool_deleted.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should fail on non existing zone deletion" do

4
src/vmm_mad/remotes/kvm/kvmrc
View File

@ -26,3 +26,7 @@ export SHUTDOWN_TIMEOUT=300
# Uncomment this line to force VM cancellation after shutdown timeout
#export FORCE_DESTROY=yes
# Uncomment this line to force VM's without ACPI enabled to be destroyed
# on shutdown
#CANCEL_NO_ACPI=yes

15
src/vmm_mad/remotes/kvm/shutdown
View File

@ -23,6 +23,17 @@ count=0
deploy_id=$1
shutdown_command="virsh --connect $LIBVIRT_URI shutdown $deploy_id"
#If VM does not have ACPI enabled do not try to use it, destroy instead shutdown
if [ "x$CANCEL_NO_ACPI" = "xyes" ]; then
virsh --connect $LIBVIRT_URI dumpxml $deploy_id | grep -q acpi
if [ "x$?" != "x0" ]; then
shutdown_command="virsh --connect $LIBVIRT_URI destroy $deploy_id"
fi
fi
if [ -z "$SHUTDOWN_TIMEOUT" ]; then
TIMEOUT=120
else
@ -36,7 +47,7 @@ function monitor
# Issue another shutdown to cover occasional libvirt lack of attention
if [ "$count" -eq "$HALF_LOOP" ]
then
virsh --connect $LIBVIRT_URI shutdown $deploy_id
eval $shutdown_command
fi
let count=count+1
@ -48,7 +59,7 @@ function monitor
[ "x$?" != "x0" ]
}
exec_and_log "virsh --connect $LIBVIRT_URI shutdown $deploy_id" \
exec_and_log "$shutdown_command" \
"Could not shutdown $deploy_id"
retry $TIMEOUT monitor