1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

[Brightbox] Replaces usage of deprecated #request

This removes the usage of the incorrect form of #request that was
introduced by mistake. It switches to use the #wrapped_request version
which has identical functionalit to the deprecated version.
This commit is contained in:
Paul Thornthwaite 2012-12-18 15:00:26 +00:00
parent ab82cbe3c4
commit ef61bd514d
77 changed files with 77 additions and 77 deletions

View file

@ -12,7 +12,7 @@ module Fog
#
def activate_console_server(identifier)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/servers/#{identifier}/activate_console", [202])
wrapped_request("post", "/1.0/servers/#{identifier}/activate_console", [202])
end
end

View file

@ -14,7 +14,7 @@ module Fog
#
def add_listeners_load_balancer(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/load_balancers/#{identifier}/add_listeners", [202], options)
wrapped_request("post", "/1.0/load_balancers/#{identifier}/add_listeners", [202], options)
end
end

View file

@ -14,7 +14,7 @@ module Fog
#
def add_nodes_load_balancer(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/load_balancers/#{identifier}/add_nodes", [202], options)
wrapped_request("post", "/1.0/load_balancers/#{identifier}/add_nodes", [202], options)
end
end

View file

@ -17,7 +17,7 @@ module Fog
#
def add_servers_server_group(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/server_groups/#{identifier}/add_servers", [202], options)
wrapped_request("post", "/1.0/server_groups/#{identifier}/add_servers", [202], options)
end
end

View file

@ -14,7 +14,7 @@ module Fog
#
def apply_to_firewall_policy(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/firewall_policies/#{identifier}/apply_to", [202], options)
wrapped_request("post", "/1.0/firewall_policies/#{identifier}/apply_to", [202], options)
end
end

View file

@ -13,7 +13,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#api_client_create_api_client
#
def create_api_client(options)
request("post", "/1.0/api_clients", [201], options)
wrapped_request("post", "/1.0/api_clients", [201], options)
end
end

View file

@ -13,7 +13,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#application_create_application
#
def create_application(options)
request("post", "/1.0/applications", [201], options)
wrapped_request("post", "/1.0/applications", [201], options)
end
end

View file

@ -14,7 +14,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#cloud_ip_create_cloud_ip
#
def create_cloud_ip(options = {})
request("post", "/1.0/cloud_ips", [201], options)
wrapped_request("post", "/1.0/cloud_ips", [201], options)
end
end

View file

@ -15,7 +15,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#firewall_policy_create_firewall_policy
#
def create_firewall_policy(options)
request("post", "/1.0/firewall_policies", [201], options)
wrapped_request("post", "/1.0/firewall_policies", [201], options)
end
end

View file

@ -19,7 +19,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#firewall_rule_create_firewall_rule
#
def create_firewall_rule(options)
request("post", "/1.0/firewall_rules", [202], options)
wrapped_request("post", "/1.0/firewall_rules", [202], options)
end
end

View file

@ -20,7 +20,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#image_create_image
#
def create_image(options)
request("post", "/1.0/images", [201], options)
wrapped_request("post", "/1.0/images", [201], options)
end
end

View file

@ -16,7 +16,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#load_balancer_create_load_balancer
#
def create_load_balancer(options)
request("post", "/1.0/load_balancers", [202], options)
wrapped_request("post", "/1.0/load_balancers", [202], options)
end
end

View file

@ -19,7 +19,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#server_create_server
#
def create_server(options)
request("post", "/1.0/servers", [202], options)
wrapped_request("post", "/1.0/servers", [202], options)
end
end

View file

@ -13,7 +13,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#server_group_create_server_group
#
def create_server_group(options)
request("post", "/1.0/server_groups", [202], options)
wrapped_request("post", "/1.0/server_groups", [202], options)
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def destroy_api_client(identifier)
return nil if identifier.nil? || identifier == ""
request("delete", "/1.0/api_clients/#{identifier}", [200])
wrapped_request("delete", "/1.0/api_clients/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def destroy_application(identifier)
return nil if identifier.nil? || identifier == ""
request("delete", "/1.0/applications/#{identifier}", [200])
wrapped_request("delete", "/1.0/applications/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def destroy_cloud_ip(identifier)
return nil if identifier.nil? || identifier == ""
request("delete", "/1.0/cloud_ips/#{identifier}", [200])
wrapped_request("delete", "/1.0/cloud_ips/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def destroy_firewall_policy(identifier)
return nil if identifier.nil? || identifier == ""
request("delete", "/1.0/firewall_policies/#{identifier}", [202])
wrapped_request("delete", "/1.0/firewall_policies/#{identifier}", [202])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def destroy_firewall_rule(identifier)
return nil if identifier.nil? || identifier == ""
request("delete", "/1.0/firewall_rules/#{identifier}", [202])
wrapped_request("delete", "/1.0/firewall_rules/#{identifier}", [202])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def destroy_image(identifier)
return nil if identifier.nil? || identifier == ""
request("delete", "/1.0/images/#{identifier}", [202])
wrapped_request("delete", "/1.0/images/#{identifier}", [202])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def destroy_load_balancer(identifier)
return nil if identifier.nil? || identifier == ""
request("delete", "/1.0/load_balancers/#{identifier}", [202])
wrapped_request("delete", "/1.0/load_balancers/#{identifier}", [202])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def destroy_server(identifier)
return nil if identifier.nil? || identifier == ""
request("delete", "/1.0/servers/#{identifier}", [202])
wrapped_request("delete", "/1.0/servers/#{identifier}", [202])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def destroy_server_group(identifier)
return nil if identifier.nil? || identifier == ""
request("delete", "/1.0/server_groups/#{identifier}", [202])
wrapped_request("delete", "/1.0/server_groups/#{identifier}", [202])
end
end

View file

@ -19,7 +19,7 @@ module Fog
Fog::Logger.deprecation("get_account() without a parameter is deprecated, use get_scoped_account instead [light_black](#{caller.first})[/]")
get_scoped_account
else
request("get", "/1.0/accounts/#{identifier}", [200])
wrapped_request("get", "/1.0/accounts/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_api_client(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/api_clients/#{identifier}", [200])
wrapped_request("get", "/1.0/api_clients/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_application(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/applications/#{identifier}", [200])
wrapped_request("get", "/1.0/applications/#{identifier}", [200])
end
end

View file

@ -7,7 +7,7 @@ module Fog
# @return [Hash] The JSON response parsed to a Hash
#
def get_authenticated_user
request("get", "/1.0/user", [200])
wrapped_request("get", "/1.0/user", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_cloud_ip(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/cloud_ips/#{identifier}", [200])
wrapped_request("get", "/1.0/cloud_ips/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_firewall_policy(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/firewall_policies/#{identifier}", [200])
wrapped_request("get", "/1.0/firewall_policies/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_firewall_rule(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/firewall_rules/#{identifier}", [200])
wrapped_request("get", "/1.0/firewall_rules/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_image(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/images/#{identifier}", [200])
wrapped_request("get", "/1.0/images/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_interface(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/interfaces/#{identifier}", [200])
wrapped_request("get", "/1.0/interfaces/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_load_balancer(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/load_balancers/#{identifier}", [200])
wrapped_request("get", "/1.0/load_balancers/#{identifier}", [200])
end
end

View file

@ -6,7 +6,7 @@ module Fog
#
# @return [Hash] The JSON response parsed to a Hash
def get_scoped_account
request("get", "/1.0/account", [200])
wrapped_request("get", "/1.0/account", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_server(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/servers/#{identifier}", [200])
wrapped_request("get", "/1.0/servers/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_server_group(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/server_groups/#{identifier}", [200])
wrapped_request("get", "/1.0/server_groups/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_server_type(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/server_types/#{identifier}", [200])
wrapped_request("get", "/1.0/server_types/#{identifier}", [200])
end
end

View file

@ -19,7 +19,7 @@ module Fog
Fog::Logger.deprecation("get_user() without a parameter is deprecated, use get_authenticated_user instead [light_black](#{caller.first})[/]")
get_authenticated_user
else
request("get", "/1.0/users/#{identifier}", [200])
wrapped_request("get", "/1.0/users/#{identifier}", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def get_zone(identifier)
return nil if identifier.nil? || identifier == ""
request("get", "/1.0/zones/#{identifier}", [200])
wrapped_request("get", "/1.0/zones/#{identifier}", [200])
end
end

View file

@ -8,7 +8,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#account_list_accounts
#
def list_accounts
request("get", "/1.0/accounts", [200])
wrapped_request("get", "/1.0/accounts", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#api_client_list_api_clients
#
def list_api_clients
request("get", "/1.0/api_clients", [200])
wrapped_request("get", "/1.0/api_clients", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#application_list_applications
#
def list_applications
request("get", "/1.0/applications", [200])
wrapped_request("get", "/1.0/applications", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#cloud_ip_list_cloud_ips
#
def list_cloud_ips
request("get", "/1.0/cloud_ips", [200])
wrapped_request("get", "/1.0/cloud_ips", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#firewall_policy_list_firewall_policies
#
def list_firewall_policies
request("get", "/1.0/firewall_policies", [200])
wrapped_request("get", "/1.0/firewall_policies", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#image_list_images
#
def list_images
request("get", "/1.0/images", [200])
wrapped_request("get", "/1.0/images", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#load_balancer_list_load_balancers
#
def list_load_balancers
request("get", "/1.0/load_balancers", [200])
wrapped_request("get", "/1.0/load_balancers", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#server_group_list_server_groups
#
def list_server_groups
request("get", "/1.0/server_groups", [200])
wrapped_request("get", "/1.0/server_groups", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#server_type_list_server_types
#
def list_server_types
request("get", "/1.0/server_types", [200])
wrapped_request("get", "/1.0/server_types", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#server_list_servers
#
def list_servers
request("get", "/1.0/servers", [200])
wrapped_request("get", "/1.0/servers", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#user_list_users
#
def list_users
request("get", "/1.0/users", [200])
wrapped_request("get", "/1.0/users", [200])
end
end

View file

@ -10,7 +10,7 @@ module Fog
# @see https://api.gb1.brightbox.com/1.0/#zone_list_zones
#
def list_zones
request("get", "/1.0/zones", [200])
wrapped_request("get", "/1.0/zones", [200])
end
end

View file

@ -14,7 +14,7 @@ module Fog
#
def map_cloud_ip(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/cloud_ips/#{identifier}/map", [202], options)
wrapped_request("post", "/1.0/cloud_ips/#{identifier}/map", [202], options)
end
end

View file

@ -18,7 +18,7 @@ module Fog
#
def move_servers_server_group(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/server_groups/#{identifier}/move_servers", [202], options)
wrapped_request("post", "/1.0/server_groups/#{identifier}/move_servers", [202], options)
end
end

View file

@ -14,7 +14,7 @@ module Fog
#
def remove_firewall_policy(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/firewall_policies/#{identifier}/remove", [202], options)
wrapped_request("post", "/1.0/firewall_policies/#{identifier}/remove", [202], options)
end
end

View file

@ -14,7 +14,7 @@ module Fog
#
def remove_listeners_load_balancer(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/load_balancers/#{identifier}/remove_listeners", [202], options)
wrapped_request("post", "/1.0/load_balancers/#{identifier}/remove_listeners", [202], options)
end
end

View file

@ -14,7 +14,7 @@ module Fog
#
def remove_nodes_load_balancer(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/load_balancers/#{identifier}/remove_nodes", [202], options)
wrapped_request("post", "/1.0/load_balancers/#{identifier}/remove_nodes", [202], options)
end
end

View file

@ -17,7 +17,7 @@ module Fog
#
def remove_servers_server_group(identifier, options)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/server_groups/#{identifier}/remove_servers", [202], options)
wrapped_request("post", "/1.0/server_groups/#{identifier}/remove_servers", [202], options)
end
end

View file

@ -22,7 +22,7 @@ module Fog
Fog::Logger.deprecation("reset_ftp_password_account() without a parameter is deprecated, use reset_ftp_password_scoped_account instead [light_black](#{caller.first})[/]")
reset_ftp_password_scoped_account
else
request("post", "/1.0/accounts/#{identifier}/reset_ftp_password", [200])
wrapped_request("post", "/1.0/accounts/#{identifier}/reset_ftp_password", [200])
end
end

View file

@ -9,7 +9,7 @@ module Fog
# @return [Hash] The JSON response parsed to a Hash
#
def reset_ftp_password_scoped_account
request("post", "/1.0/account/reset_ftp_password", [200])
wrapped_request("post", "/1.0/account/reset_ftp_password", [200])
end
end

View file

@ -17,7 +17,7 @@ module Fog
#
def reset_secret_api_client(identifier)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/api_clients/#{identifier}/reset_secret", [200])
wrapped_request("post", "/1.0/api_clients/#{identifier}/reset_secret", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def reset_secret_application(identifier)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/applications/#{identifier}/reset_secret", [200])
wrapped_request("post", "/1.0/applications/#{identifier}/reset_secret", [200])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def shutdown_server(identifier)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/servers/#{identifier}/shutdown", [202])
wrapped_request("post", "/1.0/servers/#{identifier}/shutdown", [202])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def snapshot_server(identifier)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/servers/#{identifier}/snapshot", [202])
wrapped_request("post", "/1.0/servers/#{identifier}/snapshot", [202])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def start_server(identifier)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/servers/#{identifier}/start", [202])
wrapped_request("post", "/1.0/servers/#{identifier}/start", [202])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def stop_server(identifier)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/servers/#{identifier}/stop", [202])
wrapped_request("post", "/1.0/servers/#{identifier}/stop", [202])
end
end

View file

@ -12,7 +12,7 @@ module Fog
#
def unmap_cloud_ip(identifier)
return nil if identifier.nil? || identifier == ""
request("post", "/1.0/cloud_ips/#{identifier}/unmap", [202])
wrapped_request("post", "/1.0/cloud_ips/#{identifier}/unmap", [202])
end
end

View file

@ -50,7 +50,7 @@ module Fog
Fog::Logger.deprecation("update_account() without a parameter is deprecated, use update_scoped_account instead [light_black](#{caller.first})[/]")
update_scoped_account(options)
else
request("put", "/1.0/accounts/#{identifier}", [200], options)
wrapped_request("put", "/1.0/accounts/#{identifier}", [200], options)
end
end

View file

@ -16,7 +16,7 @@ module Fog
def update_api_client(identifier, options)
return nil if identifier.nil? || identifier == ""
return nil if options.empty? || options.nil?
request("put", "/1.0/api_clients/#{identifier}", [200], options)
wrapped_request("put", "/1.0/api_clients/#{identifier}", [200], options)
end
end

View file

@ -16,7 +16,7 @@ module Fog
def update_application(identifier, options)
return nil if identifier.nil? || identifier == ""
return nil if options.empty? || options.nil?
request("put", "/1.0/applications/#{identifier}", [200], options)
wrapped_request("put", "/1.0/applications/#{identifier}", [200], options)
end
end

View file

@ -17,7 +17,7 @@ module Fog
def update_cloud_ip(identifier, options)
return nil if identifier.nil? || identifier == ""
return nil if options.empty? || options.nil?
request("put", "/1.0/cloud_ips/#{identifier}", [200], options)
wrapped_request("put", "/1.0/cloud_ips/#{identifier}", [200], options)
end
end

View file

@ -21,7 +21,7 @@ module Fog
def update_firewall_rule(identifier, options)
return nil if identifier.nil? || identifier == ""
return nil if options.empty? || options.nil?
request("put", "/1.0/firewall_rules/#{identifier}", [202], options)
wrapped_request("put", "/1.0/firewall_rules/#{identifier}", [202], options)
end
end

View file

@ -21,7 +21,7 @@ module Fog
def update_image(identifier, options)
return nil if identifier.nil? || identifier == ""
return nil if options.empty? || options.nil?
request("put", "/1.0/images/#{identifier}", [200], options)
wrapped_request("put", "/1.0/images/#{identifier}", [200], options)
end
end

View file

@ -19,7 +19,7 @@ module Fog
def update_load_balancer(identifier, options)
return nil if identifier.nil? || identifier == ""
return nil if options.empty? || options.nil?
request("put", "/1.0/load_balancers/#{identifier}", [202], options)
wrapped_request("put", "/1.0/load_balancers/#{identifier}", [202], options)
end
end

View file

@ -21,7 +21,7 @@ module Fog
#
def update_scoped_account(options)
return nil if options.empty? || options.nil?
request("put", "/1.0/account", [200], options)
wrapped_request("put", "/1.0/account", [200], options)
end
end

View file

@ -16,7 +16,7 @@ module Fog
def update_server(identifier, options)
return nil if identifier.nil? || identifier == ""
return nil if options.empty? || options.nil?
request("put", "/1.0/servers/#{identifier}", [200], options)
wrapped_request("put", "/1.0/servers/#{identifier}", [200], options)
end
end

View file

@ -16,7 +16,7 @@ module Fog
def update_server_group(identifier, options)
return nil if identifier.nil? || identifier == ""
return nil if options.empty? || options.nil?
request("put", "/1.0/server_groups/#{identifier}", [202], options)
wrapped_request("put", "/1.0/server_groups/#{identifier}", [202], options)
end
end

View file

@ -19,7 +19,7 @@ module Fog
def update_user(identifier, options)
return nil if identifier.nil? || identifier == ""
return nil if options.empty? || options.nil?
request("put", "/1.0/users/#{identifier}", [200], options)
wrapped_request("put", "/1.0/users/#{identifier}", [200], options)
end
end