stackforge/aviator
Code Issues Proposed changes

Merge pull request #68 from relaxdiego/fix/simplify_base_url

Browse Source 
Rename base_url_for to base_url and remove enpoint_type parameter since
the endpoint_type is already defined in the request file's meta declarations.
This commit is contained in:
Mark Maglana
2013-09-29 10:08:06 -07:00
parent fab1134c46 250ebd0e71
commit b6280186f6
50 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/aviator/openstack/common/v2/public/base.rb
View File

@@ -17,7 +17,7 @@ module Aviator
private
def base_url_for(endpoint_type)
def base_url
if session_data[:base_url]
session_data[:base_url]
else

2
lib/aviator/openstack/compute/v2/admin/confirm_server_resize.rb
View File

@@ -28,7 +28,7 @@ module Aviator
def url
"#{ base_url_for :admin }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/admin/create_network.rb
View File

@@ -48,7 +48,7 @@ module Aviator
def url
"#{ base_url_for :admin }/os-networks"
"#{ base_url }/os-networks"
end
end

2
lib/aviator/openstack/compute/v2/admin/get_host_details.rb
View File

@@ -21,7 +21,7 @@ module Aviator
def url
"#{ base_url_for :admin }/os-hosts/#{ params[:host_name] }"
"#{ base_url }/os-hosts/#{ params[:host_name] }"
end
end

2
lib/aviator/openstack/compute/v2/admin/list_hosts.rb
View File

@@ -25,7 +25,7 @@ module Aviator
def url
url = "#{ base_url_for :admin }/os-hosts"
url = "#{ base_url }/os-hosts"
filters = []

2
lib/aviator/openstack/compute/v2/admin/lock_server.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
"#{ base_url_for :admin }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/admin/migrate_server.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
"#{ base_url_for :admin }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/admin/reset_server.rb
View File

@@ -31,7 +31,7 @@ module Aviator
def url
"#{ base_url_for :admin }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/admin/resize_server.rb
View File

@@ -33,7 +33,7 @@ module Aviator
def url
"#{ base_url_for :admin }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/admin/unlock_server.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
"#{ base_url_for :admin }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/public/change_admin_password.rb
View File

@@ -36,7 +36,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/public/create_image.rb
View File

@@ -38,7 +38,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/public/create_server.rb
View File

@@ -46,7 +46,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers"
"#{ base_url }/servers"
end
end

2
lib/aviator/openstack/compute/v2/public/delete_image.rb
View File

@@ -21,7 +21,7 @@ module Aviator
def url
"#{ base_url_for :public }/images/#{ params[:id]}"
"#{ base_url }/images/#{ params[:id]}"
end
end

2
lib/aviator/openstack/compute/v2/public/delete_server.rb
View File

@@ -21,7 +21,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }"
"#{ base_url }/servers/#{ params[:id] }"
end
end

2
lib/aviator/openstack/compute/v2/public/get_flavor_details.rb
View File

@@ -21,7 +21,7 @@ module Aviator
def url
"#{ base_url_for :public }/flavors/#{ params[:id] }"
"#{ base_url }/flavors/#{ params[:id] }"
end
end

2
lib/aviator/openstack/compute/v2/public/get_image_details.rb
View File

@@ -21,7 +21,7 @@ module Aviator
def url
"#{ base_url_for :public }/images/#{ params[:id]}"
"#{ base_url }/images/#{ params[:id]}"
end
end

2
lib/aviator/openstack/compute/v2/public/get_network_details.rb
View File

@@ -22,7 +22,7 @@ module Aviator
def url
"#{ base_url_for :public }/os-networks/#{ params[:id] }"
"#{ base_url }/os-networks/#{ params[:id] }"
end
end

2
lib/aviator/openstack/compute/v2/public/get_server.rb
View File

@@ -20,7 +20,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }"
"#{ base_url }/servers/#{ params[:id] }"
end
end

2
lib/aviator/openstack/compute/v2/public/list_addresses.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
url = "#{ base_url_for :public }/servers/#{ params[:id] }/ips"
url = "#{ base_url }/servers/#{ params[:id] }/ips"
url += "/#{ params[:networkID] }" if params[:networkID]
url
end

2
lib/aviator/openstack/compute/v2/public/list_flavors.rb
View File

@@ -25,7 +25,7 @@ module Aviator
def url
str = "#{ base_url_for :public }/flavors"
str = "#{ base_url }/flavors"
str += "/detail" if params[:details]
str += params_to_querystring(optional_params + required_params - [:details])
end

2
lib/aviator/openstack/compute/v2/public/list_images.rb
View File

@@ -28,7 +28,7 @@ module Aviator
def url
str = "#{ base_url_for :public }/images"
str = "#{ base_url }/images"
str += "/detail" if params[:details]
str += params_to_querystring(optional_params + required_params - [:details])
end

2
lib/aviator/openstack/compute/v2/public/list_networks.rb
View File

@@ -19,7 +19,7 @@ module Aviator
def url
"#{ base_url_for :public }/os-networks"
"#{ base_url }/os-networks"
end
end

2
lib/aviator/openstack/compute/v2/public/list_servers.rb
View File

@@ -38,7 +38,7 @@ module Aviator
def url
str = "#{ base_url_for :public }/servers"
str = "#{ base_url }/servers"
str += "/detail" if params[:details]
filters = []

2
lib/aviator/openstack/compute/v2/public/pause_server.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/public/reboot_server.rb
View File

@@ -33,7 +33,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/public/rebuild_server.rb
View File

@@ -45,7 +45,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/public/resume_server.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/public/root.rb
View File

@@ -15,7 +15,7 @@ module Aviator
def url
uri = URI(base_url_for(:public))
uri = URI(base_url)
"#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v2/"
end

2
lib/aviator/openstack/compute/v2/public/suspend_server.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/public/unpause_server.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }/action"
"#{ base_url }/servers/#{ params[:id] }/action"
end
end

2
lib/aviator/openstack/compute/v2/public/update_server.rb
View File

@@ -37,7 +37,7 @@ module Aviator
def url
"#{ base_url_for :public }/servers/#{ params[:id] }"
"#{ base_url }/servers/#{ params[:id] }"
end
end

2
lib/aviator/openstack/identity/v2/admin/add_role_to_user_on_tenant.rb
View File

@@ -25,7 +25,7 @@ module Aviator
def url
p = params
"#{ base_url_for :admin }/tenants/#{ p[:tenant_id] }/users/#{ p[:user_id] }/roles/OS-KSADM/#{ p[:role_id] }"
"#{ base_url }/tenants/#{ p[:tenant_id] }/users/#{ p[:user_id] }/roles/OS-KSADM/#{ p[:role_id] }"
end
end

2
lib/aviator/openstack/identity/v2/admin/create_tenant.rb
View File

@@ -35,7 +35,7 @@ module Aviator
def url
"#{ base_url_for :admin }/tenants"
"#{ base_url }/tenants"
end
end

2
lib/aviator/openstack/identity/v2/admin/delete_role_from_user_on_tenant.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
p = params
"#{ base_url_for :admin }/tenants/#{ p[:tenant_id] }/users/#{ p[:user_id] }/roles/OS-KSADM/#{ p[:role_id] }"
"#{ base_url }/tenants/#{ p[:tenant_id] }/users/#{ p[:user_id] }/roles/OS-KSADM/#{ p[:role_id] }"
end
end

2
lib/aviator/openstack/identity/v2/admin/delete_tenant.rb
View File

@@ -21,7 +21,7 @@ module Aviator
def url
"#{ base_url_for :admin }/tenants/#{ params[:id]}"
"#{ base_url }/tenants/#{ params[:id]}"
end
end

2
lib/aviator/openstack/identity/v2/admin/list_tenants.rb
View File

@@ -26,7 +26,7 @@ module Aviator
def url
str = "#{ base_url_for :admin }/tenants"
str = "#{ base_url }/tenants"
str += params_to_querystring(optional_params + required_params)
end

2
lib/aviator/openstack/identity/v2/admin/update_tenant.rb
View File

@@ -39,7 +39,7 @@ module Aviator
def url
"#{ base_url_for :admin }/tenants/#{ params[:id] }"
"#{ base_url }/tenants/#{ params[:id] }"
end
end

2
lib/aviator/openstack/identity/v2/public/list_tenants.rb
View File

@@ -16,7 +16,7 @@ module Aviator
def url
str = "#{ base_url_for :public }/tenants"
str = "#{ base_url }/tenants"
str += params_to_querystring(optional_params + required_params)
end

2
lib/aviator/openstack/identity/v2/public/root.rb
View File

@@ -16,7 +16,7 @@ module Aviator
def url
uri = URI(base_url_for(:public))
uri = URI(base_url)
"#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v2.0/"
end

2
lib/aviator/openstack/image/v1/public/root.rb
View File

@@ -16,7 +16,7 @@ module Aviator
def url
uri = URI(base_url_for(:public))
uri = URI(base_url)
"#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v1/"
end

2
lib/aviator/openstack/metering/v1/admin/list_projects.rb
View File

@@ -18,7 +18,7 @@ module Aviator
def url
uri = URI(base_url_for(:admin))
uri = URI(base_url)
"#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v1/projects"
end

2
lib/aviator/openstack/volume/v1/public/create_volume.rb
View File

@@ -40,7 +40,7 @@ module Aviator
end
def url
"#{ base_url_for :public }/volumes"
"#{ base_url }/volumes"
end
end

2
lib/aviator/openstack/volume/v1/public/delete_volume.rb
View File

@@ -18,7 +18,7 @@ module Aviator
end
def url
"#{ base_url_for :public }/volumes/#{ params[:id] }"
"#{ base_url }/volumes/#{ params[:id] }"
end
end

2
lib/aviator/openstack/volume/v1/public/get_volume.rb
View File

@@ -19,7 +19,7 @@ module Aviator
end
def url
"#{ base_url_for :public }/volumes/#{ params[:id] }"
"#{ base_url }/volumes/#{ params[:id] }"
end

2
lib/aviator/openstack/volume/v1/public/list_volume_types.rb
View File

@@ -21,7 +21,7 @@ module Aviator
end
def url
"#{ base_url_for :public }/types"
"#{ base_url }/types"
end
end

2
lib/aviator/openstack/volume/v1/public/list_volumes.rb
View File

@@ -27,7 +27,7 @@ module Aviator
end
def url
str = "#{ base_url_for :public }/volumes"
str = "#{ base_url }/volumes"
str += "/detail" if params[:details]
str += params_to_querystring(optional_params + required_params - [:details])
end

2
lib/aviator/openstack/volume/v1/public/root.rb
View File

@@ -17,7 +17,7 @@ module Aviator
def url
uri = URI(base_url_for(:public))
uri = URI(base_url)
"#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v1/"
end

2
lib/aviator/openstack/volume/v1/public/update_volume.rb
View File

@@ -34,7 +34,7 @@ module Aviator
def url
"#{ base_url_for :public }/volumes/#{ params[:id] }"
"#{ base_url }/volumes/#{ params[:id] }"
end
end

6
test/aviator/openstack/common/v2/public/base_test.rb
View File

@@ -67,7 +67,7 @@ class Aviator::Test
end
describe '::base_url_for' do
describe '::base_url' do
it 'must throw a MissingServiceEndpointError when the service\'s endpoint can\'t be found' do
default_session_data = JSON.parse('{"access": {"token": {"issued_at": "2013-09-25T20:21:55.453783",
@@ -79,7 +79,7 @@ class Aviator::Test
request = klass.new(default_session_data)
the_method = lambda { request.send(:base_url_for, :public) }
the_method = lambda { request.send(:base_url) }
the_method.must_raise Aviator::Service::MissingServiceEndpointError
end
@@ -99,7 +99,7 @@ class Aviator::Test
request = klass.new(default_session_data)
request.send(:base_url_for, :public).must_equal base_url
request.send(:base_url).must_equal base_url
end
end