shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-24 21:34:01 +03:00
Code Releases Wiki Activity

Feature #2917: Reformat onegate's reponses to match those of oneflow

Browse Source
This commit is contained in:
Jaime Melis 2014-07-15 19:05:38 +02:00
parent 6f95278881
commit b588485bde
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/onegate/onegate-server.rb
View File

@ -182,7 +182,7 @@ def build_service_hash(service_hash)
service_info = {
"name" => service_hash["DOCUMENT"]["NAME"],
"id" => service_hash["DOCUMENT"]["ID"],
"roles" => {}
"roles" => []
}
roles.each do |role|
@ -190,7 +190,7 @@ def build_service_hash(service_hash)
"name" => role["name"],
"cardinality" => role["cardinality"],
"state" => role["state"],
"nodes" => {}
"nodes" => []
}
if (nodes = role["nodes"])
@ -199,17 +199,15 @@ def build_service_hash(service_hash)
vm_info = vm["vm_info"]["VM"]
vm_running = vm["running"]
role_info["nodes"][vm_deploy_id]= {
role_info["nodes"] << {
"deploy_id" => vm_deploy_id,
"running" => vm["running"],
"vm_info" => build_vm_hash(vm_info)["VM"]
"vm_info" => build_vm_hash(vm_info)
}
role_info["nodes"][vm_deploy_id]
end
end
service_info["roles"][role["name"]] = role_info
service_info["roles"] << role_info
end
{
@ -271,9 +269,9 @@ get '/service' do
halt 400, error_msg
end
service_vm_ids = response["SERVICE"]["roles"].collect do |_,role|
role["nodes"].keys
end.flatten
service_vm_ids = response["SERVICE"]["roles"].collect do |r|
r["nodes"].collect{|n| n["deploy_id"]}
end.flatten
# Check that the user has not spoofed the Service_ID
if service_vm_ids.empty? || !service_vm_ids.include?(vm_id)
@ -309,9 +307,9 @@ get '/' do
halt 400, error_msg
end
service_vm_ids = response_service["SERVICE"]["roles"].collect do |_,role|
role["nodes"].keys
end.flatten
service_vm_ids = response["SERVICE"]["roles"].collect do |r|
r["nodes"].collect{|n| n["deploy_id"]}
end.flatten
# Check that the user has not spoofed the Service_ID
if service_vm_ids.empty? || !service_vm_ids.include?(vm_id)