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

F #3959: show services federation (#1263)

Browse Source 
Co-authored-by: Jorge Lobo <jlobo@opennebula.systems>
(cherry picked from commit 0a2770f45287972003ca880e9cfea34f9b895b87)
(cherry picked from commit 5d1928f0a910a4ebba7af7d3d92185bfe0add5ad)
This commit is contained in:
Jorge Miguel Lobo Escalona 2021-05-31 16:22:55 +02:00 committed by Tino Vazquez
parent f924fc5f42
commit 86f0ab2c8f
No known key found for this signature in database
GPG Key ID: 14201E424D02047E
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/routes/oneflow.rb
View File

@ -25,7 +25,7 @@ helpers do
split_array = flow_client.one_auth.split(':')
Service::Client.new(
:url => $conf[:oneflow_server],
:url => session[:zone_flow_url] || $conf[:oneflow_server],
:user_agent => "Sunstone",
:username => split_array.shift,
:password => split_array.join(':'))

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

@ -484,6 +484,11 @@ helpers do
zone = OpenNebula::Zone.new_with_id(active_zone_configuration['FEDERATION/ZONE_ID'].to_i, client_active_endpoint)
zone.info
url_one_zone = zone.retrieve_elements("TEMPLATE/ONEFLOW_ENDPOINT")
url_zone = zone.retrieve_elements("TEMPLATE/ENDPOINT")
session[:zone_flow_url] = (url_one_zone && url_one_zone[0]) || parse_flow_url(url_zone[0])
session[:zone_name] = zone.name
session[:zone_id] = zone.id
session[:federation_mode] = active_zone_configuration['FEDERATION/MODE'].upcase
@ -496,6 +501,13 @@ helpers do
session.clear
[204, ""]
end
def parse_flow_url(endpoint)
if endpoint
uri = URI(endpoint.to_s)
return "#{uri.scheme}://#{uri.host}:2474"
end
end
end
before do
@ -557,6 +569,7 @@ before do
halt [500, OpenNebula::Error.new(msg).to_json]
end
session[:zone_flow_url] = z['TEMPLATE/ONEFLOW_ENDPOINT'] || parse_flow_url(z['TEMPLATE/ENDPOINT'])
session[:active_zone_endpoint] = z['TEMPLATE/ENDPOINT']
session[:zone_name] = zone_name_header
session[:zone_id] = z.id