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

bug #3376: Check zone status before connecting

Browse Source
This commit is contained in:
Daniel Molina 2015-03-04 18:11:59 +01:00
parent 0bd28a5830
commit aa8a127f60
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sunstone/public/js/sunstone.js
View File

@ -4820,7 +4820,7 @@ $(document).ready(function(){
$('a.zone-choice').live("click", function(){
$.ajax({
url: 'config',
type: "HEAD",
type: "GET",
headers: {
"ZONE_NAME" : this.id
},
@ -4828,7 +4828,8 @@ $(document).ready(function(){
success: function(){
window.location.href = ".";
},
error: function(response){
error: function(response) {
onError(null, OpenNebula.Error(response))
}
});
});

44
src/sunstone/sunstone-server.rb
View File

@ -178,7 +178,7 @@ helpers do
logger.info { "Unauthorized login attempt" }
return [401, ""]
else
client = $cloud_auth.client(result)
client = $cloud_auth.client(result, session[:active_zone_endpoint])
user_id = OpenNebula::User::SELF
user = OpenNebula::User.new_with_id(user_id, client)
@ -245,7 +245,7 @@ helpers do
env['rack.session.options'][:expire_after] = 30*60*60*24-1
end
serveradmin_client = $cloud_auth.client()
serveradmin_client = $cloud_auth.client(nil, session[:active_zone_endpoint])
rc = OpenNebula::System.new(serveradmin_client).get_configuration
return [500, rc.message] if OpenNebula.is_error?(rc)
return [500, "Couldn't find out zone identifier"] if !rc['FEDERATION/ZONE_ID']
@ -280,23 +280,45 @@ before do
end
if env['HTTP_ZONE_NAME']
client=$cloud_auth.client(session[:user])
client = $cloud_auth.client(session[:user], session[:active_zone_endpoint])
zpool = ZonePoolJSON.new(client)
rc = zpool.info
return [500, rc.to_json] if OpenNebula.is_error?(rc)
halt [500, rc.to_json] if OpenNebula.is_error?(rc)
found = false
zpool.each{|z|
if z.name == env['HTTP_ZONE_NAME']
session[:active_zone_endpoint] = z['TEMPLATE/ENDPOINT']
session[:zone_name] = env['HTTP_ZONE_NAME']
found = true
serveradmin_client = $cloud_auth.client(nil, z['TEMPLATE/ENDPOINT'])
rc = OpenNebula::System.new(serveradmin_client).get_configuration
if OpenNebula.is_error?(rc)
msg = "Zone #{env['HTTP_ZONE_NAME']} not available " + rc.message
logger.error { msg }
halt [410, OpenNebula::Error.new(msg).to_json]
end
if !rc['FEDERATION/ZONE_ID']
msg = "Couldn't find out zone identifier"
logger.error { msg }
halt [500, OpenNebula::Error.new(msg).to_json]
end
session[:active_zone_endpoint] = z['TEMPLATE/ENDPOINT']
session[:zone_name] = env['HTTP_ZONE_NAME']
end
}
if !found
msg = "Zone #{env['HTTP_ZONE_NAME']} does not exist"
logger.error { msg }
halt [404, OpenNebula::Error.new(msg).to_json]
end
end
client = $cloud_auth.client(session[:user],
session[:active_zone_endpoint])
client = $cloud_auth.client(session[:user], session[:active_zone_endpoint])
@SunstoneServer = SunstoneServer.new(client,$conf,logger)
end
@ -398,7 +420,7 @@ post '/config' do
user = OpenNebula::User.new_with_id(
OpenNebula::User::SELF,
$cloud_auth.client(session[:user]))
$cloud_auth.client(session[:user]), session[:active_zone_endpoint])
rc = user.info
if OpenNebula.is_error?(rc)
@ -480,7 +502,9 @@ get '/:pool' do
if params[:zone_id]
zone = OpenNebula::Zone.new_with_id(params[:zone_id].to_i,
$cloud_auth.client(session[:user]))
$cloud_auth.client(session[:user],
session[:active_zone_endpoint]))
rc = zone.info
return [500, rc.message] if OpenNebula.is_error?(rc)
zone_client = $cloud_auth.client(session[:user],