From ccbf77da490adf698bc1d5081b991887903693a2 Mon Sep 17 00:00:00 2001 From: Joe Heald Date: Wed, 6 Apr 2022 16:26:42 -0400 Subject: [PATCH 1/9] class name bugs --- lib/fog/rackspace.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb index 3b8e9aa..d0c33bc 100644 --- a/lib/fog/rackspace.rb +++ b/lib/fog/rackspace.rb @@ -50,9 +50,9 @@ module Rackspace service(:auto_scale, 'AutoScale') service(:block_storage, 'BlockStorage') service(:cdn, 'CDN') - service(:cdn_v2, 'CDN v2') + service(:cdn_v2, 'CDNV2') service(:compute, 'Compute') - service(:compute_v2, 'Compute v2') + service(:compute_v2, 'ComputeV2') service(:dns, 'DNS') service(:storage, 'Storage') service(:load_balancers, 'LoadBalancers') From 473e983cb9934f8583a8fdbbffe90f80fda657f9 Mon Sep 17 00:00:00 2001 From: Marc Hassman Date: Thu, 19 Jan 2023 15:40:11 -0600 Subject: [PATCH 2/9] flip modules and update pathing for Storage service --- .gitignore | 1 + lib/fog/rackspace.rb | 4 ---- .../rackspace/requests/storage/copy_object.rb | 12 ++++++------ .../requests/storage/delete_container.rb | 12 ++++++------ .../requests/storage/delete_multiple_objects.rb | 12 ++++++------ .../rackspace/requests/storage/delete_object.rb | 12 ++++++------ .../storage/delete_static_large_object.rb | 14 +++++++------- .../requests/storage/extract_archive.rb | 12 ++++++------ .../rackspace/requests/storage/get_container.rb | 12 ++++++------ .../rackspace/requests/storage/get_containers.rb | 12 ++++++------ lib/fog/rackspace/requests/storage/get_object.rb | 12 ++++++------ .../requests/storage/get_object_http_url.rb | 12 ++++++------ .../requests/storage/get_object_https_url.rb | 12 ++++++------ .../rackspace/requests/storage/head_container.rb | 12 ++++++------ .../requests/storage/head_containers.rb | 12 ++++++------ .../rackspace/requests/storage/head_object.rb | 12 ++++++------ .../storage/post_set_meta_temp_url_key.rb | 12 ++++++------ .../rackspace/requests/storage/put_container.rb | 12 ++++++------ .../requests/storage/put_dynamic_obj_manifest.rb | 12 ++++++------ lib/fog/rackspace/requests/storage/put_object.rb | 14 +++++++------- .../requests/storage/put_object_manifest.rb | 4 ++-- .../requests/storage/put_static_obj_manifest.rb | 16 ++++++++-------- lib/fog/rackspace/storage.rb | 8 ++++---- 23 files changed, 125 insertions(+), 128 deletions(-) diff --git a/.gitignore b/.gitignore index 9326f79..2813c09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.idea/ /.bundle/ /.yardoc /Gemfile.lock diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb index d0c33bc..0b7b3f9 100644 --- a/lib/fog/rackspace.rb +++ b/lib/fog/rackspace.rb @@ -16,10 +16,6 @@ module DNS autoload :Rackspace, File.expand_path('../rackspace/dns', __FILE__) end - module Storage - autoload :Rackspace, File.expand_path('../rackspace/storage', __FILE__) - end - module Rackspace autoload :Errors, File.expand_path('../rackspace/errors', __FILE__) autoload :MockData, File.expand_path('../rackspace/mock_data', __FILE__) diff --git a/lib/fog/rackspace/requests/storage/copy_object.rb b/lib/fog/rackspace/requests/storage/copy_object.rb index b53a144..da80afe 100644 --- a/lib/fog/rackspace/requests/storage/copy_object.rb +++ b/lib/fog/rackspace/requests/storage/copy_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Copy object # @@ -10,10 +10,10 @@ class Real # * target_container_name<~String> - Name of bucket to create copy in # * target_object_name<~String> - Name for new copy of object # * options<~Hash> - Additional headers - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def copy_object(source_container_name, source_object_name, target_container_name, target_object_name, options={}) headers = { 'X-Copy-From' => "/#{source_container_name}/#{source_object_name}" }.merge(options) request({ diff --git a/lib/fog/rackspace/requests/storage/delete_container.rb b/lib/fog/rackspace/requests/storage/delete_container.rb index 86469d3..1ab5c65 100644 --- a/lib/fog/rackspace/requests/storage/delete_container.rb +++ b/lib/fog/rackspace/requests/storage/delete_container.rb @@ -1,15 +1,15 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Delete an existing container # # ==== Parameters # * name<~String> - Name of container to delete - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def delete_container(name) request( :expects => 204, diff --git a/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb b/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb index 8bd67fc..483535f 100644 --- a/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb +++ b/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Deletes multiple objects or containers with a single request. # @@ -43,10 +43,10 @@ class Real # * "Number Deleted" [Integer] - Number of objects or containers deleted. # * "Response Body" [String] - Response body for "Response Status". # - # @raise [Fog::Storage::Rackspace::NotFound] HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @raise [Excon::Errors::Unauthorized] HTTP 401 # # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Bulk_Delete-d1e2338.html diff --git a/lib/fog/rackspace/requests/storage/delete_object.rb b/lib/fog/rackspace/requests/storage/delete_object.rb index 08071d0..bf62c58 100644 --- a/lib/fog/rackspace/requests/storage/delete_object.rb +++ b/lib/fog/rackspace/requests/storage/delete_object.rb @@ -1,16 +1,16 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Delete an existing object # # ==== Parameters # * container<~String> - Name of container to delete # * object<~String> - Name of object to delete - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def delete_object(container, object) request( :expects => 204, diff --git a/lib/fog/rackspace/requests/storage/delete_static_large_object.rb b/lib/fog/rackspace/requests/storage/delete_static_large_object.rb index 18e7e65..2dcc814 100644 --- a/lib/fog/rackspace/requests/storage/delete_static_large_object.rb +++ b/lib/fog/rackspace/requests/storage/delete_static_large_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Delete a static large object. # @@ -22,10 +22,10 @@ class Real # * "Number Deleted" [Integer] - Number of segments deleted. # * "Response Body" [String] - Response body for Response Status. # - # @raise [Fog::Storage::Rackspace::NotFound] HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @raise [Excon::Errors::Unauthorized] HTTP 401 # # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Deleting_a_Large_Object-d1e2228.html @@ -52,7 +52,7 @@ def delete_static_large_object(container, object, options = {}) return not_found(object) unless o # What happens if o isn't a static large object? - raise Fog::Storage::Rackspace::BadRequest.new unless o.static_manifest? + raise Fog::Rackspace::Storage::BadRequest.new unless o.static_manifest? segments = Fog::JSON.decode(o.body) paths = segments.map { |s| s['path'] } diff --git a/lib/fog/rackspace/requests/storage/extract_archive.rb b/lib/fog/rackspace/requests/storage/extract_archive.rb index 2305002..07bc2ab 100644 --- a/lib/fog/rackspace/requests/storage/extract_archive.rb +++ b/lib/fog/rackspace/requests/storage/extract_archive.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Extract Archive # @@ -11,10 +11,10 @@ class Real # * data<~String|File> - file to upload # * archive_format<~String> - "tar", "tar.gz", or "tar.bz2" - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def extract_archive(container, data, archive_format) data = Fog::Storage.parse_data(data) headers = data[:headers] diff --git a/lib/fog/rackspace/requests/storage/get_container.rb b/lib/fog/rackspace/requests/storage/get_container.rb index 04f6045..41ad4ec 100644 --- a/lib/fog/rackspace/requests/storage/get_container.rb +++ b/lib/fog/rackspace/requests/storage/get_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Get details for container and total bytes stored # @@ -27,10 +27,10 @@ class Real # * 'hash'<~String> - Hash of object (etag?) # * 'last_modified'<~String> - Last modified timestamp # * 'name'<~String> - Name of object - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def get_container(container, options = {}) options = options.reject {|key, value| value.nil?} request( diff --git a/lib/fog/rackspace/requests/storage/get_containers.rb b/lib/fog/rackspace/requests/storage/get_containers.rb index a4ef782..e9458a8 100644 --- a/lib/fog/rackspace/requests/storage/get_containers.rb +++ b/lib/fog/rackspace/requests/storage/get_containers.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # List existing storage containers # @@ -16,10 +16,10 @@ class Real # * 'bytes'<~Integer>: - Number of bytes used by container # * 'count'<~Integer>: - Number of items in container # * 'name'<~String>: - Name of container - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def get_containers(options = {}) options = options.reject {|key, value| value.nil?} request( diff --git a/lib/fog/rackspace/requests/storage/get_object.rb b/lib/fog/rackspace/requests/storage/get_object.rb index c0d12c0..a4b2507 100644 --- a/lib/fog/rackspace/requests/storage/get_object.rb +++ b/lib/fog/rackspace/requests/storage/get_object.rb @@ -1,16 +1,16 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Get details for object # # ==== Parameters # * container<~String> - Name of container to look in # * object<~String> - Name of object to look for - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def get_object(container, object, &block) params = { :expects => 200, diff --git a/lib/fog/rackspace/requests/storage/get_object_http_url.rb b/lib/fog/rackspace/requests/storage/get_object_http_url.rb index 7e0612a..1f83be2 100644 --- a/lib/fog/rackspace/requests/storage/get_object_http_url.rb +++ b/lib/fog/rackspace/requests/storage/get_object_http_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage module Common # Get an expiring object http url from Cloud Files # @@ -12,10 +12,10 @@ module Common # ==== Returns # * response<~Excon::Response>: # * body<~String> - url for object - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # ==== See Also # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html def get_object_http_url(container, object, expires, options = {}) diff --git a/lib/fog/rackspace/requests/storage/get_object_https_url.rb b/lib/fog/rackspace/requests/storage/get_object_https_url.rb index e7ad612..090ca54 100644 --- a/lib/fog/rackspace/requests/storage/get_object_https_url.rb +++ b/lib/fog/rackspace/requests/storage/get_object_https_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage module Common # Get an expiring object https url from Cloud Files # @@ -13,10 +13,10 @@ module Common # ==== Returns # * response<~Excon::Response>: # * body<~String> - url for object - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # ==== See Also # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html def get_object_https_url(container, object, expires, options = {}) diff --git a/lib/fog/rackspace/requests/storage/head_container.rb b/lib/fog/rackspace/requests/storage/head_container.rb index 55d9757..3f6a302 100644 --- a/lib/fog/rackspace/requests/storage/head_container.rb +++ b/lib/fog/rackspace/requests/storage/head_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # List number of objects and total bytes stored # @@ -12,10 +12,10 @@ class Real # * headers<~Hash>: # * 'X-Container-Object-Count'<~String> - Count of containers # * 'X-Container-Bytes-Used'<~String> - Bytes used - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def head_container(container) request( :expects => 204, diff --git a/lib/fog/rackspace/requests/storage/head_containers.rb b/lib/fog/rackspace/requests/storage/head_containers.rb index 5fecba3..c6c8604 100644 --- a/lib/fog/rackspace/requests/storage/head_containers.rb +++ b/lib/fog/rackspace/requests/storage/head_containers.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # List number of containers and total bytes stored # @@ -9,10 +9,10 @@ class Real # * headers<~Hash>: # * 'X-Account-Container-Count'<~String> - Count of containers # * 'X-Account-Bytes-Used'<~String> - Bytes used - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def head_containers request( :expects => 204, diff --git a/lib/fog/rackspace/requests/storage/head_object.rb b/lib/fog/rackspace/requests/storage/head_object.rb index 49a3f38..2675f9d 100644 --- a/lib/fog/rackspace/requests/storage/head_object.rb +++ b/lib/fog/rackspace/requests/storage/head_object.rb @@ -1,16 +1,16 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Get headers for object # # ==== Parameters # * container<~String> - Name of container to look in # * object<~String> - Name of object to look for - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def head_object(container, object) request({ :expects => 200, diff --git a/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb b/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb index b21649f..cc0ae39 100644 --- a/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb +++ b/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Set the account wide Temp URL Key. This is a secret key that's # used to generate signed expiring URLs. @@ -17,10 +17,10 @@ class Real # # ==== Returns # * response<~Excon::Response> - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # ==== See Also # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Set_Account_Metadata-d1a4460.html def post_set_meta_temp_url_key(key) diff --git a/lib/fog/rackspace/requests/storage/put_container.rb b/lib/fog/rackspace/requests/storage/put_container.rb index 344e07d..d9d8bce 100644 --- a/lib/fog/rackspace/requests/storage/put_container.rb +++ b/lib/fog/rackspace/requests/storage/put_container.rb @@ -1,15 +1,15 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Create a new container # # ==== Parameters # * name<~String> - Name for container, should be < 256 bytes and must not contain '/' - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def put_container(name, options={}) if name =~ /\// raise Fog::Errors::Error.new('Folder names cannot include "/".') diff --git a/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb b/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb index 68859c9..450b563 100644 --- a/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb +++ b/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Create a new dynamic large object manifest # @@ -19,10 +19,10 @@ class Real # @param options [Hash] Config headers for +object+. # @option options [String] 'X-Object-Manifest' ("container/object") "/" for segment objects. # - # @raise [Fog::Storage::Rackspace::NotFound] HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @raise [Excon::Errors::Unauthorized] # # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Large_Object_Creation-d1e2019.html diff --git a/lib/fog/rackspace/requests/storage/put_object.rb b/lib/fog/rackspace/requests/storage/put_object.rb index 04147d2..a7bcce1 100644 --- a/lib/fog/rackspace/requests/storage/put_object.rb +++ b/lib/fog/rackspace/requests/storage/put_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Create a new object # @@ -14,10 +14,10 @@ class Real # * data<~String|File> - data to upload # * options<~Hash> - config headers for object. Defaults to #{}. # * block<~Proc> - chunker - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def put_object(container, object, data, options = {}, &block) data = Fog::Storage.parse_data(data) headers = data[:headers].merge!(options) @@ -64,7 +64,7 @@ def put_object(container, object, data, options = {}, &block) etag = o.meta['Etag'] if etag && etag != o.hash c.remove_object object - raise Fog::Storage::Rackspace::ServiceError.new + raise Fog::Rackspace::Storage::ServiceError.new end response = Excon::Response.new diff --git a/lib/fog/rackspace/requests/storage/put_object_manifest.rb b/lib/fog/rackspace/requests/storage/put_object_manifest.rb index 47fe599..81bc811 100644 --- a/lib/fog/rackspace/requests/storage/put_object_manifest.rb +++ b/lib/fog/rackspace/requests/storage/put_object_manifest.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage module Common # Create a new dynamic large object manifest # diff --git a/lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb b/lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb index 8045ba4..127ea84 100644 --- a/lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb +++ b/lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Real # Create a new static large object manifest. # @@ -33,10 +33,10 @@ class Real # @param segments [Array] Segment data for the object. # @param options [Hash] Config headers for +object+. # - # @raise [Fog::Storage::Rackspace::NotFound] HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @raise [Excon::Errors::Unauthorized] HTTP 401 # # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Uploading_the_Manifext-d1e2227.html @@ -62,7 +62,7 @@ def put_static_obj_manifest(container, object, segments, options = {}) cname, oname = segment[:path].split('/', 2) target_container = mock_container(cname) - raise Fog::Storage::Rackspace::NotFound.new unless target_container + raise Fog::Rackspace::Storage::NotFound.new unless target_container target_object = target_container.mock_object oname unless target_object @@ -85,7 +85,7 @@ def put_static_obj_manifest(container, object, segments, options = {}) response.body = Fog::JSON.encode({ 'Errors' => errors }) error = Excon::Errors.status_error({}, response) - raise Fog::Storage::Rackspace::BadRequest.slurp(error) + raise Fog::Rackspace::Storage::BadRequest.slurp(error) end data = Fog::JSON.encode(segments) diff --git a/lib/fog/rackspace/storage.rb b/lib/fog/rackspace/storage.rb index d29c3f3..008780f 100644 --- a/lib/fog/rackspace/storage.rb +++ b/lib/fog/rackspace/storage.rb @@ -1,8 +1,8 @@ module Fog - module Storage - class Rackspace < Fog::Service + module Rackspace + class Storage < Fog::Service include Fog::Rackspace::Errors class ServiceError < Fog::Rackspace::Errors::ServiceError; end @@ -118,7 +118,7 @@ def endpoint_uri(service_endpoint_url=nil) # Return Account Details # @return [Fog::Storage::Rackspace::Account] account details object def account - account = Fog::Storage::Rackspace::Account.new(:service => self) + account = Fog::Rackspace::Storage::Account.new(:service => self) account.reload end end @@ -182,7 +182,7 @@ def mock_object(name) # @return [MockObject] The object within this container with the # specified name. def mock_object!(name) - mock_object(name) or raise Fog::Storage::Rackspace::NotFound.new + mock_object(name) or raise Fog::Rackspace::Storage::NotFound.new end # Add a new MockObject to this container. An existing object with From b887bfc7ed8438c1325ac1b6de07acbd2a5428c7 Mon Sep 17 00:00:00 2001 From: m h Date: Fri, 20 Jan 2023 21:16:31 -0600 Subject: [PATCH 3/9] flip more modules' --- lib/fog/rackspace.rb | 15 +--- lib/fog/rackspace/cdn.rb | 36 ++++---- lib/fog/rackspace/compute.rb | 4 +- lib/fog/rackspace/compute_v2.rb | 4 +- lib/fog/rackspace/dns.rb | 4 +- lib/fog/rackspace/docs/storage.md | 18 ++-- lib/fog/rackspace/models/storage/account.rb | 18 ++-- .../rackspace/models/storage/directories.rb | 24 +++--- lib/fog/rackspace/models/storage/directory.rb | 82 +++++++++--------- lib/fog/rackspace/models/storage/file.rb | 86 +++++++++---------- lib/fog/rackspace/models/storage/files.rb | 58 ++++++------- lib/fog/rackspace/models/storage/metadata.rb | 10 +-- .../rackspace/requests/cdn/delete_object.rb | 8 +- .../rackspace/requests/cdn/get_containers.rb | 8 +- .../rackspace/requests/cdn/head_container.rb | 10 +-- .../rackspace/requests/cdn/post_container.rb | 10 +-- .../rackspace/requests/cdn/put_container.rb | 8 +- lib/fog/rackspace/storage.rb | 10 +-- lib/fog/rackspace/version.rb | 2 +- 19 files changed, 201 insertions(+), 214 deletions(-) diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb index 0b7b3f9..e74c9ff 100644 --- a/lib/fog/rackspace.rb +++ b/lib/fog/rackspace.rb @@ -3,19 +3,6 @@ require 'fog/json' module Fog - module CDN - autoload :Rackspace, File.expand_path('../rackspace/cdn', __FILE__) - end - - module Compute - autoload :Rackspace, File.expand_path('../rackspace/compute', __FILE__) - autoload :RackspaceV2, File.expand_path('../rackspace/compute_v2', __FILE__) - end - - module DNS - autoload :Rackspace, File.expand_path('../rackspace/dns', __FILE__) - end - module Rackspace autoload :Errors, File.expand_path('../rackspace/errors', __FILE__) autoload :MockData, File.expand_path('../rackspace/mock_data', __FILE__) @@ -62,7 +49,7 @@ module Rackspace def self.authenticate(options, connection_options = {}) rackspace_auth_url = options[:rackspace_auth_url] - rackspace_auth_url ||= options[:rackspace_endpoint] == Fog::Compute::RackspaceV2::LON_ENDPOINT ? UK_AUTH_ENDPOINT : US_AUTH_ENDPOINT + rackspace_auth_url ||= options[:rackspace_endpoint] == Fog::Rackspace::ComputeV2::LON_ENDPOINT ? UK_AUTH_ENDPOINT : US_AUTH_ENDPOINT url = rackspace_auth_url.match(/^https?:/) ? \ rackspace_auth_url : 'https://' + rackspace_auth_url uri = URI.parse(url) diff --git a/lib/fog/rackspace/cdn.rb b/lib/fog/rackspace/cdn.rb index 9ee9f26..0afe97a 100644 --- a/lib/fog/rackspace/cdn.rb +++ b/lib/fog/rackspace/cdn.rb @@ -1,8 +1,8 @@ module Fog - module CDN - class Rackspace < Fog::Service + module Rackspace + class CDN < Fog::Service requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :persistent, :rackspace_cdn_ssl, :rackspace_region, :rackspace_cdn_url @@ -55,13 +55,13 @@ def endpoint_uri(service_endpoint_url=nil) end # Publish container to CDN - # @param [Fog::Storage::Rackspace::Directory] container directory to publish + # @param [Fog::Rackspace::Storage::Directory] container directory to publish # @param [Boolean] publish If true directory is published. If false directory is unpublished. # @return [Hash] hash containing urls for published container - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def publish_container(container, publish = true) enabled = publish ? 'True' : 'False' response = put_container(container.key, 'X-Cdn-Enabled' => enabled) @@ -70,11 +70,11 @@ def publish_container(container, publish = true) end # Returns hash of urls for container - # @param [Fog::Storage::Rackspace::Directory] container to retrieve urls for + # @param [Fog::Rackspace::Storage::Directory] container to retrieve urls for # @return [Hash] hash containing urls for published container - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @note If unable to find container or container is not published this method will return an empty hash. def urls(container) begin @@ -122,7 +122,7 @@ def data end def purge(object) - return true if object.is_a? Fog::Storage::Rackspace::File + return true if object.is_a? Fog::Rackspace::Storage::File raise Fog::Errors::NotImplemented.new("#{object.class} does not support CDN purging") if object end @@ -152,10 +152,10 @@ def reload end # Purges File - # @param [Fog::Storage::Rackspace::File] file to be purged from the CDN + # @param [Fog::Rackspace::Storage::File] file to be purged from the CDN # @raise [Fog::Errors::NotImplemented] returned when non file parameters are specified def purge(file) - unless file.is_a? Fog::Storage::Rackspace::File + unless file.is_a? Fog::Rackspace::Storage::File raise Fog::Errors::NotImplemented.new("#{object.class} does not support CDN purging") if object end @@ -166,13 +166,13 @@ def purge(file) def request(params, parse_json = true) super rescue Excon::Errors::NotFound => error - raise Fog::Storage::Rackspace::NotFound.slurp(error, self) + raise Fog::Rackspace::Storage::NotFound.slurp(error, self) rescue Excon::Errors::BadRequest => error - raise Fog::Storage::Rackspace::BadRequest.slurp(error, self) + raise Fog::Rackspace::Storage::BadRequest.slurp(error, self) rescue Excon::Errors::InternalServerError => error - raise Fog::Storage::Rackspace::InternalServerError.slurp(error, self) + raise Fog::Rackspace::Storage::InternalServerError.slurp(error, self) rescue Excon::Errors::HTTPStatusError => error - raise Fog::Storage::Rackspace::ServiceError.slurp(error, self) + raise Fog::Rackspace::Storage::ServiceError.slurp(error, self) end private diff --git a/lib/fog/rackspace/compute.rb b/lib/fog/rackspace/compute.rb index 6ee4884..3565c5d 100644 --- a/lib/fog/rackspace/compute.rb +++ b/lib/fog/rackspace/compute.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class Rackspace < Fog::Service + module Rackspace + class Compute < Fog::Service include Fog::Rackspace::Errors class ServiceError < Fog::Rackspace::Errors::ServiceError; end diff --git a/lib/fog/rackspace/compute_v2.rb b/lib/fog/rackspace/compute_v2.rb index db22b74..45a4013 100644 --- a/lib/fog/rackspace/compute_v2.rb +++ b/lib/fog/rackspace/compute_v2.rb @@ -1,8 +1,8 @@ module Fog - module Compute - class RackspaceV2 < Fog::Service + module Rackspace + class ComputeV2 < Fog::Service include Fog::Rackspace::Errors class ServiceError < Fog::Rackspace::Errors::ServiceError; end diff --git a/lib/fog/rackspace/dns.rb b/lib/fog/rackspace/dns.rb index 0992d6d..187197c 100644 --- a/lib/fog/rackspace/dns.rb +++ b/lib/fog/rackspace/dns.rb @@ -1,8 +1,8 @@ module Fog - module DNS - class Rackspace < Fog::Service + module Rackspace + class DNS < Fog::Service include Fog::Rackspace::Errors class ServiceError < Fog::Rackspace::Errors::ServiceError; end diff --git a/lib/fog/rackspace/docs/storage.md b/lib/fog/rackspace/docs/storage.md index 45ea278..2a2b6b7 100644 --- a/lib/fog/rackspace/docs/storage.md +++ b/lib/fog/rackspace/docs/storage.md @@ -245,17 +245,17 @@ To retrieve a list of directories: service.directories -This returns a collection of `Fog::Storage::Rackspace::Directory` models: +This returns a collection of `Fog::Rackspace::Storage::Directory` models: - , - 'http://cdn.lunenburg.org') # files = directory.files @@ -53,7 +53,7 @@ def get(key, options = {}) directory.files << directory.files.new(file) end directory - rescue Fog::Storage::Rackspace::NotFound + rescue Fog::Rackspace::Storage::NotFound nil end end diff --git a/lib/fog/rackspace/models/storage/directory.rb b/lib/fog/rackspace/models/storage/directory.rb index e41bef5..03c50de 100644 --- a/lib/fog/rackspace/models/storage/directory.rb +++ b/lib/fog/rackspace/models/storage/directory.rb @@ -34,32 +34,32 @@ class Directory < Fog::Model attr_writer :public_url # Set directory metadata - # @param [Hash,Fog::Storage::Rackspace::Metadata] hash contains key value pairs + # @param [Hash,Fog::Rackspace::Storage::Metadata] hash contains key value pairs def metadata=(hash) - if hash.is_a? Fog::Storage::Rackspace::Metadata + if hash.is_a? Fog::Rackspace::Storage::Metadata attributes[:metadata] = hash else - attributes[:metadata] = Fog::Storage::Rackspace::Metadata.new(self, hash) + attributes[:metadata] = Fog::Rackspace::Storage::Metadata.new(self, hash) end attributes[:metadata] end # Retrieve directory metadata - # @return [Fog::Storage::Rackspace::Metadata] metadata key value pairs. + # @return [Fog::Rackspace::Storage::Metadata] metadata key value pairs. def metadata unless attributes[:metadata] response = service.head_container(key) - attributes[:metadata] = Fog::Storage::Rackspace::Metadata.from_headers(self, response.headers) + attributes[:metadata] = Fog::Rackspace::Storage::Metadata.from_headers(self, response.headers) end attributes[:metadata] end # Destroy the directory and remove it from CDN # @return [Boolean] returns true if directory was deleted - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @note Directory must be empty before it is destroyed. # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Delete_Container-d1e1765.html def destroy @@ -72,14 +72,14 @@ def destroy end # Returns collection of files in directory - # @return [Fog::Storage::Rackspace::Files] collection of files in directory - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @return [Fog::Rackspace::Storage::Files] collection of files in directory + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def files @files ||= begin - Fog::Storage::Rackspace::Files.new( + Fog::Rackspace::Storage::Files.new( :directory => self, :service => service ) @@ -88,10 +88,10 @@ def files # Is directory published to CDN # @return [Boolean] return true if published to CDN - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def public? if @public.nil? @public ||= (key && public_url) ? true : false @@ -100,11 +100,11 @@ def public? end # Reload directory with latest data from Cloud Files - # @return [Fog::Storage::Rackspace::Directory] returns itself - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @return [Fog::Rackspace::Storage::Directory] returns itself + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def reload @public = nil @urls = nil @@ -121,10 +121,10 @@ def reload # 3. return the default CDN url. # # @return [String] public url for directory - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def public_url return nil if urls.empty? return urls[:ssl_uri] if service.ssl? @@ -133,10 +133,10 @@ def public_url # URL used to stream video to iOS devices. Cloud Files will auto convert to the approprate format. # @return [String] iOS URL - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/iOS-Streaming-d1f3725.html def ios_url urls[:ios_uri] @@ -144,10 +144,10 @@ def ios_url # URL used to stream resources # @return [String] streaming url - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Streaming-CDN-Enabled_Containers-d1f3721.html def streaming_url urls[:streaming_uri] @@ -155,10 +155,10 @@ def streaming_url # Create or update directory and associated metadata # @return [Boolean] returns true if directory was saved - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @note If public attribute is true, directory will be CDN enabled # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_Container-d1e1694.html def save @@ -167,7 +167,7 @@ def save if cdn_enabled? @urls = service.cdn.publish_container(self, public?) else - raise Fog::Storage::Rackspace::Error.new("Directory can not be set as :public without a CDN provided") if public? + raise Fog::Rackspace::Storage::Error.new("Directory can not be set as :public without a CDN provided") if public? end true end diff --git a/lib/fog/rackspace/models/storage/file.rb b/lib/fog/rackspace/models/storage/file.rb index bdc011d..2ebc233 100644 --- a/lib/fog/rackspace/models/storage/file.rb +++ b/lib/fog/rackspace/models/storage/file.rb @@ -58,7 +58,7 @@ class File < Fog::Model attribute :delete_after, :aliases => ['X-Delete-After'] # @!attribute [r] directory - # @return [Fog::Storage::Rackspace::Directory] directory containing file + # @return [Fog::Rackspace::Storage::Directory] directory containing file attr_accessor :directory # @!attribute [w] public @@ -66,14 +66,14 @@ class File < Fog::Model attr_writer :public # Returns the body/contents of file - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @example Retrieve and download contents of Cloud Files object to file system # file_object = directory.files.get('germany.jpg') # File.open('germany.jpg', 'w') {|f| f.write(file_object.body) } - # @see Fog::Storage::Rackspace::Files#get + # @see Fog::Rackspace::Storage::Files#get def body attributes[:body] ||= if last_modified collection.get(identity).body @@ -92,10 +92,10 @@ def body=(new_body) # @param [String] target_directory_key # @param [String] target_file_key # @param options [Hash] used to pass in file attributes - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Copy_Object-d1e2241.html def copy(target_directory_key, target_file_key, options={}) requires :directory, :key @@ -110,10 +110,10 @@ def copy(target_directory_key, target_file_key, options={}) # Destroy the file # @return [Boolean] returns true if file is destroyed - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Delete_Object-d1e2264.html def destroy requires :directory, :key @@ -122,20 +122,20 @@ def destroy end # Set file metadata - # @param [Hash,Fog::Storage::Rackspace::Metadata] hash contains key value pairs + # @param [Hash,Fog::Rackspace::Storage::Metadata] hash contains key value pairs def metadata=(hash) - if hash.is_a? Fog::Storage::Rackspace::Metadata + if hash.is_a? Fog::Rackspace::Storage::Metadata attributes[:metadata] = hash else - attributes[:metadata] = Fog::Storage::Rackspace::Metadata.new(self, hash) + attributes[:metadata] = Fog::Rackspace::Storage::Metadata.new(self, hash) end attributes[:metadata] end # File metadata - # @return [Fog::Storage::Rackspace::Metadata] metadata key value pairs. + # @return [Fog::Rackspace::Storage::Metadata] metadata key value pairs. def metadata - attributes[:metadata] ||= Fog::Storage::Rackspace::Metadata.new(self) + attributes[:metadata] ||= Fog::Rackspace::Storage::Metadata.new(self) end # Required for compatibility with other Fog providers. Not Used. @@ -168,10 +168,10 @@ def last_modified=(obj) # Is file published to CDN # @return [Boolean] return true if published to CDN - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def public? directory.public? end @@ -203,20 +203,20 @@ def url(expires, options = {}) # 3. return the default CDN url. # # @return [String] public url for file - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def public_url Files::file_url directory.public_url, key end # URL used to stream video to iOS devices without needing to convert your video # @return [String] iOS URL - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/iOS-Streaming-d1f3725.html def ios_url Files::file_url directory.ios_url, key @@ -224,20 +224,20 @@ def ios_url # URL used to stream resources # @return [String] streaming url - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Streaming-CDN-Enabled_Containers-d1f3721.html def streaming_url Files::file_url directory.streaming_url, key end # Immediately purge file from the CDN network - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @note You may only PURGE up to 25 objects per day. Any attempt to purge more than this will result in a 498 status code error (Rate Limited). # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Purge_CDN-Enabled_Objects-d1e3858.html def purge_from_cdn @@ -250,10 +250,10 @@ def purge_from_cdn # Create or updates file and associated metadata # @param options [Hash] additional parameters to pass to Cloud Files - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_Update_Object-d1e1965.html def save(options = {}) requires :body, :directory, :key diff --git a/lib/fog/rackspace/models/storage/files.rb b/lib/fog/rackspace/models/storage/files.rb index e97341d..0ddeba3 100644 --- a/lib/fog/rackspace/models/storage/files.rb +++ b/lib/fog/rackspace/models/storage/files.rb @@ -29,14 +29,14 @@ class Files < Fog::Collection # @return [String] For a string value x, causes the results to be limited to object names beginning with the substring x. attribute :prefix - model Fog::Storage::Rackspace::File + model Fog::Rackspace::Storage::File # Returns list of files - # @return [Fog::Storage::Rackspace::Files] Retrieves a list files. - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @return [Fog::Rackspace::Storage::Files] Retrieves a list files. + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/List_Objects-d1e1284.html def all(options = {}) requires :directory @@ -59,12 +59,12 @@ def all(options = {}) end # Calls block for each file in the directory - # @yieldparam [Fog::Storage::Rackspace::File] - # @return [Fog::Storage::Rackspace::Directory] returns itself - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @yieldparam [Fog::Rackspace::Storage::File] + # @return [Fog::Rackspace::Storage::Directory] returns itself + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @note This method retrieves files in pages. Page size is defined by the limit attribute alias_method :each_file_this_page, :each def each @@ -89,11 +89,11 @@ def each # @yieldparam [String] data # @yieldparam [Integer] remaining # @yieldparam [Integer] content_length - # @return [Fog::Storage::Rackspace:File] - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @return [Fog::Rackspace::Storage:File] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @note If a block is provided, the body attribute will be empty. By default chunk size is 1 MB. This value can be changed by passing the parameter :chunk_size # into the :connection_options hash in the service constructor. # @example Download an image from Cloud Files and save it to file @@ -116,17 +116,17 @@ def get(key, &block) }) new(file_data) - rescue Fog::Storage::Rackspace::NotFound + rescue Fog::Rackspace::Storage::NotFound nil end # Returns the public_url for the given object key # @param key of the object # @return [String] url for object - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] # @see Directory#public_url def get_url(key) requires :directory @@ -163,11 +163,11 @@ def get_https_url(key, expires, options = {}) # View directory detail without loading file contents # @param key of the object # @param options Required for compatibility with other Fog providers. Not Used. - # @return [Fog::Storage::Rackspace::File] - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @return [Fog::Rackspace::Storage::File] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def head(key, options = {}) requires :directory data = service.head_object(directory.key, key) @@ -175,13 +175,13 @@ def head(key, options = {}) :key => key }) new(file_data) - rescue Fog::Storage::Rackspace::NotFound + rescue Fog::Rackspace::Storage::NotFound nil end # Create a new file object # @param [Hash] attributes of object - # @return [Fog::Storage::Rackspace::File] + # @return [Fog::Rackspace::Storage::File] def new(attributes = {}) requires :directory super({ :directory => directory }.merge!(attributes)) diff --git a/lib/fog/rackspace/models/storage/metadata.rb b/lib/fog/rackspace/models/storage/metadata.rb index c0c3ad6..bbd35f1 100644 --- a/lib/fog/rackspace/models/storage/metadata.rb +++ b/lib/fog/rackspace/models/storage/metadata.rb @@ -18,11 +18,11 @@ class Metadata attr_reader :data # @!attribute [rw] parent - # @return [Fog::Storage::Rackspace::Directory,Fog::Storage::Rackspace::File] the parent object of the metadata + # @return [Fog::Rackspace::Storage::Directory,Fog::Rackspace::Storage::File] the parent object of the metadata attr_reader :parent # Initialize - # @param [Fog::Storage::Rackspace::Directory,Fog::Storage::Rackspace::File] parent object of the metadata + # @param [Fog::Rackspace::Storage::Directory,Fog::Rackspace::Storage::File] parent object of the metadata # @param [Hash] hash containing initial metadata values def initialize(parent, hash={}) @data = hash || {} @@ -77,7 +77,7 @@ def []=(key, value) end # Creates metadata object from Cloud File Headers - # @param [Fog::Storage::Rackspace::Directory,Fog::Storage::Rackspace::File] parent object of the metadata + # @param [Fog::Rackspace::Storage::Directory,Fog::Rackspace::Storage::File] parent object of the metadata # @param [Hash] headers Cloud File headers def self.from_headers(parent, headers) metadata = Metadata.new(parent) @@ -104,11 +104,11 @@ def method_missing(method, *args, &block) private def directory? - [Fog::Storage::Rackspace::Directory, Fog::Storage::Rackspace::Directories].include? parent_class + [Fog::Rackspace::Storage::Directory, Fog::Rackspace::Storage::Directories].include? parent_class end def file? - [Fog::Storage::Rackspace::File, Fog::Storage::Rackspace::Files].include? parent_class + [Fog::Rackspace::Storage::File, Fog::Rackspace::Storage::Files].include? parent_class end def parent_class diff --git a/lib/fog/rackspace/requests/cdn/delete_object.rb b/lib/fog/rackspace/requests/cdn/delete_object.rb index a30f02e..29481dc 100644 --- a/lib/fog/rackspace/requests/cdn/delete_object.rb +++ b/lib/fog/rackspace/requests/cdn/delete_object.rb @@ -8,10 +8,10 @@ class Real # * container<~String> - Name of container to delete # * object<~String> - Name of object to delete # @return [Excon::Response] response - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def delete_object(container, object) request( :expects => 204, diff --git a/lib/fog/rackspace/requests/cdn/get_containers.rb b/lib/fog/rackspace/requests/cdn/get_containers.rb index 7b7f4b0..4870364 100644 --- a/lib/fog/rackspace/requests/cdn/get_containers.rb +++ b/lib/fog/rackspace/requests/cdn/get_containers.rb @@ -15,10 +15,10 @@ class Real # * body<~Array>: # * container<~String>: Name of container # @return [Excon::Response] response - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def get_containers(options = {}) response = request( :expects => [200, 204], diff --git a/lib/fog/rackspace/requests/cdn/head_container.rb b/lib/fog/rackspace/requests/cdn/head_container.rb index 7bd7d7d..a4b6aed 100644 --- a/lib/fog/rackspace/requests/cdn/head_container.rb +++ b/lib/fog/rackspace/requests/cdn/head_container.rb @@ -17,10 +17,10 @@ class Real # * 'X-User-Agent-ACL'<~String> - ? # * 'X-Referrer-ACL'<~String> - ? # @return [Excon::Response] response - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def head_container(container) response = request( :expects => 204, @@ -34,7 +34,7 @@ def head_container(container) class Mock def head_container(container) - raise Fog::Storage::Rackspace::NotFound.new "#{container} not found" unless container == 'fogcontainertests' + raise Fog::Rackspace::Storage::NotFound.new "#{container} not found" unless container == 'fogcontainertests' response = Excon::Response.new response.status = 204 response.headers = { diff --git a/lib/fog/rackspace/requests/cdn/post_container.rb b/lib/fog/rackspace/requests/cdn/post_container.rb index c9b4adf..a3d6ed1 100644 --- a/lib/fog/rackspace/requests/cdn/post_container.rb +++ b/lib/fog/rackspace/requests/cdn/post_container.rb @@ -14,10 +14,10 @@ class Real # * 'X-User-Agent-ACL'<~String> - ? # * 'X-Referrer-ACL'<~String> - ? # @return [Excon::Response] response - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def post_container(name, options = {}) response = request( :expects => [201, 202], @@ -31,7 +31,7 @@ def post_container(name, options = {}) class Mock def post_container(name, options = {}) - raise Fog::Storage::Rackspace::NotFound.new "#{name} not found" unless name == 'fogcontainertests' + raise Fog::Rackspace::Storage::NotFound.new "#{name} not found" unless name == 'fogcontainertests' response = Excon::Response.new response.status = 202 response.headers = { diff --git a/lib/fog/rackspace/requests/cdn/put_container.rb b/lib/fog/rackspace/requests/cdn/put_container.rb index 28227e8..2a0863d 100644 --- a/lib/fog/rackspace/requests/cdn/put_container.rb +++ b/lib/fog/rackspace/requests/cdn/put_container.rb @@ -14,10 +14,10 @@ class Real # * 'X-User-Agent-ACL'<~String> - ? # * 'X-Referrer-ACL'<~String> - ? # @return [Excon::Response] response - # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404 - # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 - # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 - # @raise [Fog::Storage::Rackspace::ServiceError] + # @raise [Fog::Rackspace::Storage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::Storage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::Storage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::Storage::ServiceError] def put_container(name, options = {}) response = request( :expects => [201, 202], diff --git a/lib/fog/rackspace/storage.rb b/lib/fog/rackspace/storage.rb index 008780f..6fa0db4 100644 --- a/lib/fog/rackspace/storage.rb +++ b/lib/fog/rackspace/storage.rb @@ -116,7 +116,7 @@ def endpoint_uri(service_endpoint_url=nil) end # Return Account Details - # @return [Fog::Storage::Rackspace::Account] account details object + # @return [Fog::Rackspace::Storage::Account] account details object def account account = Fog::Rackspace::Storage::Account.new(:service => self) account.reload @@ -176,7 +176,7 @@ def mock_object(name) end # Access a MockObject with a specific name, raising a - # `Fog::Storage::Rackspace::NotFound` exception if none are present. + # `Fog::Rackspace::Storage::NotFound` exception if none are present. # # @param name [String] (Unescaped) object name. # @return [MockObject] The object within this container with the @@ -374,14 +374,14 @@ def mock_container(cname) end # Access a MockContainer with the specified name, raising a - # {Fog::Storage::Rackspace::NotFound} exception if none exist. + # {Fog::Rackspace::Storage::NotFound} exception if none exist. # # @param cname [String] The (unescaped) container name. - # @throws [Fog::Storage::Rackspace::NotFound] If no container with the + # @throws [Fog::Rackspace::Storage::NotFound] If no container with the # given name exists. # @return [MockContainer] The existing MockContainer. def mock_container!(cname) - mock_container(cname) or raise Fog::Storage::Rackspace::NotFound.new + mock_container(cname) or raise Fog::Rackspace::Storage::NotFound.new end # Create and add a new, empty MockContainer with the given name. An diff --git a/lib/fog/rackspace/version.rb b/lib/fog/rackspace/version.rb index b025136..b7a81de 100644 --- a/lib/fog/rackspace/version.rb +++ b/lib/fog/rackspace/version.rb @@ -1,5 +1,5 @@ module Fog module Rackspace - VERSION = "0.1.6" + VERSION = "0.2.0" end end From b5803a7ecea8e1220c1f2d9a18d587984dfa84d2 Mon Sep 17 00:00:00 2001 From: Pasha Klimochkin Date: Fri, 26 May 2023 11:17:56 -0700 Subject: [PATCH 4/9] fix `Unable to load Fog::Rackspace::Databases` --- lib/fog/rackspace.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb index e74c9ff..dba5e90 100644 --- a/lib/fog/rackspace.rb +++ b/lib/fog/rackspace.rb @@ -19,7 +19,7 @@ module Rackspace autoload :CDNV2, File.expand_path('../rackspace/cdn_v2', __FILE__) autoload :Compute, File.expand_path('../rackspace/compute', __FILE__) autoload :ComputeV2, File.expand_path('../rackspace/compute_v2', __FILE__) - autoload :Database, File.expand_path('../rackspace/databases', __FILE__) + autoload :Databases, File.expand_path('../rackspace/databases', __FILE__) autoload :DNS, File.expand_path('../rackspace/dns', __FILE__) autoload :Identity, File.expand_path('../rackspace/identity', __FILE__) autoload :LoadBalancers, File.expand_path('../rackspace/load_balancers', __FILE__) From 73faad52c14bc22adad90821a834d685fe337a07 Mon Sep 17 00:00:00 2001 From: Marc Hassman Date: Fri, 24 May 2024 13:22:51 -0500 Subject: [PATCH 5/9] update encode --- lib/fog/rackspace/requests/storage/delete_multiple_objects.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb b/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb index 483535f..cacca13 100644 --- a/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb +++ b/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb @@ -53,7 +53,7 @@ class Real def delete_multiple_objects(container, object_names, options = {}) body = object_names.map do |name| object_name = container ? "#{ container }/#{ name }" : name - URI.encode(object_name) + URI.encode_www_form_component(object_name) end.join("\n") response = request({ From 9cba0bf2196bf99eb58ced81b949129b398ee4dd Mon Sep 17 00:00:00 2001 From: Marc Hassman Date: Fri, 24 May 2024 16:37:41 -0500 Subject: [PATCH 6/9] flip more modules --- fog-rackspace.gemspec | 64 ++++++++++--------- .../rackspace/models/storage/directories.rb | 4 +- lib/fog/rackspace/models/storage/directory.rb | 4 +- lib/fog/rackspace/models/storage/file.rb | 4 +- lib/fog/rackspace/models/storage/files.rb | 4 +- lib/fog/rackspace/models/storage/metadata.rb | 4 +- tests/rackspace/requests/cdn/cdn_tests.rb | 4 +- .../requests/storage/container_tests.rb | 6 +- .../requests/storage/large_object_tests.rb | 10 +-- .../requests/storage/object_tests.rb | 20 +++--- 10 files changed, 63 insertions(+), 61 deletions(-) diff --git a/fog-rackspace.gemspec b/fog-rackspace.gemspec index b8958d2..7fc3236 100644 --- a/fog-rackspace.gemspec +++ b/fog-rackspace.gemspec @@ -1,37 +1,39 @@ -# coding: utf-8 -lib = File.expand_path('../lib', __FILE__) -$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'fog/rackspace/version' +# -*- encoding: utf-8 -*- +# stub: fog-rackspace 0.2.0 ruby lib -Gem::Specification.new do |spec| - spec.name = "fog-rackspace" - spec.version = Fog::Rackspace::VERSION - spec.authors = ["Matt Darby"] - spec.email = ["matt.darby@rackspace.com"] +Gem::Specification.new do |s| + s.name = "fog-rackspace".freeze + s.version = "0.2.0" - spec.summary = %q{Rackspace support for Fog} - spec.description = %q{Rackspace provider gem for Fog} - spec.homepage = "http://developer.rackspace.com" - spec.license = "MIT" + s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version= + s.require_paths = ["lib".freeze] + s.authors = ["Matt Darby".freeze] + s.bindir = "exe".freeze + s.date = "2024-05-24" + s.description = "Rackspace provider gem for Fog".freeze + s.email = ["matt.darby@rackspace.com".freeze] + s.files = [".gitignore".freeze, ".rspec".freeze, ".ruby-gemset".freeze, ".ruby-version".freeze, ".travis.yml".freeze, "CODE_OF_CONDUCT.md".freeze, "CONTRIBUTING.md".freeze, "CONTRIBUTORS.md".freeze, "Gemfile".freeze, "LICENSE.md".freeze, "README.md".freeze, "Rakefile".freeze, "bin/console".freeze, "bin/setup".freeze, "circle.yml".freeze, "fog-rackspace.gemspec".freeze, "lib/fog/rackspace.rb".freeze, "lib/fog/rackspace/auto_scale.rb".freeze, "lib/fog/rackspace/block_storage.rb".freeze, "lib/fog/rackspace/cdn.rb".freeze, "lib/fog/rackspace/cdn_v2.rb".freeze, "lib/fog/rackspace/compute.rb".freeze, "lib/fog/rackspace/compute_v2.rb".freeze, "lib/fog/rackspace/databases.rb".freeze, "lib/fog/rackspace/dns.rb".freeze, "lib/fog/rackspace/docs/auto_scale.md".freeze, "lib/fog/rackspace/docs/block_storage.md".freeze, "lib/fog/rackspace/docs/cdn_v2.md".freeze, "lib/fog/rackspace/docs/compute_v2.md".freeze, "lib/fog/rackspace/docs/getting_started.md".freeze, "lib/fog/rackspace/docs/networking_v2.md".freeze, "lib/fog/rackspace/docs/orchestration.md".freeze, "lib/fog/rackspace/docs/queues.md".freeze, "lib/fog/rackspace/docs/storage.md".freeze, "lib/fog/rackspace/errors.rb".freeze, "lib/fog/rackspace/examples/README.md".freeze, "lib/fog/rackspace/examples/auto_scale/add_policy.rb".freeze, "lib/fog/rackspace/examples/auto_scale/add_webhook.rb".freeze, "lib/fog/rackspace/examples/auto_scale/create_scaling_group.rb".freeze, "lib/fog/rackspace/examples/auto_scale/delete_policy.rb".freeze, "lib/fog/rackspace/examples/auto_scale/delete_scaling_group.rb".freeze, "lib/fog/rackspace/examples/auto_scale/delete_webhook.rb".freeze, "lib/fog/rackspace/examples/block_storage/create_snapshot.rb".freeze, "lib/fog/rackspace/examples/block_storage/create_volume.rb".freeze, "lib/fog/rackspace/examples/block_storage/delete_volume.rb".freeze, "lib/fog/rackspace/examples/compute_v2/bootstrap_server.rb".freeze, "lib/fog/rackspace/examples/compute_v2/create_image.rb".freeze, "lib/fog/rackspace/examples/compute_v2/create_network.rb".freeze, "lib/fog/rackspace/examples/compute_v2/create_server.rb".freeze, "lib/fog/rackspace/examples/compute_v2/delete_image.rb".freeze, "lib/fog/rackspace/examples/compute_v2/delete_network.rb".freeze, "lib/fog/rackspace/examples/compute_v2/delete_server.rb".freeze, "lib/fog/rackspace/examples/compute_v2/detach_volume.rb".freeze, "lib/fog/rackspace/examples/compute_v2/resize_server.rb".freeze, "lib/fog/rackspace/examples/compute_v2/server_attachments.rb".freeze, "lib/fog/rackspace/examples/compute_v2/server_metadata.rb".freeze, "lib/fog/rackspace/examples/queues/claim_messages.rb".freeze, "lib/fog/rackspace/examples/queues/create_queue.rb".freeze, "lib/fog/rackspace/examples/queues/delete_message.rb".freeze, "lib/fog/rackspace/examples/queues/delete_queue.rb".freeze, "lib/fog/rackspace/examples/queues/list_messages.rb".freeze, "lib/fog/rackspace/examples/queues/post_message.rb".freeze, "lib/fog/rackspace/examples/storage/create_cdn_directory.rb".freeze, "lib/fog/rackspace/examples/storage/create_private_directory.rb".freeze, "lib/fog/rackspace/examples/storage/delete_directory.rb".freeze, "lib/fog/rackspace/examples/storage/delete_file.rb".freeze, "lib/fog/rackspace/examples/storage/download_file.rb".freeze, "lib/fog/rackspace/examples/storage/lorem.txt".freeze, "lib/fog/rackspace/examples/storage/storage_metadata.rb".freeze, "lib/fog/rackspace/examples/storage/upload_file.rb".freeze, "lib/fog/rackspace/examples/storage/upload_large_files.rb".freeze, "lib/fog/rackspace/identity.rb".freeze, "lib/fog/rackspace/load_balancers.rb".freeze, "lib/fog/rackspace/mock_data.rb".freeze, "lib/fog/rackspace/models/auto_scale/group.rb".freeze, "lib/fog/rackspace/models/auto_scale/group_builder.rb".freeze, "lib/fog/rackspace/models/auto_scale/group_config.rb".freeze, "lib/fog/rackspace/models/auto_scale/groups.rb".freeze, "lib/fog/rackspace/models/auto_scale/launch_config.rb".freeze, "lib/fog/rackspace/models/auto_scale/policies.rb".freeze, "lib/fog/rackspace/models/auto_scale/policy.rb".freeze, "lib/fog/rackspace/models/auto_scale/webhook.rb".freeze, "lib/fog/rackspace/models/auto_scale/webhooks.rb".freeze, "lib/fog/rackspace/models/block_storage/snapshot.rb".freeze, "lib/fog/rackspace/models/block_storage/snapshots.rb".freeze, "lib/fog/rackspace/models/block_storage/volume.rb".freeze, "lib/fog/rackspace/models/block_storage/volume_type.rb".freeze, "lib/fog/rackspace/models/block_storage/volume_types.rb".freeze, "lib/fog/rackspace/models/block_storage/volumes.rb".freeze, "lib/fog/rackspace/models/cdn_v2/flavor.rb".freeze, "lib/fog/rackspace/models/cdn_v2/flavors.rb".freeze, "lib/fog/rackspace/models/cdn_v2/service.rb".freeze, "lib/fog/rackspace/models/cdn_v2/services.rb".freeze, "lib/fog/rackspace/models/compute/flavor.rb".freeze, "lib/fog/rackspace/models/compute/flavors.rb".freeze, "lib/fog/rackspace/models/compute/image.rb".freeze, "lib/fog/rackspace/models/compute/images.rb".freeze, "lib/fog/rackspace/models/compute/server.rb".freeze, "lib/fog/rackspace/models/compute/servers.rb".freeze, "lib/fog/rackspace/models/compute_v2/attachment.rb".freeze, "lib/fog/rackspace/models/compute_v2/attachments.rb".freeze, "lib/fog/rackspace/models/compute_v2/flavor.rb".freeze, "lib/fog/rackspace/models/compute_v2/flavors.rb".freeze, "lib/fog/rackspace/models/compute_v2/image.rb".freeze, "lib/fog/rackspace/models/compute_v2/images.rb".freeze, "lib/fog/rackspace/models/compute_v2/key_pair.rb".freeze, "lib/fog/rackspace/models/compute_v2/key_pairs.rb".freeze, "lib/fog/rackspace/models/compute_v2/meta_parent.rb".freeze, "lib/fog/rackspace/models/compute_v2/metadata.rb".freeze, "lib/fog/rackspace/models/compute_v2/metadatum.rb".freeze, "lib/fog/rackspace/models/compute_v2/network.rb".freeze, "lib/fog/rackspace/models/compute_v2/networks.rb".freeze, "lib/fog/rackspace/models/compute_v2/server.rb".freeze, "lib/fog/rackspace/models/compute_v2/servers.rb".freeze, "lib/fog/rackspace/models/compute_v2/virtual_interface.rb".freeze, "lib/fog/rackspace/models/compute_v2/virtual_interfaces.rb".freeze, "lib/fog/rackspace/models/databases/database.rb".freeze, "lib/fog/rackspace/models/databases/databases.rb".freeze, "lib/fog/rackspace/models/databases/flavor.rb".freeze, "lib/fog/rackspace/models/databases/flavors.rb".freeze, "lib/fog/rackspace/models/databases/instance.rb".freeze, "lib/fog/rackspace/models/databases/instances.rb".freeze, "lib/fog/rackspace/models/databases/user.rb".freeze, "lib/fog/rackspace/models/databases/users.rb".freeze, "lib/fog/rackspace/models/dns/callback.rb".freeze, "lib/fog/rackspace/models/dns/record.rb".freeze, "lib/fog/rackspace/models/dns/records.rb".freeze, "lib/fog/rackspace/models/dns/zone.rb".freeze, "lib/fog/rackspace/models/dns/zones.rb".freeze, "lib/fog/rackspace/models/identity/credential.rb".freeze, "lib/fog/rackspace/models/identity/credentials.rb".freeze, "lib/fog/rackspace/models/identity/role.rb".freeze, "lib/fog/rackspace/models/identity/roles.rb".freeze, "lib/fog/rackspace/models/identity/service_catalog.rb".freeze, "lib/fog/rackspace/models/identity/tenant.rb".freeze, "lib/fog/rackspace/models/identity/tenants.rb".freeze, "lib/fog/rackspace/models/identity/user.rb".freeze, "lib/fog/rackspace/models/identity/users.rb".freeze, "lib/fog/rackspace/models/load_balancers/access_rule.rb".freeze, "lib/fog/rackspace/models/load_balancers/access_rules.rb".freeze, "lib/fog/rackspace/models/load_balancers/load_balancer.rb".freeze, "lib/fog/rackspace/models/load_balancers/load_balancers.rb".freeze, "lib/fog/rackspace/models/load_balancers/node.rb".freeze, "lib/fog/rackspace/models/load_balancers/nodes.rb".freeze, "lib/fog/rackspace/models/load_balancers/virtual_ip.rb".freeze, "lib/fog/rackspace/models/load_balancers/virtual_ips.rb".freeze, "lib/fog/rackspace/models/monitoring/agent_token.rb".freeze, "lib/fog/rackspace/models/monitoring/agent_tokens.rb".freeze, "lib/fog/rackspace/models/monitoring/alarm.rb".freeze, "lib/fog/rackspace/models/monitoring/alarm_example.rb".freeze, "lib/fog/rackspace/models/monitoring/alarm_examples.rb".freeze, "lib/fog/rackspace/models/monitoring/alarms.rb".freeze, "lib/fog/rackspace/models/monitoring/base.rb".freeze, "lib/fog/rackspace/models/monitoring/check.rb".freeze, "lib/fog/rackspace/models/monitoring/check_type.rb".freeze, "lib/fog/rackspace/models/monitoring/check_types.rb".freeze, "lib/fog/rackspace/models/monitoring/checks.rb".freeze, "lib/fog/rackspace/models/monitoring/data_point.rb".freeze, "lib/fog/rackspace/models/monitoring/data_points.rb".freeze, "lib/fog/rackspace/models/monitoring/entities.rb".freeze, "lib/fog/rackspace/models/monitoring/entity.rb".freeze, "lib/fog/rackspace/models/monitoring/metric.rb".freeze, "lib/fog/rackspace/models/monitoring/metrics.rb".freeze, "lib/fog/rackspace/models/monitoring/notification.rb".freeze, "lib/fog/rackspace/models/monitoring/notifications.rb".freeze, "lib/fog/rackspace/models/networking/network.rb".freeze, "lib/fog/rackspace/models/networking/networks.rb".freeze, "lib/fog/rackspace/models/networking/virtual_interface.rb".freeze, "lib/fog/rackspace/models/networking/virtual_interfaces.rb".freeze, "lib/fog/rackspace/models/networking_v2/network.rb".freeze, "lib/fog/rackspace/models/networking_v2/networks.rb".freeze, "lib/fog/rackspace/models/networking_v2/port.rb".freeze, "lib/fog/rackspace/models/networking_v2/ports.rb".freeze, "lib/fog/rackspace/models/networking_v2/security_group.rb".freeze, "lib/fog/rackspace/models/networking_v2/security_group_rule.rb".freeze, "lib/fog/rackspace/models/networking_v2/security_group_rules.rb".freeze, "lib/fog/rackspace/models/networking_v2/security_groups.rb".freeze, "lib/fog/rackspace/models/networking_v2/subnet.rb".freeze, "lib/fog/rackspace/models/networking_v2/subnets.rb".freeze, "lib/fog/rackspace/models/orchestration/event.rb".freeze, "lib/fog/rackspace/models/orchestration/events.rb".freeze, "lib/fog/rackspace/models/orchestration/resource.rb".freeze, "lib/fog/rackspace/models/orchestration/resource_schemas.rb".freeze, "lib/fog/rackspace/models/orchestration/resources.rb".freeze, "lib/fog/rackspace/models/orchestration/stack.rb".freeze, "lib/fog/rackspace/models/orchestration/stacks.rb".freeze, "lib/fog/rackspace/models/orchestration/template.rb".freeze, "lib/fog/rackspace/models/orchestration/templates.rb".freeze, "lib/fog/rackspace/models/queues/claim.rb".freeze, "lib/fog/rackspace/models/queues/claims.rb".freeze, "lib/fog/rackspace/models/queues/message.rb".freeze, "lib/fog/rackspace/models/queues/messages.rb".freeze, "lib/fog/rackspace/models/queues/queue.rb".freeze, "lib/fog/rackspace/models/queues/queues.rb".freeze, "lib/fog/rackspace/models/storage/account.rb".freeze, "lib/fog/rackspace/models/storage/directories.rb".freeze, "lib/fog/rackspace/models/storage/directory.rb".freeze, "lib/fog/rackspace/models/storage/file.rb".freeze, "lib/fog/rackspace/models/storage/files.rb".freeze, "lib/fog/rackspace/models/storage/metadata.rb".freeze, "lib/fog/rackspace/monitoring.rb".freeze, "lib/fog/rackspace/networking.rb".freeze, "lib/fog/rackspace/networking_v2.rb".freeze, "lib/fog/rackspace/orchestration.rb".freeze, "lib/fog/rackspace/queues.rb".freeze, "lib/fog/rackspace/requests/auto_scale/create_group.rb".freeze, "lib/fog/rackspace/requests/auto_scale/create_policy.rb".freeze, "lib/fog/rackspace/requests/auto_scale/create_webhook.rb".freeze, "lib/fog/rackspace/requests/auto_scale/delete_group.rb".freeze, "lib/fog/rackspace/requests/auto_scale/delete_policy.rb".freeze, "lib/fog/rackspace/requests/auto_scale/delete_webhook.rb".freeze, "lib/fog/rackspace/requests/auto_scale/execute_anonymous_webhook.rb".freeze, "lib/fog/rackspace/requests/auto_scale/execute_policy.rb".freeze, "lib/fog/rackspace/requests/auto_scale/get_group.rb".freeze, "lib/fog/rackspace/requests/auto_scale/get_group_config.rb".freeze, "lib/fog/rackspace/requests/auto_scale/get_group_state.rb".freeze, "lib/fog/rackspace/requests/auto_scale/get_launch_config.rb".freeze, "lib/fog/rackspace/requests/auto_scale/get_policy.rb".freeze, "lib/fog/rackspace/requests/auto_scale/get_webhook.rb".freeze, "lib/fog/rackspace/requests/auto_scale/list_groups.rb".freeze, "lib/fog/rackspace/requests/auto_scale/list_policies.rb".freeze, "lib/fog/rackspace/requests/auto_scale/list_webhooks.rb".freeze, "lib/fog/rackspace/requests/auto_scale/pause_group_state.rb".freeze, "lib/fog/rackspace/requests/auto_scale/resume_group_state.rb".freeze, "lib/fog/rackspace/requests/auto_scale/update_group_config.rb".freeze, "lib/fog/rackspace/requests/auto_scale/update_launch_config.rb".freeze, "lib/fog/rackspace/requests/auto_scale/update_policy.rb".freeze, "lib/fog/rackspace/requests/auto_scale/update_webhook.rb".freeze, "lib/fog/rackspace/requests/block_storage/create_snapshot.rb".freeze, "lib/fog/rackspace/requests/block_storage/create_volume.rb".freeze, "lib/fog/rackspace/requests/block_storage/delete_snapshot.rb".freeze, "lib/fog/rackspace/requests/block_storage/delete_volume.rb".freeze, "lib/fog/rackspace/requests/block_storage/get_snapshot.rb".freeze, "lib/fog/rackspace/requests/block_storage/get_volume.rb".freeze, "lib/fog/rackspace/requests/block_storage/get_volume_type.rb".freeze, "lib/fog/rackspace/requests/block_storage/list_snapshots.rb".freeze, "lib/fog/rackspace/requests/block_storage/list_volume_types.rb".freeze, "lib/fog/rackspace/requests/block_storage/list_volumes.rb".freeze, "lib/fog/rackspace/requests/cdn/delete_object.rb".freeze, "lib/fog/rackspace/requests/cdn/get_containers.rb".freeze, "lib/fog/rackspace/requests/cdn/head_container.rb".freeze, "lib/fog/rackspace/requests/cdn/post_container.rb".freeze, "lib/fog/rackspace/requests/cdn/put_container.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/create_service.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/delete_assets.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/delete_service.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/get_flavor.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/get_home_document.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/get_ping.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/get_service.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/list_flavors.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/list_services.rb".freeze, "lib/fog/rackspace/requests/cdn_v2/update_service.rb".freeze, "lib/fog/rackspace/requests/compute/confirm_resized_server.rb".freeze, "lib/fog/rackspace/requests/compute/create_image.rb".freeze, "lib/fog/rackspace/requests/compute/create_server.rb".freeze, "lib/fog/rackspace/requests/compute/delete_image.rb".freeze, "lib/fog/rackspace/requests/compute/delete_server.rb".freeze, "lib/fog/rackspace/requests/compute/get_flavor_details.rb".freeze, "lib/fog/rackspace/requests/compute/get_image_details.rb".freeze, "lib/fog/rackspace/requests/compute/get_server_details.rb".freeze, "lib/fog/rackspace/requests/compute/list_addresses.rb".freeze, "lib/fog/rackspace/requests/compute/list_flavors.rb".freeze, "lib/fog/rackspace/requests/compute/list_flavors_detail.rb".freeze, "lib/fog/rackspace/requests/compute/list_images.rb".freeze, "lib/fog/rackspace/requests/compute/list_images_detail.rb".freeze, "lib/fog/rackspace/requests/compute/list_private_addresses.rb".freeze, "lib/fog/rackspace/requests/compute/list_public_addresses.rb".freeze, "lib/fog/rackspace/requests/compute/list_servers.rb".freeze, "lib/fog/rackspace/requests/compute/list_servers_detail.rb".freeze, "lib/fog/rackspace/requests/compute/reboot_server.rb".freeze, "lib/fog/rackspace/requests/compute/resize_server.rb".freeze, "lib/fog/rackspace/requests/compute/revert_resized_server.rb".freeze, "lib/fog/rackspace/requests/compute/server_action.rb".freeze, "lib/fog/rackspace/requests/compute/update_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/attach_volume.rb".freeze, "lib/fog/rackspace/requests/compute_v2/change_server_password.rb".freeze, "lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/create_image.rb".freeze, "lib/fog/rackspace/requests/compute_v2/create_keypair.rb".freeze, "lib/fog/rackspace/requests/compute_v2/create_network.rb".freeze, "lib/fog/rackspace/requests/compute_v2/create_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb".freeze, "lib/fog/rackspace/requests/compute_v2/delete_attachment.rb".freeze, "lib/fog/rackspace/requests/compute_v2/delete_image.rb".freeze, "lib/fog/rackspace/requests/compute_v2/delete_keypair.rb".freeze, "lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb".freeze, "lib/fog/rackspace/requests/compute_v2/delete_network.rb".freeze, "lib/fog/rackspace/requests/compute_v2/delete_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb".freeze, "lib/fog/rackspace/requests/compute_v2/get_attachment.rb".freeze, "lib/fog/rackspace/requests/compute_v2/get_flavor.rb".freeze, "lib/fog/rackspace/requests/compute_v2/get_image.rb".freeze, "lib/fog/rackspace/requests/compute_v2/get_keypair.rb".freeze, "lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb".freeze, "lib/fog/rackspace/requests/compute_v2/get_network.rb".freeze, "lib/fog/rackspace/requests/compute_v2/get_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/get_vnc_console.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_addresses.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_addresses_by_network.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_attachments.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_flavors.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_images.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_images_detail.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_keypairs.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_metadata.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_networks.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_servers.rb".freeze, "lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb".freeze, "lib/fog/rackspace/requests/compute_v2/reboot_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/rebuild_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/rescue_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/resize_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/set_metadata.rb".freeze, "lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb".freeze, "lib/fog/rackspace/requests/compute_v2/start_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/stop_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/unrescue_server.rb".freeze, "lib/fog/rackspace/requests/compute_v2/update_metadata.rb".freeze, "lib/fog/rackspace/requests/compute_v2/update_server.rb".freeze, "lib/fog/rackspace/requests/databases/check_root_user.rb".freeze, "lib/fog/rackspace/requests/databases/create_database.rb".freeze, "lib/fog/rackspace/requests/databases/create_instance.rb".freeze, "lib/fog/rackspace/requests/databases/create_user.rb".freeze, "lib/fog/rackspace/requests/databases/delete_database.rb".freeze, "lib/fog/rackspace/requests/databases/delete_instance.rb".freeze, "lib/fog/rackspace/requests/databases/delete_user.rb".freeze, "lib/fog/rackspace/requests/databases/enable_root_user.rb".freeze, "lib/fog/rackspace/requests/databases/get_flavor.rb".freeze, "lib/fog/rackspace/requests/databases/get_instance.rb".freeze, "lib/fog/rackspace/requests/databases/grant_user_access.rb".freeze, "lib/fog/rackspace/requests/databases/list_databases.rb".freeze, "lib/fog/rackspace/requests/databases/list_flavors.rb".freeze, "lib/fog/rackspace/requests/databases/list_instances.rb".freeze, "lib/fog/rackspace/requests/databases/list_users.rb".freeze, "lib/fog/rackspace/requests/databases/resize_instance.rb".freeze, "lib/fog/rackspace/requests/databases/resize_instance_volume.rb".freeze, "lib/fog/rackspace/requests/databases/restart_instance.rb".freeze, "lib/fog/rackspace/requests/databases/revoke_user_access.rb".freeze, "lib/fog/rackspace/requests/dns/add_records.rb".freeze, "lib/fog/rackspace/requests/dns/callback.rb".freeze, "lib/fog/rackspace/requests/dns/create_domains.rb".freeze, "lib/fog/rackspace/requests/dns/list_domain_details.rb".freeze, "lib/fog/rackspace/requests/dns/list_domains.rb".freeze, "lib/fog/rackspace/requests/dns/list_record_details.rb".freeze, "lib/fog/rackspace/requests/dns/list_records.rb".freeze, "lib/fog/rackspace/requests/dns/list_subdomains.rb".freeze, "lib/fog/rackspace/requests/dns/modify_domain.rb".freeze, "lib/fog/rackspace/requests/dns/modify_record.rb".freeze, "lib/fog/rackspace/requests/dns/remove_domain.rb".freeze, "lib/fog/rackspace/requests/dns/remove_domains.rb".freeze, "lib/fog/rackspace/requests/dns/remove_record.rb".freeze, "lib/fog/rackspace/requests/dns/remove_records.rb".freeze, "lib/fog/rackspace/requests/identity/create_token.rb".freeze, "lib/fog/rackspace/requests/identity/create_user.rb".freeze, "lib/fog/rackspace/requests/identity/delete_user.rb".freeze, "lib/fog/rackspace/requests/identity/get_user_by_id.rb".freeze, "lib/fog/rackspace/requests/identity/get_user_by_name.rb".freeze, "lib/fog/rackspace/requests/identity/list_credentials.rb".freeze, "lib/fog/rackspace/requests/identity/list_tenants.rb".freeze, "lib/fog/rackspace/requests/identity/list_user_roles.rb".freeze, "lib/fog/rackspace/requests/identity/list_users.rb".freeze, "lib/fog/rackspace/requests/identity/update_user.rb".freeze, "lib/fog/rackspace/requests/load_balancers/create_access_rule.rb".freeze, "lib/fog/rackspace/requests/load_balancers/create_load_balancer.rb".freeze, "lib/fog/rackspace/requests/load_balancers/create_node.rb".freeze, "lib/fog/rackspace/requests/load_balancers/create_virtual_ip.rb".freeze, "lib/fog/rackspace/requests/load_balancers/delete_access_rule.rb".freeze, "lib/fog/rackspace/requests/load_balancers/delete_all_access_rules.rb".freeze, "lib/fog/rackspace/requests/load_balancers/delete_load_balancer.rb".freeze, "lib/fog/rackspace/requests/load_balancers/delete_node.rb".freeze, "lib/fog/rackspace/requests/load_balancers/delete_nodes.rb".freeze, "lib/fog/rackspace/requests/load_balancers/delete_virtual_ip.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_connection_logging.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_connection_throttling.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_content_caching.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_error_page.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_load_balancer.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_load_balancer_usage.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_monitor.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_node.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_session_persistence.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_ssl_termination.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_stats.rb".freeze, "lib/fog/rackspace/requests/load_balancers/get_usage.rb".freeze, "lib/fog/rackspace/requests/load_balancers/list_access_rules.rb".freeze, "lib/fog/rackspace/requests/load_balancers/list_algorithms.rb".freeze, "lib/fog/rackspace/requests/load_balancers/list_load_balancers.rb".freeze, "lib/fog/rackspace/requests/load_balancers/list_nodes.rb".freeze, "lib/fog/rackspace/requests/load_balancers/list_protocols.rb".freeze, "lib/fog/rackspace/requests/load_balancers/list_virtual_ips.rb".freeze, "lib/fog/rackspace/requests/load_balancers/remove_connection_throttling.rb".freeze, "lib/fog/rackspace/requests/load_balancers/remove_error_page.rb".freeze, "lib/fog/rackspace/requests/load_balancers/remove_monitor.rb".freeze, "lib/fog/rackspace/requests/load_balancers/remove_session_persistence.rb".freeze, "lib/fog/rackspace/requests/load_balancers/remove_ssl_termination.rb".freeze, "lib/fog/rackspace/requests/load_balancers/set_connection_logging.rb".freeze, "lib/fog/rackspace/requests/load_balancers/set_connection_throttling.rb".freeze, "lib/fog/rackspace/requests/load_balancers/set_content_caching.rb".freeze, "lib/fog/rackspace/requests/load_balancers/set_error_page.rb".freeze, "lib/fog/rackspace/requests/load_balancers/set_monitor.rb".freeze, "lib/fog/rackspace/requests/load_balancers/set_session_persistence.rb".freeze, "lib/fog/rackspace/requests/load_balancers/set_ssl_termination.rb".freeze, "lib/fog/rackspace/requests/load_balancers/update_load_balancer.rb".freeze, "lib/fog/rackspace/requests/load_balancers/update_node.rb".freeze, "lib/fog/rackspace/requests/monitoring/create_agent_token.rb".freeze, "lib/fog/rackspace/requests/monitoring/create_alarm.rb".freeze, "lib/fog/rackspace/requests/monitoring/create_check.rb".freeze, "lib/fog/rackspace/requests/monitoring/create_entity.rb".freeze, "lib/fog/rackspace/requests/monitoring/create_notification.rb".freeze, "lib/fog/rackspace/requests/monitoring/delete_agent_token.rb".freeze, "lib/fog/rackspace/requests/monitoring/delete_alarm.rb".freeze, "lib/fog/rackspace/requests/monitoring/delete_check.rb".freeze, "lib/fog/rackspace/requests/monitoring/delete_entity.rb".freeze, "lib/fog/rackspace/requests/monitoring/delete_notification.rb".freeze, "lib/fog/rackspace/requests/monitoring/evaluate_alarm_example.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_agent.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_agent_token.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_alarm.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_alarm_example.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_check.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_cpus_info.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_disks_info.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_entity.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_memory_info.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_monitoring_zone.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_notification.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_processes_info.rb".freeze, "lib/fog/rackspace/requests/monitoring/get_system_info.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_agent_tokens.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_agents.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_alarm_examples.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_alarms.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_check_types.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_checks.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_data_points.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_entities.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_metrics.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_monitoring_zones.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_notification_plans.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_notifications.rb".freeze, "lib/fog/rackspace/requests/monitoring/list_overview.rb".freeze, "lib/fog/rackspace/requests/monitoring/update_alarm.rb".freeze, "lib/fog/rackspace/requests/monitoring/update_check.rb".freeze, "lib/fog/rackspace/requests/monitoring/update_entity.rb".freeze, "lib/fog/rackspace/requests/monitoring/update_notification.rb".freeze, "lib/fog/rackspace/requests/networking/create_network.rb".freeze, "lib/fog/rackspace/requests/networking/create_virtual_interface.rb".freeze, "lib/fog/rackspace/requests/networking/delete_network.rb".freeze, "lib/fog/rackspace/requests/networking/delete_virtual_interface.rb".freeze, "lib/fog/rackspace/requests/networking/get_network.rb".freeze, "lib/fog/rackspace/requests/networking/list_networks.rb".freeze, "lib/fog/rackspace/requests/networking/list_virtual_interfaces.rb".freeze, "lib/fog/rackspace/requests/networking_v2/create_network.rb".freeze, "lib/fog/rackspace/requests/networking_v2/create_port.rb".freeze, "lib/fog/rackspace/requests/networking_v2/create_security_group.rb".freeze, "lib/fog/rackspace/requests/networking_v2/create_security_group_rule.rb".freeze, "lib/fog/rackspace/requests/networking_v2/create_subnet.rb".freeze, "lib/fog/rackspace/requests/networking_v2/delete_network.rb".freeze, "lib/fog/rackspace/requests/networking_v2/delete_port.rb".freeze, "lib/fog/rackspace/requests/networking_v2/delete_security_group.rb".freeze, "lib/fog/rackspace/requests/networking_v2/delete_security_group_rule.rb".freeze, "lib/fog/rackspace/requests/networking_v2/delete_subnet.rb".freeze, "lib/fog/rackspace/requests/networking_v2/list_networks.rb".freeze, "lib/fog/rackspace/requests/networking_v2/list_ports.rb".freeze, "lib/fog/rackspace/requests/networking_v2/list_security_group_rules.rb".freeze, "lib/fog/rackspace/requests/networking_v2/list_security_groups.rb".freeze, "lib/fog/rackspace/requests/networking_v2/list_subnets.rb".freeze, "lib/fog/rackspace/requests/networking_v2/show_network.rb".freeze, "lib/fog/rackspace/requests/networking_v2/show_port.rb".freeze, "lib/fog/rackspace/requests/networking_v2/show_security_group.rb".freeze, "lib/fog/rackspace/requests/networking_v2/show_security_group_rule.rb".freeze, "lib/fog/rackspace/requests/networking_v2/show_subnet.rb".freeze, "lib/fog/rackspace/requests/networking_v2/update_network.rb".freeze, "lib/fog/rackspace/requests/networking_v2/update_port.rb".freeze, "lib/fog/rackspace/requests/networking_v2/update_security_group.rb".freeze, "lib/fog/rackspace/requests/networking_v2/update_subnet.rb".freeze, "lib/fog/rackspace/requests/orchestration/abandon_stack.rb".freeze, "lib/fog/rackspace/requests/orchestration/build_info.rb".freeze, "lib/fog/rackspace/requests/orchestration/create_stack.rb".freeze, "lib/fog/rackspace/requests/orchestration/delete_stack.rb".freeze, "lib/fog/rackspace/requests/orchestration/get_stack_template.rb".freeze, "lib/fog/rackspace/requests/orchestration/list_resource_events.rb".freeze, "lib/fog/rackspace/requests/orchestration/list_resource_types.rb".freeze, "lib/fog/rackspace/requests/orchestration/list_resources.rb".freeze, "lib/fog/rackspace/requests/orchestration/list_stack_data.rb".freeze, "lib/fog/rackspace/requests/orchestration/list_stack_events.rb".freeze, "lib/fog/rackspace/requests/orchestration/preview_stack.rb".freeze, "lib/fog/rackspace/requests/orchestration/show_event_details.rb".freeze, "lib/fog/rackspace/requests/orchestration/show_resource_data.rb".freeze, "lib/fog/rackspace/requests/orchestration/show_resource_metadata.rb".freeze, "lib/fog/rackspace/requests/orchestration/show_resource_schema.rb".freeze, "lib/fog/rackspace/requests/orchestration/show_resource_template.rb".freeze, "lib/fog/rackspace/requests/orchestration/show_stack_details.rb".freeze, "lib/fog/rackspace/requests/orchestration/update_stack.rb".freeze, "lib/fog/rackspace/requests/orchestration/validate_template.rb".freeze, "lib/fog/rackspace/requests/queues/create_claim.rb".freeze, "lib/fog/rackspace/requests/queues/create_message.rb".freeze, "lib/fog/rackspace/requests/queues/create_queue.rb".freeze, "lib/fog/rackspace/requests/queues/delete_claim.rb".freeze, "lib/fog/rackspace/requests/queues/delete_message.rb".freeze, "lib/fog/rackspace/requests/queues/delete_queue.rb".freeze, "lib/fog/rackspace/requests/queues/get_claim.rb".freeze, "lib/fog/rackspace/requests/queues/get_message.rb".freeze, "lib/fog/rackspace/requests/queues/get_queue.rb".freeze, "lib/fog/rackspace/requests/queues/get_queue_stats.rb".freeze, "lib/fog/rackspace/requests/queues/list_messages.rb".freeze, "lib/fog/rackspace/requests/queues/list_queues.rb".freeze, "lib/fog/rackspace/requests/queues/update_claim.rb".freeze, "lib/fog/rackspace/requests/storage/copy_object.rb".freeze, "lib/fog/rackspace/requests/storage/delete_container.rb".freeze, "lib/fog/rackspace/requests/storage/delete_multiple_objects.rb".freeze, "lib/fog/rackspace/requests/storage/delete_object.rb".freeze, "lib/fog/rackspace/requests/storage/delete_static_large_object.rb".freeze, "lib/fog/rackspace/requests/storage/extract_archive.rb".freeze, "lib/fog/rackspace/requests/storage/get_container.rb".freeze, "lib/fog/rackspace/requests/storage/get_containers.rb".freeze, "lib/fog/rackspace/requests/storage/get_object.rb".freeze, "lib/fog/rackspace/requests/storage/get_object_http_url.rb".freeze, "lib/fog/rackspace/requests/storage/get_object_https_url.rb".freeze, "lib/fog/rackspace/requests/storage/head_container.rb".freeze, "lib/fog/rackspace/requests/storage/head_containers.rb".freeze, "lib/fog/rackspace/requests/storage/head_object.rb".freeze, "lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb".freeze, "lib/fog/rackspace/requests/storage/put_container.rb".freeze, "lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb".freeze, "lib/fog/rackspace/requests/storage/put_object.rb".freeze, "lib/fog/rackspace/requests/storage/put_object_manifest.rb".freeze, "lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb".freeze, "lib/fog/rackspace/service.rb".freeze, "lib/fog/rackspace/storage.rb".freeze, "lib/fog/rackspace/version.rb".freeze, "tests/helper.rb".freeze, "tests/helpers/collection_helper.rb".freeze, "tests/helpers/compute/flavors_helper.rb".freeze, "tests/helpers/compute/server_helper.rb".freeze, "tests/helpers/compute/servers_helper.rb".freeze, "tests/helpers/formats_helper.rb".freeze, "tests/helpers/formats_helper_tests.rb".freeze, "tests/helpers/mock_helper.rb".freeze, "tests/helpers/model_helper.rb".freeze, "tests/helpers/responds_to_helper.rb".freeze, "tests/helpers/schema_validator_tests.rb".freeze, "tests/helpers/succeeds_helper.rb".freeze, "tests/lorem.txt".freeze, "tests/rackspace/auto_scale_tests.rb".freeze, "tests/rackspace/block_storage_tests.rb".freeze, "tests/rackspace/cdn_tests.rb".freeze, "tests/rackspace/compute_tests.rb".freeze, "tests/rackspace/compute_v2_tests.rb".freeze, "tests/rackspace/databases_tests.rb".freeze, "tests/rackspace/dns_tests.rb".freeze, "tests/rackspace/helper.rb".freeze, "tests/rackspace/identity_tests.rb".freeze, "tests/rackspace/load_balancer_tests.rb".freeze, "tests/rackspace/models/auto_scale/group_builder_tests.rb".freeze, "tests/rackspace/models/auto_scale/group_tests.rb".freeze, "tests/rackspace/models/auto_scale/groups_tests.rb".freeze, "tests/rackspace/models/auto_scale/policies_tests.rb".freeze, "tests/rackspace/models/auto_scale/policy_tests.rb".freeze, "tests/rackspace/models/auto_scale/webhook_tests.rb".freeze, "tests/rackspace/models/auto_scale/webhooks_tests.rb".freeze, "tests/rackspace/models/block_storage/snapshot_tests.rb".freeze, "tests/rackspace/models/block_storage/snapshots_tests.rb".freeze, "tests/rackspace/models/block_storage/volume_tests.rb".freeze, "tests/rackspace/models/block_storage/volume_types_tests.rb".freeze, "tests/rackspace/models/block_storage/volumes_tests.rb".freeze, "tests/rackspace/models/compute_v2/flavors_tests.rb".freeze, "tests/rackspace/models/compute_v2/image_tests.rb".freeze, "tests/rackspace/models/compute_v2/images_tests.rb".freeze, "tests/rackspace/models/compute_v2/keypairs_tests.rb".freeze, "tests/rackspace/models/compute_v2/metadata_tests.rb".freeze, "tests/rackspace/models/compute_v2/network_tests.rb".freeze, "tests/rackspace/models/compute_v2/networks_tests.rb".freeze, "tests/rackspace/models/compute_v2/server_tests.rb".freeze, "tests/rackspace/models/compute_v2/servers_tests.rb".freeze, "tests/rackspace/models/compute_v2/virtual_interface_tests.rb".freeze, "tests/rackspace/models/compute_v2/virtual_interfaces_tests.rb".freeze, "tests/rackspace/models/databases/database_tests.rb".freeze, "tests/rackspace/models/databases/databases_tests.rb".freeze, "tests/rackspace/models/databases/flavors_tests.rb".freeze, "tests/rackspace/models/databases/instance_tests.rb".freeze, "tests/rackspace/models/databases/instances_tests.rb".freeze, "tests/rackspace/models/databases/user_tests.rb".freeze, "tests/rackspace/models/databases/users_tests.rb".freeze, "tests/rackspace/models/dns/zone_tests.rb".freeze, "tests/rackspace/models/dns/zones_tests.rb".freeze, "tests/rackspace/models/identity/credentials_tests.rb".freeze, "tests/rackspace/models/identity/roles_tests.rb".freeze, "tests/rackspace/models/identity/service_catalog_tests.rb".freeze, "tests/rackspace/models/identity/tenants_tests.rb".freeze, "tests/rackspace/models/identity/user_tests.rb".freeze, "tests/rackspace/models/identity/users_tests.rb".freeze, "tests/rackspace/models/load_balancers/access_list_tests.rb".freeze, "tests/rackspace/models/load_balancers/access_lists_tests.rb".freeze, "tests/rackspace/models/load_balancers/load_balancer_tests.rb".freeze, "tests/rackspace/models/load_balancers/load_balancers_tests.rb".freeze, "tests/rackspace/models/load_balancers/node_tests.rb".freeze, "tests/rackspace/models/load_balancers/nodes_tests.rb".freeze, "tests/rackspace/models/load_balancers/virtual_ip_tests.rb".freeze, "tests/rackspace/models/load_balancers/virtual_ips_tests.rb".freeze, "tests/rackspace/models/monitoring/agent_token_tests.rb".freeze, "tests/rackspace/models/monitoring/agent_tokens_tests.rb".freeze, "tests/rackspace/models/monitoring/alarm_example_tests.rb".freeze, "tests/rackspace/models/monitoring/alarm_examples_tests.rb".freeze, "tests/rackspace/models/monitoring/alarm_tests.rb".freeze, "tests/rackspace/models/monitoring/alarms_tests.rb".freeze, "tests/rackspace/models/monitoring/check_tests.rb".freeze, "tests/rackspace/models/monitoring/check_types_tests.rb".freeze, "tests/rackspace/models/monitoring/checks_tests.rb".freeze, "tests/rackspace/models/monitoring/data_points_tests.rb".freeze, "tests/rackspace/models/monitoring/entities_tests.rb".freeze, "tests/rackspace/models/monitoring/entity_tests.rb".freeze, "tests/rackspace/models/monitoring/metric_tests.rb".freeze, "tests/rackspace/models/monitoring/metrics_tests.rb".freeze, "tests/rackspace/models/monitoring/notification_tests.rb".freeze, "tests/rackspace/models/monitoring/notifications_tests.rb".freeze, "tests/rackspace/models/networking/network_tests.rb".freeze, "tests/rackspace/models/networking/networks_tests.rb".freeze, "tests/rackspace/models/networking/virtual_interface_tests.rb".freeze, "tests/rackspace/models/networking/virtual_interfaces_tests.rb".freeze, "tests/rackspace/models/queues/claim_tests.rb".freeze, "tests/rackspace/models/queues/claims_tests.rb".freeze, "tests/rackspace/models/queues/message_tests.rb".freeze, "tests/rackspace/models/queues/messages_tests.rb".freeze, "tests/rackspace/models/queues/queue_tests.rb".freeze, "tests/rackspace/models/queues/queues_tests.rb".freeze, "tests/rackspace/models/storage/account_tests.rb".freeze, "tests/rackspace/models/storage/directories_tests.rb".freeze, "tests/rackspace/models/storage/directory_tests.rb".freeze, "tests/rackspace/models/storage/file_tests.rb".freeze, "tests/rackspace/models/storage/files_tests.rb".freeze, "tests/rackspace/models/storage/metadata_tests.rb".freeze, "tests/rackspace/monitoring_tests.rb".freeze, "tests/rackspace/networking_tests.rb".freeze, "tests/rackspace/queues_tests.rb".freeze, "tests/rackspace/rackspace_tests.rb".freeze, "tests/rackspace/requests/auto_scale/config_tests.rb".freeze, "tests/rackspace/requests/auto_scale/group_tests.rb".freeze, "tests/rackspace/requests/auto_scale/helper.rb".freeze, "tests/rackspace/requests/auto_scale/policy_tests.rb".freeze, "tests/rackspace/requests/auto_scale/webhook_tests.rb".freeze, "tests/rackspace/requests/block_storage/snapshot_tests.rb".freeze, "tests/rackspace/requests/block_storage/volume_tests.rb".freeze, "tests/rackspace/requests/block_storage/volume_type_tests.rb".freeze, "tests/rackspace/requests/cdn/cdn_tests.rb".freeze, "tests/rackspace/requests/compute/address_tests.rb".freeze, "tests/rackspace/requests/compute/flavor_tests.rb".freeze, "tests/rackspace/requests/compute/helper.rb".freeze, "tests/rackspace/requests/compute/image_tests.rb".freeze, "tests/rackspace/requests/compute/resize_tests.rb".freeze, "tests/rackspace/requests/compute/server_tests.rb".freeze, "tests/rackspace/requests/compute_v2/address_tests.rb".freeze, "tests/rackspace/requests/compute_v2/attachment_tests.rb".freeze, "tests/rackspace/requests/compute_v2/flavor_tests.rb".freeze, "tests/rackspace/requests/compute_v2/image_tests.rb".freeze, "tests/rackspace/requests/compute_v2/keypair_tests.rb".freeze, "tests/rackspace/requests/compute_v2/metadata_tests.rb".freeze, "tests/rackspace/requests/compute_v2/network_tests.rb".freeze, "tests/rackspace/requests/compute_v2/server_tests.rb".freeze, "tests/rackspace/requests/compute_v2/virtual_interface_tests.rb".freeze, "tests/rackspace/requests/databases/database_tests.rb".freeze, "tests/rackspace/requests/databases/flavor_tests.rb".freeze, "tests/rackspace/requests/databases/helper.rb".freeze, "tests/rackspace/requests/databases/instance_tests.rb".freeze, "tests/rackspace/requests/databases/user_tests.rb".freeze, "tests/rackspace/requests/dns/dns_tests.rb".freeze, "tests/rackspace/requests/dns/helper.rb".freeze, "tests/rackspace/requests/dns/records_tests.rb".freeze, "tests/rackspace/requests/identity/tenants_tests.rb".freeze, "tests/rackspace/requests/identity/token_tests.rb".freeze, "tests/rackspace/requests/identity/user_tests.rb".freeze, "tests/rackspace/requests/load_balancers/access_list_tests.rb".freeze, "tests/rackspace/requests/load_balancers/algorithm_tests.rb".freeze, "tests/rackspace/requests/load_balancers/connection_logging_tests.rb".freeze, "tests/rackspace/requests/load_balancers/connection_throttling_tests.rb".freeze, "tests/rackspace/requests/load_balancers/content_caching_tests.rb".freeze, "tests/rackspace/requests/load_balancers/error_page_tests.rb".freeze, "tests/rackspace/requests/load_balancers/get_stats_tests.rb".freeze, "tests/rackspace/requests/load_balancers/helper.rb".freeze, "tests/rackspace/requests/load_balancers/load_balancer_tests.rb".freeze, "tests/rackspace/requests/load_balancers/load_balancer_usage_tests.rb".freeze, "tests/rackspace/requests/load_balancers/monitor_tests.rb".freeze, "tests/rackspace/requests/load_balancers/node_tests.rb".freeze, "tests/rackspace/requests/load_balancers/protocol_tests.rb".freeze, "tests/rackspace/requests/load_balancers/session_persistence_tests.rb".freeze, "tests/rackspace/requests/load_balancers/ssl_termination_tests.rb".freeze, "tests/rackspace/requests/load_balancers/usage_tests.rb".freeze, "tests/rackspace/requests/load_balancers/virtual_ip_tests.rb".freeze, "tests/rackspace/requests/monitoring/agent_tests.rb".freeze, "tests/rackspace/requests/monitoring/alarm_example_tests.rb".freeze, "tests/rackspace/requests/monitoring/alarm_tests.rb".freeze, "tests/rackspace/requests/monitoring/check_tests.rb".freeze, "tests/rackspace/requests/monitoring/entity_tests.rb".freeze, "tests/rackspace/requests/monitoring/helper.rb".freeze, "tests/rackspace/requests/monitoring/list_tests.rb".freeze, "tests/rackspace/requests/monitoring/notification_tests.rb".freeze, "tests/rackspace/requests/networking/network_tests.rb".freeze, "tests/rackspace/requests/networking/virtual_interface_tests.rb".freeze, "tests/rackspace/requests/queues/claim_tests.rb".freeze, "tests/rackspace/requests/queues/helper.rb".freeze, "tests/rackspace/requests/queues/messages_tests.rb".freeze, "tests/rackspace/requests/queues/queues_tests.rb".freeze, "tests/rackspace/requests/storage/account_tests.rb".freeze, "tests/rackspace/requests/storage/container_tests.rb".freeze, "tests/rackspace/requests/storage/large_object_tests.rb".freeze, "tests/rackspace/requests/storage/object_tests.rb".freeze, "tests/rackspace/service_tests.rb".freeze, "tests/rackspace/storage_tests.rb".freeze, "tests/rackspace/url_encoding_tests.rb".freeze] + s.homepage = "http://developer.rackspace.com".freeze + s.licenses = ["MIT".freeze] + s.rubygems_version = "3.4.10".freeze + s.summary = "Rackspace support for Fog".freeze - spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } - spec.bindir = "exe" - spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } - spec.require_paths = ["lib"] + s.installed_by_version = "3.4.10" if s.respond_to? :installed_by_version - spec.add_development_dependency 'bundler', '~> 2.0' - spec.add_development_dependency 'rake', '>= 12.3.3' - spec.add_development_dependency 'shindo', '~> 0.3' - spec.add_development_dependency 'rspec', '~> 3.4' - spec.add_development_dependency 'rubyzip', '~> 1.3.0' - spec.add_development_dependency 'pry', '~> 0.10.3' - spec.add_development_dependency 'vcr', '~> 3.0.1' - spec.add_development_dependency 'webmock', '~> 1.24.2' - spec.add_development_dependency "mime-types" - spec.add_development_dependency "mime-types-data" + s.specification_version = 4 - spec.add_dependency 'fog-core', '>= 1.35' - spec.add_dependency 'fog-json', '>= 1.0' - spec.add_dependency 'fog-xml', '>= 0.1' - spec.add_dependency 'ipaddress', '>= 0.8' + s.add_development_dependency(%q.freeze, ["~> 2.0"]) + s.add_development_dependency(%q.freeze, [">= 12.3.3"]) + s.add_development_dependency(%q.freeze, ["~> 0.3"]) + s.add_development_dependency(%q.freeze, ["~> 3.4"]) + s.add_development_dependency(%q.freeze, ["~> 1.3.0"]) + s.add_development_dependency(%q.freeze, ["~> 0.10.3"]) + s.add_development_dependency(%q.freeze, ["~> 3.0.1"]) + s.add_development_dependency(%q.freeze, ["~> 1.24.2"]) + s.add_development_dependency(%q.freeze, [">= 0"]) + s.add_development_dependency(%q.freeze, [">= 0"]) + s.add_runtime_dependency(%q.freeze, [">= 1.35"]) + s.add_runtime_dependency(%q.freeze, [">= 1.0"]) + s.add_runtime_dependency(%q.freeze, [">= 0.1"]) + s.add_runtime_dependency(%q.freeze, [">= 0.8"]) end diff --git a/lib/fog/rackspace/models/storage/directories.rb b/lib/fog/rackspace/models/storage/directories.rb index c49993b..6eb9ca2 100644 --- a/lib/fog/rackspace/models/storage/directories.rb +++ b/lib/fog/rackspace/models/storage/directories.rb @@ -2,8 +2,8 @@ require 'fog/rackspace/models/storage/directory' module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Directories < Fog::Collection model Fog::Rackspace::Storage::Directory diff --git a/lib/fog/rackspace/models/storage/directory.rb b/lib/fog/rackspace/models/storage/directory.rb index 03c50de..2af78db 100644 --- a/lib/fog/rackspace/models/storage/directory.rb +++ b/lib/fog/rackspace/models/storage/directory.rb @@ -3,8 +3,8 @@ require 'fog/rackspace/models/storage/metadata' module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Directory < Fog::Model # @!attribute [r] key # @return [String] The name of the directory diff --git a/lib/fog/rackspace/models/storage/file.rb b/lib/fog/rackspace/models/storage/file.rb index 2ebc233..0a3e5dc 100644 --- a/lib/fog/rackspace/models/storage/file.rb +++ b/lib/fog/rackspace/models/storage/file.rb @@ -1,8 +1,8 @@ require 'fog/core/model' module Fog - module Storage - class Rackspace + module Rackspace + class Storage class File < Fog::Model # @!attribute [r] key # @return [String] The name of the file diff --git a/lib/fog/rackspace/models/storage/files.rb b/lib/fog/rackspace/models/storage/files.rb index 0ddeba3..5a2e238 100644 --- a/lib/fog/rackspace/models/storage/files.rb +++ b/lib/fog/rackspace/models/storage/files.rb @@ -2,8 +2,8 @@ require 'fog/rackspace/models/storage/file' module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Files < Fog::Collection # @!attribute [rw] directory # @return [String] The name of the directory diff --git a/lib/fog/rackspace/models/storage/metadata.rb b/lib/fog/rackspace/models/storage/metadata.rb index bbd35f1..5076707 100644 --- a/lib/fog/rackspace/models/storage/metadata.rb +++ b/lib/fog/rackspace/models/storage/metadata.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Metadata OBJECT_META_PREFIX = "X-Object-Meta-" OBJECT_REMOVE_META_PREFIX = "X-Remove-Object-Meta-" diff --git a/tests/rackspace/requests/cdn/cdn_tests.rb b/tests/rackspace/requests/cdn/cdn_tests.rb index f1684ca..e534ed0 100644 --- a/tests/rackspace/requests/cdn/cdn_tests.rb +++ b/tests/rackspace/requests/cdn/cdn_tests.rb @@ -64,11 +64,11 @@ tests('failure') do - tests("#head_container('missing_container')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#head_container('missing_container')").raises(Fog::Rackspace::Storage::NotFound) do Fog::CDN[:rackspace].head_container('missing_container') end - tests("#post_container('missing_container')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#post_container('missing_container')").raises(Fog::Rackspace::Storage::NotFound) do Fog::CDN[:rackspace].post_container('missing_container', 'X-TTL' => 5000) end end diff --git a/tests/rackspace/requests/storage/container_tests.rb b/tests/rackspace/requests/storage/container_tests.rb index 4cac82e..fc6be22 100644 --- a/tests/rackspace/requests/storage/container_tests.rb +++ b/tests/rackspace/requests/storage/container_tests.rb @@ -50,15 +50,15 @@ tests('failure') do - tests("#get_container('fognoncontainer')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#get_container('fognoncontainer')").raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].get_container('fognoncontainer') end - tests("#head_container('fognoncontainer')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#head_container('fognoncontainer')").raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].head_container('fognoncontainer') end - tests("#delete_container('fognoncontainer')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#delete_container('fognoncontainer')").raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].delete_container('fognoncontainer') end diff --git a/tests/rackspace/requests/storage/large_object_tests.rb b/tests/rackspace/requests/storage/large_object_tests.rb index 99630c0..9a4a46a 100644 --- a/tests/rackspace/requests/storage/large_object_tests.rb +++ b/tests/rackspace/requests/storage/large_object_tests.rb @@ -204,7 +204,7 @@ tests('dynamic large object requests') do - tests('#put_dynamic_obj_manifest with missing container').raises(Fog::Storage::Rackspace::NotFound) do + tests('#put_dynamic_obj_manifest with missing container').raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].put_dynamic_obj_manifest('fognoncontainer', 'fog_large_object') end @@ -217,7 +217,7 @@ Fog::Storage[:rackspace].put_object(@segments[:b][:container], @segments[:b][:name], @segments[:b][:data]) end - tests('#put_static_obj_manifest with missing container').raises(Fog::Storage::Rackspace::NotFound) do + tests('#put_static_obj_manifest with missing container').raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].put_static_obj_manifest('fognoncontainer', 'fog_large_object', []) end @@ -236,7 +236,7 @@ error = err end - raises(Fog::Storage::Rackspace::BadRequest) do + raises(Fog::Rackspace::Storage::BadRequest) do raise error if error end @@ -261,7 +261,7 @@ error = err end - raises(Fog::Storage::Rackspace::BadRequest) do + raises(Fog::Rackspace::Storage::BadRequest) do raise error if error end @@ -286,7 +286,7 @@ error = err end - raises(Fog::Storage::Rackspace::BadRequest) do + raises(Fog::Rackspace::Storage::BadRequest) do raise error if error end diff --git a/tests/rackspace/requests/storage/object_tests.rb b/tests/rackspace/requests/storage/object_tests.rb index 0d153c0..ce84d43 100644 --- a/tests/rackspace/requests/storage/object_tests.rb +++ b/tests/rackspace/requests/storage/object_tests.rb @@ -55,7 +55,7 @@ def parse_url(url_string) # an object key with no special characters tests("#get_object_http_url('fogobjecttests', 'fog_object','expiration timestamp')").succeeds do expires_at = 1344149532 # 2012-08-05 16:52:12 +1000 - storage = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret") + storage = Fog::Rackspace::Storage.new(:rackspace_temp_url_key => "super_secret") storage.extend RackspaceStorageHelpers storage.override_path('/fake_version/fake_tenant') object_url = storage.get_object_http_url('fogobjecttests', 'fog_object', expires_at) @@ -71,7 +71,7 @@ def parse_url(url_string) # an object key with no special characters tests("#get_object_https_url('fogobjecttests', 'fog_object','expiration timestamp')").succeeds do expires_at = 1344149532 # 2012-08-05 16:52:12 +1000 - storage = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret") + storage = Fog::Rackspace::Storage.new(:rackspace_temp_url_key => "super_secret") storage.extend RackspaceStorageHelpers storage.override_path('/fake_version/fake_tenant') object_url = storage.get_object_https_url('fogobjecttests', 'fog_object', expires_at) @@ -87,7 +87,7 @@ def parse_url(url_string) # an object key nested under a / tests("#get_object_https_url('fogobjecttests', 'fog/object','expiration timestamp')").succeeds do expires_at = 1344149532 # 2012-08-05 16:52:12 +1000 - storage = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret") + storage = Fog::Rackspace::Storage.new(:rackspace_temp_url_key => "super_secret") storage.extend RackspaceStorageHelpers storage.override_path('/fake_version/fake_tenant') object_url = storage.get_object_https_url('fogobjecttests', 'fog/object', expires_at) @@ -103,7 +103,7 @@ def parse_url(url_string) # an object key containing a - tests("#get_object_https_url('fogobjecttests', 'fog-object','expiration timestamp')").succeeds do expires_at = 1344149532 # 2012-08-05 16:52:12 +1000 - storage = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret") + storage = Fog::Rackspace::Storage.new(:rackspace_temp_url_key => "super_secret") storage.extend RackspaceStorageHelpers storage.override_path('/fake_version/fake_tenant') object_url = storage.get_object_https_url('fogobjecttests', 'fog-object', expires_at) @@ -165,27 +165,27 @@ def parse_url(url_string) tests('failure') do - tests("#get_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#get_object('fogobjecttests', 'fog_non_object')").raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_non_object') end - tests("#get_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#get_object('fognoncontainer', 'fog_non_object')").raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].get_object('fognoncontainer', 'fog_non_object') end - tests("#head_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#head_object('fogobjecttests', 'fog_non_object')").raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].head_object('fogobjecttests', 'fog_non_object') end - tests("#head_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#head_object('fognoncontainer', 'fog_non_object')").raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].head_object('fognoncontainer', 'fog_non_object') end - tests("#delete_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#delete_object('fogobjecttests', 'fog_non_object')").raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].delete_object('fogobjecttests', 'fog_non_object') end - tests("#delete_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do + tests("#delete_object('fognoncontainer', 'fog_non_object')").raises(Fog::Rackspace::Storage::NotFound) do Fog::Storage[:rackspace].delete_object('fognoncontainer', 'fog_non_object') end From fcdd50911b3a288684fd335af9a54576a73d3e5c Mon Sep 17 00:00:00 2001 From: Marc Hassman Date: Wed, 5 Jun 2024 17:59:24 -0500 Subject: [PATCH 7/9] flip names in tests, add some aliases for retained names --- lib/fog/rackspace/compute.rb | 3 + lib/fog/rackspace/compute_v2.rb | 3 + .../models/compute_v2/virtual_interface.rb | 4 +- lib/fog/rackspace/models/storage/account.rb | 4 +- tests/helpers/succeeds_helper.rb | 4 +- tests/rackspace/cdn_tests.rb | 2 +- tests/rackspace/compute_tests.rb | 2 +- tests/rackspace/compute_v2_tests.rb | 2 +- tests/rackspace/dns_tests.rb | 2 +- .../models/compute_v2/metadata_tests.rb | 4 +- .../models/compute_v2/server_tests.rb | 40 ++++----- .../compute_v2/virtual_interface_tests.rb | 2 +- tests/rackspace/models/storage/file_tests.rb | 12 +-- .../models/storage/metadata_tests.rb | 82 +++++++++---------- tests/rackspace/requests/cdn/cdn_tests.rb | 2 +- .../requests/compute_v2/metadata_tests.rb | 2 +- tests/rackspace/storage_tests.rb | 32 ++++---- 17 files changed, 104 insertions(+), 98 deletions(-) diff --git a/lib/fog/rackspace/compute.rb b/lib/fog/rackspace/compute.rb index 3565c5d..7112fa6 100644 --- a/lib/fog/rackspace/compute.rb +++ b/lib/fog/rackspace/compute.rb @@ -253,4 +253,7 @@ def authenticate_v1(options) end end end + + # fog-core 2.4.0 still users this definition + Compute::Rackspace = Fog::Rackspace::Compute end diff --git a/lib/fog/rackspace/compute_v2.rb b/lib/fog/rackspace/compute_v2.rb index 45a4013..a652573 100644 --- a/lib/fog/rackspace/compute_v2.rb +++ b/lib/fog/rackspace/compute_v2.rb @@ -250,4 +250,7 @@ def authenticate_v1(options) end end end + + # fog-core 2.4.0 still has this definitaion + Compute::RackspaceV2 = Fog::Rackspace::ComputeV2 end diff --git a/lib/fog/rackspace/models/compute_v2/virtual_interface.rb b/lib/fog/rackspace/models/compute_v2/virtual_interface.rb index 0854591..7d5c228 100644 --- a/lib/fog/rackspace/models/compute_v2/virtual_interface.rb +++ b/lib/fog/rackspace/models/compute_v2/virtual_interface.rb @@ -2,8 +2,8 @@ require 'fog/rackspace/models/compute_v2/virtual_interface' module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class VirtualInterface < Fog::Model # @!attribute [r] id # @return [String] The virtual interface id diff --git a/lib/fog/rackspace/models/storage/account.rb b/lib/fog/rackspace/models/storage/account.rb index 1bf014a..f742855 100644 --- a/lib/fog/rackspace/models/storage/account.rb +++ b/lib/fog/rackspace/models/storage/account.rb @@ -1,8 +1,8 @@ require 'fog/core/model' module Fog - module Storage - class Rackspace + module Rackspace + class Storage class Account < Fog::Model # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/View_Account_Info-d1e11995.html diff --git a/tests/helpers/succeeds_helper.rb b/tests/helpers/succeeds_helper.rb index b54589e..d978f4c 100644 --- a/tests/helpers/succeeds_helper.rb +++ b/tests/helpers/succeeds_helper.rb @@ -1,8 +1,8 @@ module Shindo class Tests - def succeeds + def succeeds(&block) test('succeeds') do - !!instance_eval(&Proc.new) + !!instance_eval(&block) end end end diff --git a/tests/rackspace/cdn_tests.rb b/tests/rackspace/cdn_tests.rb index ecf7191..8d6aabc 100644 --- a/tests/rackspace/cdn_tests.rb +++ b/tests/rackspace/cdn_tests.rb @@ -6,7 +6,7 @@ def assert_method(url, method) end tests('#authentication_method') do - @service = Fog::CDN::Rackspace.new + @service = Fog::Rackspace::CDN.new assert_method nil, :authenticate_v2 diff --git a/tests/rackspace/compute_tests.rb b/tests/rackspace/compute_tests.rb index 492846c..074904b 100644 --- a/tests/rackspace/compute_tests.rb +++ b/tests/rackspace/compute_tests.rb @@ -6,7 +6,7 @@ def assert_method(url, method) end tests('#authentication_method') do - @service = Fog::Compute::Rackspace.new + @service = Fog::Rackspace::Compute.new assert_method nil, :authenticate_v2 diff --git a/tests/rackspace/compute_v2_tests.rb b/tests/rackspace/compute_v2_tests.rb index 2e4412c..276a220 100644 --- a/tests/rackspace/compute_v2_tests.rb +++ b/tests/rackspace/compute_v2_tests.rb @@ -6,7 +6,7 @@ def assert_method(url, method) end tests('#authentication_method') do - @service = Fog::Compute::RackspaceV2.new + @service = Fog::Rackspace::ComputeV2.new assert_method nil, :authenticate_v2 diff --git a/tests/rackspace/dns_tests.rb b/tests/rackspace/dns_tests.rb index a4aeb37..a61dae4 100644 --- a/tests/rackspace/dns_tests.rb +++ b/tests/rackspace/dns_tests.rb @@ -6,7 +6,7 @@ def assert_method(url, method) end tests('#authentication_method') do - @service = Fog::DNS::Rackspace.new + @service = Fog::Rackspace::DNS.new assert_method nil, :authenticate_v2 diff --git a/tests/rackspace/models/compute_v2/metadata_tests.rb b/tests/rackspace/models/compute_v2/metadata_tests.rb index b2a5e04..03822d4 100644 --- a/tests/rackspace/models/compute_v2/metadata_tests.rb +++ b/tests/rackspace/models/compute_v2/metadata_tests.rb @@ -1,8 +1,8 @@ -Shindo.tests('Fog::Compute::RackspaceV2 | metadata', ['rackspace']) do +Shindo.tests('Fog::Rackspace::ComputeV2 | metadata', ['rackspace']) do pending if Fog.mocking? - service = Fog::Compute::RackspaceV2.new + service = Fog::Rackspace::ComputeV2.new test_time = Time.now.to_i.to_s tests('success') do diff --git a/tests/rackspace/models/compute_v2/server_tests.rb b/tests/rackspace/models/compute_v2/server_tests.rb index ba28ef2..fc5d5c5 100644 --- a/tests/rackspace/models/compute_v2/server_tests.rb +++ b/tests/rackspace/models/compute_v2/server_tests.rb @@ -1,5 +1,5 @@ -Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do - service = Fog::Compute::RackspaceV2.new +Shindo.tests('Fog::Rackspace::ComputeV2 | server', ['rackspace']) do + service = Fog::Rackspace::ComputeV2.new cbs_service = Fog::Rackspace::BlockStorage.new tests('setup test network').succeeds do @@ -15,50 +15,50 @@ } tests('ready?') do - @server = Fog::Compute::RackspaceV2::Server.new + @server = Fog::Rackspace::ComputeV2::Server.new tests('default in ready state').returns(true) do - @server.state = Fog::Compute::RackspaceV2::Server::ACTIVE + @server.state = Fog::Rackspace::ComputeV2::Server::ACTIVE @server.ready? end tests('custom ready state').returns(true) do - @server.state = Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE - @server.ready?(Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE) + @server.state = Fog::Rackspace::ComputeV2::Server::VERIFY_RESIZE + @server.ready?(Fog::Rackspace::ComputeV2::Server::VERIFY_RESIZE) end tests('default NOT in ready state').returns(false) do - @server.state = Fog::Compute::RackspaceV2::Server::REBOOT + @server.state = Fog::Rackspace::ComputeV2::Server::REBOOT @server.ready? end tests('custom NOT ready state').returns(false) do - @server.state = Fog::Compute::RackspaceV2::Server::REBOOT - @server.ready?(Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE) + @server.state = Fog::Rackspace::ComputeV2::Server::REBOOT + @server.ready?(Fog::Rackspace::ComputeV2::Server::VERIFY_RESIZE) end tests('default error state').returns(true) do - @server.state = Fog::Compute::RackspaceV2::Server::ERROR + @server.state = Fog::Rackspace::ComputeV2::Server::ERROR exception_occurred = false begin @server.ready? - rescue Fog::Compute::RackspaceV2::InvalidServerStateException => e + rescue Fog::Rackspace::ComputeV2::InvalidServerStateException => e exception_occurred = true - returns(true) {e.desired_state == Fog::Compute::RackspaceV2::Server::ACTIVE } - returns(true) {e.current_state == Fog::Compute::RackspaceV2::Server::ERROR } + returns(true) {e.desired_state == Fog::Rackspace::ComputeV2::Server::ACTIVE } + returns(true) {e.current_state == Fog::Rackspace::ComputeV2::Server::ERROR } end exception_occurred end tests('custom error state').returns(true) do - @server.state = Fog::Compute::RackspaceV2::Server::ACTIVE + @server.state = Fog::Rackspace::ComputeV2::Server::ACTIVE exception_occurred = false begin - @server.ready?(Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE, Fog::Compute::RackspaceV2::Server::ACTIVE) - rescue Fog::Compute::RackspaceV2::InvalidServerStateException => e + @server.ready?(Fog::Rackspace::ComputeV2::Server::VERIFY_RESIZE, Fog::Rackspace::ComputeV2::Server::ACTIVE) + rescue Fog::Rackspace::ComputeV2::InvalidServerStateException => e exception_occurred = true - returns(true) {e.desired_state == Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE } - returns(true) {e.current_state == Fog::Compute::RackspaceV2::Server::ACTIVE } + returns(true) {e.desired_state == Fog::Rackspace::ComputeV2::Server::VERIFY_RESIZE } + returns(true) {e.current_state == Fog::Rackspace::ComputeV2::Server::ACTIVE } end exception_occurred end @@ -217,12 +217,12 @@ } create_server = lambda { |attributes| - service = Fog::Compute::RackspaceV2.new + service = Fog::Rackspace::ComputeV2.new attributes.merge!(:service => service) Fog::SSH::Mock.data.clear - server = Fog::Compute::RackspaceV2::Server.new(attributes) + server = Fog::Rackspace::ComputeV2::Server.new(attributes) server.save(attributes) @address = 123 diff --git a/tests/rackspace/models/compute_v2/virtual_interface_tests.rb b/tests/rackspace/models/compute_v2/virtual_interface_tests.rb index be439ff..c3f87db 100644 --- a/tests/rackspace/models/compute_v2/virtual_interface_tests.rb +++ b/tests/rackspace/models/compute_v2/virtual_interface_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Fog::Compute::RackspaceV2 | virtual_interface', ['rackspace']) do +Shindo.tests('Fog::Rackspace::ComputeV2 | virtual_interface', ['rackspace']) do service = Fog::Compute::RackspaceV2.new net_options = { diff --git a/tests/rackspace/models/storage/file_tests.rb b/tests/rackspace/models/storage/file_tests.rb index 160f008..16c5062 100644 --- a/tests/rackspace/models/storage/file_tests.rb +++ b/tests/rackspace/models/storage/file_tests.rb @@ -4,27 +4,27 @@ tests("last_modified=") do tests("no timezone") do - file = Fog::Storage::Rackspace::File.new + file = Fog::Rackspace::Storage::File.new file.last_modified = "2013-05-09T22:20:59.287990" returns(Fog::Time.utc(2013, 5, 9, 22, 20, 59, 287990, nil) == file.last_modified) { true } end tests("with timezone") do - file = Fog::Storage::Rackspace::File.new + file = Fog::Rackspace::Storage::File.new file.last_modified = "Thu, 09 May 2015 22:20:59 GMT" returns(Fog::Time.utc(2015, 5, 9, 22, 20, 59, 0, nil).to_i == file.last_modified.to_i) { true } end tests("with time") do - file = Fog::Storage::Rackspace::File.new + file = Fog::Rackspace::Storage::File.new file.last_modified = Fog::Time.utc(2015, 5, 9, 22, 20, 59, 0, nil) returns(Fog::Time.utc(2015, 5, 9, 22, 20, 59, 0, nil) == file.last_modified) { true } end tests("nil") do - file = Fog::Storage::Rackspace::File.new + file = Fog::Rackspace::Storage::File.new file.last_modified = nil returns(nil) { file.last_modified } end tests("empty string") do - file = Fog::Storage::Rackspace::File.new + file = Fog::Rackspace::Storage::File.new file.last_modified = "" returns("") { file.last_modified } end @@ -211,7 +211,7 @@ def clear_metadata @file.destroy if @file end - tests('invalid tag').raises(Fog::Storage::Rackspace::ServiceError) do + tests('invalid tag').raises(Fog::Rackspace::Storage::ServiceError) do @directory.files.create :key => 'invalid-etag.txt', :body => text, :etag => "bad-bad-tag" end end diff --git a/tests/rackspace/models/storage/metadata_tests.rb b/tests/rackspace/models/storage/metadata_tests.rb index 99db184..2cc9854 100644 --- a/tests/rackspace/models/storage/metadata_tests.rb +++ b/tests/rackspace/models/storage/metadata_tests.rb @@ -6,31 +6,31 @@ Shindo.tests('Fog::Rackspace::Storage | metadata', ['rackspace']) do def assert_directory(obj, assert_value) - metadata = Fog::Storage::Rackspace::Metadata.new obj + metadata = Fog::Rackspace::Storage::Metadata.new obj returns(assert_value) { metadata.send :directory? } end def assert_file(obj, assert_value) - metadata = Fog::Storage::Rackspace::Metadata.new obj + metadata = Fog::Rackspace::Storage::Metadata.new obj returns(assert_value) { metadata.send :file? } end tests('Directory') do - @directory = Fog::Storage::Rackspace::Directory.new + @directory = Fog::Rackspace::Storage::Directory.new tests('#to_key') do tests('valid key').returns(:image_size) do - metadata = Fog::Storage::Rackspace::Metadata.new @directory + metadata = Fog::Rackspace::Storage::Metadata.new @directory metadata.send(:to_key, "X-Container-Meta-Image-Size") end tests('invalid key').returns(nil) do - metadata = Fog::Storage::Rackspace::Metadata.new @directory + metadata = Fog::Rackspace::Storage::Metadata.new @directory metadata.send(:to_key, "bad-key") end end tests('#[]') do tests('[:symbol_test]=42') do - metadata = Fog::Storage::Rackspace::Metadata.new @directory + metadata = Fog::Rackspace::Storage::Metadata.new @directory metadata[:symbol_test] = 42 returns(42) { metadata[:symbol_test] } @@ -39,7 +39,7 @@ def assert_file(obj, assert_value) end tests('[\'string_test\']=55') do - metadata = Fog::Storage::Rackspace::Metadata.new @directory + metadata = Fog::Rackspace::Storage::Metadata.new @directory metadata['string_test'] = 55 returns(55) { metadata[:string_test] } @@ -48,7 +48,7 @@ def assert_file(obj, assert_value) end tests('set string and symbol') do - metadata = Fog::Storage::Rackspace::Metadata.new @directory + metadata = Fog::Rackspace::Storage::Metadata.new @directory metadata[:key_test] = 55 metadata['key_test'] = 55 @@ -56,7 +56,7 @@ def assert_file(obj, assert_value) end tests('key to remove').returns("X-Remove-Container-Meta-Thumbnail-Image") do - metadata = Fog::Storage::Rackspace::Metadata.new @directory + metadata = Fog::Rackspace::Storage::Metadata.new @directory metadata.send(:to_header_key, :thumbnail_image, nil) end @@ -64,7 +64,7 @@ def assert_file(obj, assert_value) tests('#to_header_key') do - metadata = Fog::Storage::Rackspace::Metadata.new @directory + metadata = Fog::Rackspace::Storage::Metadata.new @directory tests('key to add').returns("X-Container-Meta-Thumbnail-Image") do metadata.send(:to_header_key, :thumbnail_image, true) @@ -76,7 +76,7 @@ def assert_file(obj, assert_value) end tests('#to_headers').returns({"X-Container-Meta-Preview"=>true, "X-Remove-Container-Meta-Delete-Me"=>1}) do - metadata = Fog::Storage::Rackspace::Metadata.new @directory + metadata = Fog::Rackspace::Storage::Metadata.new @directory metadata[:preview] = true metadata[:delete_me] = nil @@ -90,12 +90,12 @@ def assert_file(obj, assert_value) "X-Container-Meta-My-String"=> "I am a string" } - metadata = Fog::Storage::Rackspace::Metadata.from_headers @directory, headers + metadata = Fog::Rackspace::Storage::Metadata.from_headers @directory, headers metadata.data end tests("#delete").returns({"X-Remove-Container-Meta-Delete-Me"=>1}) do - metadata = Fog::Storage::Rackspace::Metadata.new @directory + metadata = Fog::Rackspace::Storage::Metadata.new @directory metadata.delete(:delete_me) metadata.to_headers @@ -103,20 +103,20 @@ def assert_file(obj, assert_value) end tests('File') do - @file = Fog::Storage::Rackspace::File.new + @file = Fog::Rackspace::Storage::File.new tests('#to_key') do tests('valid key').returns(:image_size) do - metadata = Fog::Storage::Rackspace::Metadata.new @file + metadata = Fog::Rackspace::Storage::Metadata.new @file metadata.send(:to_key, "X-Object-Meta-Image-Size") end tests('invalid key').returns(nil) do - metadata = Fog::Storage::Rackspace::Metadata.new @file + metadata = Fog::Rackspace::Storage::Metadata.new @file metadata.send(:to_key, "bad-key") end end tests('#to_header_key') do - metadata = Fog::Storage::Rackspace::Metadata.new @file + metadata = Fog::Rackspace::Storage::Metadata.new @file tests('key to add').returns("X-Object-Meta-Thumbnail-Image") do metadata.send(:to_header_key, :thumbnail_image, true) @@ -128,7 +128,7 @@ def assert_file(obj, assert_value) end tests('#to_headers').returns({"X-Object-Meta-Preview"=>true, "X-Remove-Object-Meta-Delete-Me"=>1}) do - metadata = Fog::Storage::Rackspace::Metadata.new @file + metadata = Fog::Rackspace::Storage::Metadata.new @file metadata[:preview] = true metadata[:delete_me] = nil @@ -142,12 +142,12 @@ def assert_file(obj, assert_value) "X-Object-Meta-My-String"=> "I am a string" } - metadata = Fog::Storage::Rackspace::Metadata.from_headers @file, headers + metadata = Fog::Rackspace::Storage::Metadata.from_headers @file, headers metadata.data end tests("#delete").returns({"X-Remove-Object-Meta-Delete-Me"=>1}) do - metadata = Fog::Storage::Rackspace::Metadata.new @file + metadata = Fog::Rackspace::Storage::Metadata.new @file metadata.delete(:delete_me) metadata.to_headers @@ -156,53 +156,53 @@ def assert_file(obj, assert_value) tests("#respond_to?") do tests('Should respond to all of the methods in Hash class').returns(true) do - metadata = Fog::Storage::Rackspace::Metadata.new @file + metadata = Fog::Rackspace::Storage::Metadata.new @file Hash.instance_methods.all? {|method| metadata.respond_to?(method)} end tests('Should respond to all of the methods in the Metadata class').returns(true) do - metadata = Fog::Storage::Rackspace::Metadata.new @file + metadata = Fog::Rackspace::Storage::Metadata.new @file metadata.methods.all? {|method| metadata.respond_to?(method)} end end tests("#method_missing").returns(true) do - metadata = Fog::Storage::Rackspace::Metadata.new @file + metadata = Fog::Rackspace::Storage::Metadata.new @file metadata[:test] = true metadata[:test] end tests('#directory?') do - assert_directory Fog::Storage::Rackspace::Directories, true - assert_directory Fog::Storage::Rackspace::Directory, true - assert_directory Fog::Storage::Rackspace::Directory.new, true + assert_directory Fog::Rackspace::Storage::Directories, true + assert_directory Fog::Rackspace::Storage::Directory, true + assert_directory Fog::Rackspace::Storage::Directory.new, true assert_directory nil, false - assert_directory Fog::Storage::Rackspace::Files, false - assert_directory Fog::Storage::Rackspace::File, false - assert_directory Fog::Storage::Rackspace::File.new, false + assert_directory Fog::Rackspace::Storage::Files, false + assert_directory Fog::Rackspace::Storage::File, false + assert_directory Fog::Rackspace::Storage::File.new, false assert_directory "I am a string!", false end tests('#file?') do - assert_file Fog::Storage::Rackspace::Directories, false - assert_file Fog::Storage::Rackspace::Directory, false - assert_file Fog::Storage::Rackspace::Directory.new, false + assert_file Fog::Rackspace::Storage::Directories, false + assert_file Fog::Rackspace::Storage::Directory, false + assert_file Fog::Rackspace::Storage::Directory.new, false assert_file nil, false - assert_file Fog::Storage::Rackspace::Files, true - assert_file Fog::Storage::Rackspace::File, true - assert_file Fog::Storage::Rackspace::File.new, true + assert_file Fog::Rackspace::Storage::Files, true + assert_file Fog::Rackspace::Storage::File, true + assert_file Fog::Rackspace::Storage::File.new, true assert_file "I am a string!", false end tests('#parent_class') do - tests('Fog::Storage::Rackspace::Directory object') do - metadata = Fog::Storage::Rackspace::Metadata.new Fog::Storage::Rackspace::Directory.new - returns(Fog::Storage::Rackspace::Directory) { metadata.send :parent_class } + tests('Fog::Rackspace::Storage::Directory object') do + metadata = Fog::Rackspace::Storage::Metadata.new Fog::Rackspace::Storage::Directory.new + returns(Fog::Rackspace::Storage::Directory) { metadata.send :parent_class } end - tests('Fog::Storage::Rackspace::Directory class') do - metadata = Fog::Storage::Rackspace::Metadata.new Fog::Storage::Rackspace::Directory - returns(Fog::Storage::Rackspace::Directory) { metadata.send :parent_class } + tests('Fog::Rackspace::Storage::Directory class') do + metadata = Fog::Rackspace::Storage::Metadata.new Fog::Rackspace::Storage::Directory + returns(Fog::Rackspace::Storage::Directory) { metadata.send :parent_class } end end end diff --git a/tests/rackspace/requests/cdn/cdn_tests.rb b/tests/rackspace/requests/cdn/cdn_tests.rb index e534ed0..6c7a503 100644 --- a/tests/rackspace/requests/cdn/cdn_tests.rb +++ b/tests/rackspace/requests/cdn/cdn_tests.rb @@ -5,7 +5,7 @@ @containers_format = [{ "cdn_ios_uri" => String, "log_retention" => Fog::Boolean, - "ttl" => Fixnum, + "ttl" => Integer, "cdn_streaming_uri" => String, "cdn_enabled" => Fog::Boolean, "name" => String, diff --git a/tests/rackspace/requests/compute_v2/metadata_tests.rb b/tests/rackspace/requests/compute_v2/metadata_tests.rb index 3617453..94e2f21 100644 --- a/tests/rackspace/requests/compute_v2/metadata_tests.rb +++ b/tests/rackspace/requests/compute_v2/metadata_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Fog::Compute::RackspaceV2 | metadata_tests', ['rackspace']) do +Shindo.tests('Fog::Rackspace::ComputeV2 | metadata_tests', ['rackspace']) do @service = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2') image_id = rackspace_test_image_id(@service) diff --git a/tests/rackspace/storage_tests.rb b/tests/rackspace/storage_tests.rb index b81963f..34e7b22 100644 --- a/tests/rackspace/storage_tests.rb +++ b/tests/rackspace/storage_tests.rb @@ -6,7 +6,7 @@ def assert_method(url, method) end tests('#authentication_method') do - @service = Fog::Storage::Rackspace.new + @service = Fog::Rackspace::Storage.new assert_method nil, :authenticate_v2 @@ -23,14 +23,14 @@ def assert_method(url, method) tests('authentication v1') do tests('variables populated').succeeds do - @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0' + @service = Fog::Rackspace::Storage.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0' returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(false, "path populated") { @service.instance_variable_get("@uri").nil? } returns(true, "identity_service was not used") { @service.instance_variable_get("@identity_service").nil? } @service.head_containers end tests('custom endpoint') do - @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0', + @service = Fog::Rackspace::Storage.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0', :rackspace_storage_url => 'https://my-custom-endpoint.com' returns(false, "auth token populated") { @service.send(:auth_token).nil? } returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil } @@ -40,7 +40,7 @@ def assert_method(url, method) tests('authentation v2') do tests('variables populated').succeeds do - @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => { :ssl_verify_peer => true } + @service = Fog::Rackspace::Storage.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => { :ssl_verify_peer => true } returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(false, "path populated") { @service.instance_variable_get("@uri").nil? } @@ -50,19 +50,19 @@ def assert_method(url, method) @service.head_containers end tests('dfw region').succeeds do - @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :dfw + @service = Fog::Rackspace::Storage.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :dfw returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw\d/) != nil } @service.head_containers end tests('ord region').succeeds do - @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :ord + @service = Fog::Rackspace::Storage.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :ord returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /ord\d/) != nil } @service.head_containers end tests('custom endpoint').succeeds do - @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', + @service = Fog::Rackspace::Storage.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_storage_url => 'https://my-custom-endpoint.com' returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil } @@ -72,24 +72,24 @@ def assert_method(url, method) tests('default auth') do tests('no params').succeeds do - @service = Fog::Storage::Rackspace.new :rackspace_region => nil + @service = Fog::Rackspace::Storage.new :rackspace_region => nil returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw\d/) != nil } @service.head_containers end tests('specify region').succeeds do - @service = Fog::Storage::Rackspace.new :rackspace_region => :ord + @service = Fog::Rackspace::Storage.new :rackspace_region => :ord returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /ord\d/ ) != nil } @service.head_containers end tests('custom endpoint') do - @service = Fog::Storage::Rackspace.new :rackspace_storage_url => 'https://my-custom-endpoint.com' + @service = Fog::Rackspace::Storage.new :rackspace_storage_url => 'https://my-custom-endpoint.com' returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil } end tests('rackspace_servicenet') do - @service = Fog::Storage::Rackspace.new :rackspace_servicenet => true + @service = Fog::Rackspace::Storage.new :rackspace_servicenet => true returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /snet-/) != nil } end @@ -98,13 +98,13 @@ def assert_method(url, method) tests('reauthentication') do tests('should reauth with valid credentials') do - @service = Fog::Storage::Rackspace.new + @service = Fog::Rackspace::Storage.new returns(true, "auth token populated") { !@service.send(:auth_token).nil? } @service.instance_variable_set("@auth_token", "bad-token") returns(204) { @service.head_containers.status } end tests('should terminate with incorrect credentials') do - raises(Excon::Errors::Unauthorized) { Fog::Storage::Rackspace.new :rackspace_api_key => 'bad_key' } + raises(Excon::Errors::Unauthorized) { Fog::Rackspace::Storage.new :rackspace_api_key => 'bad_key' } end end @@ -114,14 +114,14 @@ def assert_method(url, method) tests('ssl') do tests('ssl enabled') do - @service = Fog::Storage::Rackspace.new(:rackspace_cdn_ssl => true) + @service = Fog::Rackspace::Storage.new(:rackspace_cdn_ssl => true) returns(true) { @service.ssl? } end tests('ssl disabled') do - @service = Fog::Storage::Rackspace.new(:rackspace_cdn_ssl => false) + @service = Fog::Rackspace::Storage.new(:rackspace_cdn_ssl => false) returns(false) { @service.ssl? } - @service = Fog::Storage::Rackspace.new(:rackspace_cdn_ssl => nil) + @service = Fog::Rackspace::Storage.new(:rackspace_cdn_ssl => nil) returns(false) { @service.ssl? } end end From 282e17d63da60bd41b55aff8a2739d0232791c5e Mon Sep 17 00:00:00 2001 From: Marc Hassman Date: Sat, 15 Jun 2024 17:06:49 -0500 Subject: [PATCH 8/9] revert version for upstream naming. --- lib/fog/rackspace/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/rackspace/version.rb b/lib/fog/rackspace/version.rb index b7a81de..b025136 100644 --- a/lib/fog/rackspace/version.rb +++ b/lib/fog/rackspace/version.rb @@ -1,5 +1,5 @@ module Fog module Rackspace - VERSION = "0.2.0" + VERSION = "0.1.6" end end From 61f0717d82f609daaa5246b201a724580bf2b890 Mon Sep 17 00:00:00 2001 From: Marc Hassman Date: Mon, 12 Jan 2026 00:47:01 -0600 Subject: [PATCH 9/9] tmp: more module flips / update lb init method --- lib/fog/rackspace.rb | 19 +++++++++++++++++++ .../models/load_balancers/load_balancer.rb | 12 ++++++++++-- .../rackspace/requests/cdn/delete_object.rb | 4 ++-- .../rackspace/requests/cdn/get_containers.rb | 4 ++-- .../rackspace/requests/cdn/head_container.rb | 4 ++-- .../rackspace/requests/cdn/post_container.rb | 4 ++-- .../rackspace/requests/cdn/put_container.rb | 4 ++-- .../compute/confirm_resized_server.rb | 4 ++-- .../requests/compute/create_image.rb | 4 ++-- .../requests/compute/create_server.rb | 4 ++-- .../requests/compute/delete_image.rb | 4 ++-- .../requests/compute/delete_server.rb | 4 ++-- .../requests/compute/get_flavor_details.rb | 4 ++-- .../requests/compute/get_image_details.rb | 4 ++-- .../requests/compute/get_server_details.rb | 4 ++-- .../requests/compute/list_addresses.rb | 4 ++-- .../requests/compute/list_flavors.rb | 4 ++-- .../requests/compute/list_flavors_detail.rb | 4 ++-- .../rackspace/requests/compute/list_images.rb | 4 ++-- .../requests/compute/list_images_detail.rb | 4 ++-- .../compute/list_private_addresses.rb | 4 ++-- .../requests/compute/list_public_addresses.rb | 4 ++-- .../requests/compute/list_servers.rb | 4 ++-- .../requests/compute/list_servers_detail.rb | 4 ++-- .../requests/compute/reboot_server.rb | 4 ++-- .../requests/compute/resize_server.rb | 4 ++-- .../requests/compute/revert_resized_server.rb | 4 ++-- .../requests/compute/server_action.rb | 4 ++-- .../requests/compute/update_server.rb | 4 ++-- .../requests/compute_v2/attach_volume.rb | 4 ++-- .../compute_v2/change_server_password.rb | 4 ++-- .../compute_v2/confirm_resize_server.rb | 4 ++-- .../requests/compute_v2/create_image.rb | 4 ++-- .../requests/compute_v2/create_keypair.rb | 4 ++-- .../requests/compute_v2/create_network.rb | 4 ++-- .../requests/compute_v2/create_server.rb | 4 ++-- .../compute_v2/create_virtual_interface.rb | 4 ++-- .../requests/compute_v2/delete_attachment.rb | 4 ++-- .../requests/compute_v2/delete_image.rb | 4 ++-- .../requests/compute_v2/delete_keypair.rb | 4 ++-- .../compute_v2/delete_metadata_item.rb | 4 ++-- .../requests/compute_v2/delete_network.rb | 4 ++-- .../requests/compute_v2/delete_server.rb | 4 ++-- .../compute_v2/delete_virtual_interface.rb | 4 ++-- .../requests/compute_v2/get_attachment.rb | 4 ++-- .../requests/compute_v2/get_flavor.rb | 4 ++-- .../requests/compute_v2/get_image.rb | 4 ++-- .../requests/compute_v2/get_keypair.rb | 4 ++-- .../requests/compute_v2/get_metadata_item.rb | 4 ++-- .../requests/compute_v2/get_network.rb | 4 ++-- .../requests/compute_v2/get_server.rb | 4 ++-- .../requests/compute_v2/get_vnc_console.rb | 6 +++--- .../requests/compute_v2/list_addresses.rb | 4 ++-- .../compute_v2/list_addresses_by_network.rb | 4 ++-- .../requests/compute_v2/list_attachments.rb | 4 ++-- .../requests/compute_v2/list_flavors.rb | 4 ++-- .../compute_v2/list_flavors_detail.rb | 4 ++-- .../requests/compute_v2/list_images.rb | 4 ++-- .../requests/compute_v2/list_images_detail.rb | 4 ++-- .../requests/compute_v2/list_keypairs.rb | 4 ++-- .../requests/compute_v2/list_metadata.rb | 4 ++-- .../requests/compute_v2/list_networks.rb | 4 ++-- .../requests/compute_v2/list_servers.rb | 4 ++-- .../compute_v2/list_virtual_interfaces.rb | 4 ++-- .../requests/compute_v2/reboot_server.rb | 4 ++-- .../requests/compute_v2/rebuild_server.rb | 4 ++-- .../requests/compute_v2/rescue_server.rb | 4 ++-- .../requests/compute_v2/resize_server.rb | 4 ++-- .../compute_v2/revert_resize_server.rb | 4 ++-- .../requests/compute_v2/set_metadata.rb | 4 ++-- .../requests/compute_v2/set_metadata_item.rb | 4 ++-- .../requests/compute_v2/start_server.rb | 4 ++-- .../requests/compute_v2/stop_server.rb | 4 ++-- .../requests/compute_v2/unrescue_server.rb | 4 ++-- .../requests/compute_v2/update_metadata.rb | 4 ++-- .../requests/compute_v2/update_server.rb | 4 ++-- lib/fog/rackspace/requests/dns/add_records.rb | 4 ++-- lib/fog/rackspace/requests/dns/callback.rb | 4 ++-- .../rackspace/requests/dns/create_domains.rb | 4 ++-- .../requests/dns/list_domain_details.rb | 4 ++-- .../rackspace/requests/dns/list_domains.rb | 4 ++-- .../requests/dns/list_record_details.rb | 4 ++-- .../rackspace/requests/dns/list_records.rb | 4 ++-- .../rackspace/requests/dns/list_subdomains.rb | 4 ++-- .../rackspace/requests/dns/modify_domain.rb | 4 ++-- .../rackspace/requests/dns/modify_record.rb | 4 ++-- .../rackspace/requests/dns/remove_domain.rb | 4 ++-- .../rackspace/requests/dns/remove_domains.rb | 4 ++-- .../rackspace/requests/dns/remove_record.rb | 4 ++-- .../rackspace/requests/dns/remove_records.rb | 4 ++-- 90 files changed, 206 insertions(+), 179 deletions(-) diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb index dba5e90..56a7a98 100644 --- a/lib/fog/rackspace.rb +++ b/lib/fog/rackspace.rb @@ -92,4 +92,23 @@ def self.escape(str,extra_exclude_chars = '') end end end + + # Backward compatibility aliases for Fog 2.4.0 + # These allow existing code using the old Fog::Service::Rackspace pattern to continue working + module CDN + Rackspace = Fog::Rackspace::CDN + end + + module Compute + Rackspace = Fog::Rackspace::Compute + RackspaceV2 = Fog::Rackspace::ComputeV2 + end + + module DNS + Rackspace = Fog::Rackspace::DNS + end + + module Storage + Rackspace = Fog::Rackspace::Storage + end end diff --git a/lib/fog/rackspace/models/load_balancers/load_balancer.rb b/lib/fog/rackspace/models/load_balancers/load_balancer.rb index b203cb6..11e342d 100644 --- a/lib/fog/rackspace/models/load_balancers/load_balancer.rb +++ b/lib/fog/rackspace/models/load_balancers/load_balancer.rb @@ -65,7 +65,11 @@ def nodes end def nodes=(new_nodes=[]) - nodes.load(new_nodes) + # fog-core 2.5.0+ requires hashes for collection.new, not model instances + normalized_nodes = new_nodes.map do |node| + node.is_a?(Fog::Rackspace::LoadBalancers::Node) ? node.attributes : node + end + nodes.load(normalized_nodes) end def https_redirect @@ -108,7 +112,11 @@ def virtual_ips end def virtual_ips=(new_virtual_ips=[]) - virtual_ips.load(new_virtual_ips) + # fog-core 2.5.0+ requires hashes for collection.new, not model instances + normalized_ips = new_virtual_ips.map do |vip| + vip.is_a?(Fog::Rackspace::LoadBalancers::VirtualIp) ? vip.attributes : vip + end + virtual_ips.load(normalized_ips) end def enable_content_caching diff --git a/lib/fog/rackspace/requests/cdn/delete_object.rb b/lib/fog/rackspace/requests/cdn/delete_object.rb index 29481dc..2dcfc70 100644 --- a/lib/fog/rackspace/requests/cdn/delete_object.rb +++ b/lib/fog/rackspace/requests/cdn/delete_object.rb @@ -1,6 +1,6 @@ module Fog - module CDN - class Rackspace + module Rackspace + class CDN class Real # Delete an existing object # diff --git a/lib/fog/rackspace/requests/cdn/get_containers.rb b/lib/fog/rackspace/requests/cdn/get_containers.rb index 4870364..bb42372 100644 --- a/lib/fog/rackspace/requests/cdn/get_containers.rb +++ b/lib/fog/rackspace/requests/cdn/get_containers.rb @@ -1,6 +1,6 @@ module Fog - module CDN - class Rackspace + module Rackspace + class CDN class Real # List existing cdn-enabled storage containers # diff --git a/lib/fog/rackspace/requests/cdn/head_container.rb b/lib/fog/rackspace/requests/cdn/head_container.rb index a4b6aed..974e5dc 100644 --- a/lib/fog/rackspace/requests/cdn/head_container.rb +++ b/lib/fog/rackspace/requests/cdn/head_container.rb @@ -1,6 +1,6 @@ module Fog - module CDN - class Rackspace + module Rackspace + class CDN class Real # List cdn properties for a container # diff --git a/lib/fog/rackspace/requests/cdn/post_container.rb b/lib/fog/rackspace/requests/cdn/post_container.rb index a3d6ed1..4b39c5e 100644 --- a/lib/fog/rackspace/requests/cdn/post_container.rb +++ b/lib/fog/rackspace/requests/cdn/post_container.rb @@ -1,6 +1,6 @@ module Fog - module CDN - class Rackspace + module Rackspace + class CDN class Real # modify CDN properties for a container # diff --git a/lib/fog/rackspace/requests/cdn/put_container.rb b/lib/fog/rackspace/requests/cdn/put_container.rb index 2a0863d..dc8a97f 100644 --- a/lib/fog/rackspace/requests/cdn/put_container.rb +++ b/lib/fog/rackspace/requests/cdn/put_container.rb @@ -1,6 +1,6 @@ module Fog - module CDN - class Rackspace + module Rackspace + class CDN class Real # enable CDN for a container # diff --git a/lib/fog/rackspace/requests/compute/confirm_resized_server.rb b/lib/fog/rackspace/requests/compute/confirm_resized_server.rb index d679ba2..f198ccc 100644 --- a/lib/fog/rackspace/requests/compute/confirm_resized_server.rb +++ b/lib/fog/rackspace/requests/compute/confirm_resized_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Confirm resizing # diff --git a/lib/fog/rackspace/requests/compute/create_image.rb b/lib/fog/rackspace/requests/compute/create_image.rb index e82cc5a..bb9aaf3 100644 --- a/lib/fog/rackspace/requests/compute/create_image.rb +++ b/lib/fog/rackspace/requests/compute/create_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Create an image from a running server # diff --git a/lib/fog/rackspace/requests/compute/create_server.rb b/lib/fog/rackspace/requests/compute/create_server.rb index 02ae3c5..21c4e00 100644 --- a/lib/fog/rackspace/requests/compute/create_server.rb +++ b/lib/fog/rackspace/requests/compute/create_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Create a new server # diff --git a/lib/fog/rackspace/requests/compute/delete_image.rb b/lib/fog/rackspace/requests/compute/delete_image.rb index 52b60e5..07a4d97 100644 --- a/lib/fog/rackspace/requests/compute/delete_image.rb +++ b/lib/fog/rackspace/requests/compute/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Delete an image # diff --git a/lib/fog/rackspace/requests/compute/delete_server.rb b/lib/fog/rackspace/requests/compute/delete_server.rb index 9c45bc6..684911a 100644 --- a/lib/fog/rackspace/requests/compute/delete_server.rb +++ b/lib/fog/rackspace/requests/compute/delete_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Delete an existing server # diff --git a/lib/fog/rackspace/requests/compute/get_flavor_details.rb b/lib/fog/rackspace/requests/compute/get_flavor_details.rb index 67e8112..2a12669 100644 --- a/lib/fog/rackspace/requests/compute/get_flavor_details.rb +++ b/lib/fog/rackspace/requests/compute/get_flavor_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Get details for flavor by id # diff --git a/lib/fog/rackspace/requests/compute/get_image_details.rb b/lib/fog/rackspace/requests/compute/get_image_details.rb index b9fca41..88ad5fc 100644 --- a/lib/fog/rackspace/requests/compute/get_image_details.rb +++ b/lib/fog/rackspace/requests/compute/get_image_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Get details for image by id # diff --git a/lib/fog/rackspace/requests/compute/get_server_details.rb b/lib/fog/rackspace/requests/compute/get_server_details.rb index d1b1d3e..1149e9a 100644 --- a/lib/fog/rackspace/requests/compute/get_server_details.rb +++ b/lib/fog/rackspace/requests/compute/get_server_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Get details about a server # diff --git a/lib/fog/rackspace/requests/compute/list_addresses.rb b/lib/fog/rackspace/requests/compute/list_addresses.rb index 101fc2b..bcb8e52 100644 --- a/lib/fog/rackspace/requests/compute/list_addresses.rb +++ b/lib/fog/rackspace/requests/compute/list_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # List all server addresses # diff --git a/lib/fog/rackspace/requests/compute/list_flavors.rb b/lib/fog/rackspace/requests/compute/list_flavors.rb index bbc7e6f..9475b8e 100644 --- a/lib/fog/rackspace/requests/compute/list_flavors.rb +++ b/lib/fog/rackspace/requests/compute/list_flavors.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # List all flavors (IDs and names only) # diff --git a/lib/fog/rackspace/requests/compute/list_flavors_detail.rb b/lib/fog/rackspace/requests/compute/list_flavors_detail.rb index bb9ac2a..d8bcc3c 100644 --- a/lib/fog/rackspace/requests/compute/list_flavors_detail.rb +++ b/lib/fog/rackspace/requests/compute/list_flavors_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # List all flavors # diff --git a/lib/fog/rackspace/requests/compute/list_images.rb b/lib/fog/rackspace/requests/compute/list_images.rb index f1ae8f5..907efe1 100644 --- a/lib/fog/rackspace/requests/compute/list_images.rb +++ b/lib/fog/rackspace/requests/compute/list_images.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # List all images (IDs and names only) # diff --git a/lib/fog/rackspace/requests/compute/list_images_detail.rb b/lib/fog/rackspace/requests/compute/list_images_detail.rb index f3f12c1..d8d8df8 100644 --- a/lib/fog/rackspace/requests/compute/list_images_detail.rb +++ b/lib/fog/rackspace/requests/compute/list_images_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # List all images # diff --git a/lib/fog/rackspace/requests/compute/list_private_addresses.rb b/lib/fog/rackspace/requests/compute/list_private_addresses.rb index 5875d87..913469f 100644 --- a/lib/fog/rackspace/requests/compute/list_private_addresses.rb +++ b/lib/fog/rackspace/requests/compute/list_private_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # List private server addresses # diff --git a/lib/fog/rackspace/requests/compute/list_public_addresses.rb b/lib/fog/rackspace/requests/compute/list_public_addresses.rb index 36c7f1b..6fc90bf 100644 --- a/lib/fog/rackspace/requests/compute/list_public_addresses.rb +++ b/lib/fog/rackspace/requests/compute/list_public_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # List public server addresses # diff --git a/lib/fog/rackspace/requests/compute/list_servers.rb b/lib/fog/rackspace/requests/compute/list_servers.rb index daff0d2..e90eb79 100644 --- a/lib/fog/rackspace/requests/compute/list_servers.rb +++ b/lib/fog/rackspace/requests/compute/list_servers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # List all servers (IDs and names only) # diff --git a/lib/fog/rackspace/requests/compute/list_servers_detail.rb b/lib/fog/rackspace/requests/compute/list_servers_detail.rb index dbbd66f..9bd006a 100644 --- a/lib/fog/rackspace/requests/compute/list_servers_detail.rb +++ b/lib/fog/rackspace/requests/compute/list_servers_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # List all servers details # diff --git a/lib/fog/rackspace/requests/compute/reboot_server.rb b/lib/fog/rackspace/requests/compute/reboot_server.rb index 167df87..154b884 100644 --- a/lib/fog/rackspace/requests/compute/reboot_server.rb +++ b/lib/fog/rackspace/requests/compute/reboot_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Reboot an existing server # diff --git a/lib/fog/rackspace/requests/compute/resize_server.rb b/lib/fog/rackspace/requests/compute/resize_server.rb index 641fac7..a0d72c0 100644 --- a/lib/fog/rackspace/requests/compute/resize_server.rb +++ b/lib/fog/rackspace/requests/compute/resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Reboot an existing server # diff --git a/lib/fog/rackspace/requests/compute/revert_resized_server.rb b/lib/fog/rackspace/requests/compute/revert_resized_server.rb index c735156..b83dd24 100644 --- a/lib/fog/rackspace/requests/compute/revert_resized_server.rb +++ b/lib/fog/rackspace/requests/compute/revert_resized_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Revert resizing # diff --git a/lib/fog/rackspace/requests/compute/server_action.rb b/lib/fog/rackspace/requests/compute/server_action.rb index ba84f17..5044d81 100644 --- a/lib/fog/rackspace/requests/compute/server_action.rb +++ b/lib/fog/rackspace/requests/compute/server_action.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Reboot an existing server # diff --git a/lib/fog/rackspace/requests/compute/update_server.rb b/lib/fog/rackspace/requests/compute/update_server.rb index cb27503..766118e 100644 --- a/lib/fog/rackspace/requests/compute/update_server.rb +++ b/lib/fog/rackspace/requests/compute/update_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class Rackspace + module Rackspace + class Compute class Real # Update an existing server # diff --git a/lib/fog/rackspace/requests/compute_v2/attach_volume.rb b/lib/fog/rackspace/requests/compute_v2/attach_volume.rb index cf6c638..c9fdcfe 100644 --- a/lib/fog/rackspace/requests/compute_v2/attach_volume.rb +++ b/lib/fog/rackspace/requests/compute_v2/attach_volume.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # This operation attaches a volume to the specified server. # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/change_server_password.rb b/lib/fog/rackspace/requests/compute_v2/change_server_password.rb index c16c41b..cfe6ddb 100644 --- a/lib/fog/rackspace/requests/compute_v2/change_server_password.rb +++ b/lib/fog/rackspace/requests/compute_v2/change_server_password.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Changes server admin password # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb b/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb index 2f5bab5..384308d 100644 --- a/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Confirm server resize operation # @param [String] server_id The id of the server to revert diff --git a/lib/fog/rackspace/requests/compute_v2/create_image.rb b/lib/fog/rackspace/requests/compute_v2/create_image.rb index c6e6b54..f5d923d 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Create an image from a running server # diff --git a/lib/fog/rackspace/requests/compute_v2/create_keypair.rb b/lib/fog/rackspace/requests/compute_v2/create_keypair.rb index e2dc349..b495054 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_keypair.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_keypair.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Request a new keypair to be created # @param [String] key_name: unique name of the keypair to create diff --git a/lib/fog/rackspace/requests/compute_v2/create_network.rb b/lib/fog/rackspace/requests/compute_v2/create_network.rb index de96e3e..fdd6672 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_network.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_network.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real def create_network(label, cidr) data = { diff --git a/lib/fog/rackspace/requests/compute_v2/create_server.rb b/lib/fog/rackspace/requests/compute_v2/create_server.rb index 6b2f50c..363a0b1 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Create server # @param [String] name name of server diff --git a/lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb b/lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb index 4abaa45..8905114 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Creates virtual interface for a server # @param [String] server_id The server id to create the virtual interface on diff --git a/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb b/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb index d6c1920..5f5a2a2 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Deletes a specified volume attachment from a specified server instance. # @param [String] server_id id of server containing volume to delete diff --git a/lib/fog/rackspace/requests/compute_v2/delete_image.rb b/lib/fog/rackspace/requests/compute_v2/delete_image.rb index 2fbb614..3d6640e 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Delete an image # @param [String] image_id Id of image to delete diff --git a/lib/fog/rackspace/requests/compute_v2/delete_keypair.rb b/lib/fog/rackspace/requests/compute_v2/delete_keypair.rb index 475cc8d..dfee9d8 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_keypair.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_keypair.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Delete the key specified with key_name # @param [String] key_name name of the key to delete diff --git a/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb b/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb index f1f04e8..c53130b 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Deletes a metadata item. # @param [String] collection type of metadata diff --git a/lib/fog/rackspace/requests/compute_v2/delete_network.rb b/lib/fog/rackspace/requests/compute_v2/delete_network.rb index e8dc63a..2492b31 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_network.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_network.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real def delete_network(id) request(:method => 'DELETE', :path => "os-networksv2/#{id}", :expects => 202) diff --git a/lib/fog/rackspace/requests/compute_v2/delete_server.rb b/lib/fog/rackspace/requests/compute_v2/delete_server.rb index e1ffa81..302ee92 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Deletes a specified server instance from the system. # @param [String] server_id the id of the server to delete diff --git a/lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb b/lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb index 60d2364..c3febcf 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Deletes virtual interface from server # @param [String] server_id The server id that contains the virtual interface diff --git a/lib/fog/rackspace/requests/compute_v2/get_attachment.rb b/lib/fog/rackspace/requests/compute_v2/get_attachment.rb index 2d441ab..5132314 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_attachment.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_attachment.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves attachment # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/get_flavor.rb b/lib/fog/rackspace/requests/compute_v2/get_flavor.rb index 8baf7ca..19a89cf 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_flavor.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_flavor.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves flavor detail # @param [Sring] flavor_id diff --git a/lib/fog/rackspace/requests/compute_v2/get_image.rb b/lib/fog/rackspace/requests/compute_v2/get_image.rb index 159bfae..ce22bd9 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves image detail # @param [String] image_id diff --git a/lib/fog/rackspace/requests/compute_v2/get_keypair.rb b/lib/fog/rackspace/requests/compute_v2/get_keypair.rb index 3e76018..9f9cdc8 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_keypair.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_keypair.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retreive single keypair details # @param [String] key_name name of the key for which to request the details diff --git a/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb b/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb index c5fbc69..d2bac82 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves single metadatum item by key. # @param [String] collection type of metadata diff --git a/lib/fog/rackspace/requests/compute_v2/get_network.rb b/lib/fog/rackspace/requests/compute_v2/get_network.rb index acc0ff9..0cbeff0 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_network.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_network.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real def get_network(id) request(:method => 'GET', :path => "os-networksv2/#{id}", :expects => 200) diff --git a/lib/fog/rackspace/requests/compute_v2/get_server.rb b/lib/fog/rackspace/requests/compute_v2/get_server.rb index 189a339..d7404ba 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves server detail # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/get_vnc_console.rb b/lib/fog/rackspace/requests/compute_v2/get_vnc_console.rb index 3fe63c0..8948ae3 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_vnc_console.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_vnc_console.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Get a vnc console for an instance. # @@ -41,5 +41,5 @@ def get_vnc_console(server_id, console_type) end # def get_vnc_console end # class Mock end # class OpenStack - end # module Compute + end # module Rackspace end # module Fog diff --git a/lib/fog/rackspace/requests/compute_v2/list_addresses.rb b/lib/fog/rackspace/requests/compute_v2/list_addresses.rb index 40cd449..cf1136e 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_addresses.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Lists all networks and addresses associated with a specified server. # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/list_addresses_by_network.rb b/lib/fog/rackspace/requests/compute_v2/list_addresses_by_network.rb index d5de018..2eadfc3 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_addresses_by_network.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_addresses_by_network.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Lists all addresses associated with a specified server and network # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/list_attachments.rb b/lib/fog/rackspace/requests/compute_v2/list_attachments.rb index 5ceeda3..2643d2e 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_attachments.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_attachments.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves list of attached volumes # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/list_flavors.rb b/lib/fog/rackspace/requests/compute_v2/list_flavors.rb index 35b273c..7794513 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_flavors.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_flavors.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves a list of flavors # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb b/lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb index 3d87db0..714dbae 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_flavors_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves a list of flavors # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/compute_v2/list_images.rb b/lib/fog/rackspace/requests/compute_v2/list_images.rb index 14be0c4..a6f4522 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_images.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_images.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves a list of images # ==== Parameters diff --git a/lib/fog/rackspace/requests/compute_v2/list_images_detail.rb b/lib/fog/rackspace/requests/compute_v2/list_images_detail.rb index a68e63d..ae42ce2 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_images_detail.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_images_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves a list of images # ==== Parameters diff --git a/lib/fog/rackspace/requests/compute_v2/list_keypairs.rb b/lib/fog/rackspace/requests/compute_v2/list_keypairs.rb index a7b6c00..e2a9f1b 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_keypairs.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_keypairs.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Returns a list of all key pairs associated with an account. # @return [Excon::Response] response : diff --git a/lib/fog/rackspace/requests/compute_v2/list_metadata.rb b/lib/fog/rackspace/requests/compute_v2/list_metadata.rb index 7f9587b..5ff7439 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_metadata.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves all metadata associated with a server or an image. # @param [String] collection type of metadata diff --git a/lib/fog/rackspace/requests/compute_v2/list_networks.rb b/lib/fog/rackspace/requests/compute_v2/list_networks.rb index 6b76b5e..4f21a93 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_networks.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_networks.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real def list_networks request(:method => 'GET', :path => 'os-networksv2', :expects => 200) diff --git a/lib/fog/rackspace/requests/compute_v2/list_servers.rb b/lib/fog/rackspace/requests/compute_v2/list_servers.rb index 5adfe18..87ee422 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_servers.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_servers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Retrieves list of servers # @return [Excon::Response] response: diff --git a/lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb b/lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb index e4e6c7b..1c57ba1 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Lists virtual interfaces for a server # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/reboot_server.rb b/lib/fog/rackspace/requests/compute_v2/reboot_server.rb index 83a0796..cfa0bd5 100644 --- a/lib/fog/rackspace/requests/compute_v2/reboot_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/reboot_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Reboots server # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb b/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb index 4b00a7c..fbd3ae8 100644 --- a/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # The rebuild operation removes all data on the server and replaces it with the specified image. # The serverRef and all IP addresses remain the same. If you specify name, metadata, accessIPv4, diff --git a/lib/fog/rackspace/requests/compute_v2/rescue_server.rb b/lib/fog/rackspace/requests/compute_v2/rescue_server.rb index 4d1939f..539dfcf 100644 --- a/lib/fog/rackspace/requests/compute_v2/rescue_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/rescue_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Puts server into rescue mode # @param [String] server_id id of server to rescue diff --git a/lib/fog/rackspace/requests/compute_v2/resize_server.rb b/lib/fog/rackspace/requests/compute_v2/resize_server.rb index db7fbdb..fddd852 100644 --- a/lib/fog/rackspace/requests/compute_v2/resize_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Reverts server resize operation # @param [String] server_id id of server to resize diff --git a/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb b/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb index 32e35e0..70128ba 100644 --- a/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Reverts server resize operation # @param [String] server_id diff --git a/lib/fog/rackspace/requests/compute_v2/set_metadata.rb b/lib/fog/rackspace/requests/compute_v2/set_metadata.rb index 790a38d..586f188 100644 --- a/lib/fog/rackspace/requests/compute_v2/set_metadata.rb +++ b/lib/fog/rackspace/requests/compute_v2/set_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Sets metadata associated with a server or an image. # @param [String] collection type of metadata diff --git a/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb b/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb index f28b557..c46b97f 100644 --- a/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb +++ b/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Sets a single metadatum item by key. # @param [String] collection type of metadata diff --git a/lib/fog/rackspace/requests/compute_v2/start_server.rb b/lib/fog/rackspace/requests/compute_v2/start_server.rb index 9a0ca4a..39fe677 100644 --- a/lib/fog/rackspace/requests/compute_v2/start_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/start_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # This operation starts a stopped server, and changes its status to ACTIVE. # Prior to running this command, the server status must be SHUTTOFF diff --git a/lib/fog/rackspace/requests/compute_v2/stop_server.rb b/lib/fog/rackspace/requests/compute_v2/stop_server.rb index d43b004..f01b5f6 100644 --- a/lib/fog/rackspace/requests/compute_v2/stop_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/stop_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # This operation stops a running server, and changes the server status to SHUTOFF # and changes the clean_shutdown parameter to TRUE. diff --git a/lib/fog/rackspace/requests/compute_v2/unrescue_server.rb b/lib/fog/rackspace/requests/compute_v2/unrescue_server.rb index 29a9bbb..91b8bc4 100644 --- a/lib/fog/rackspace/requests/compute_v2/unrescue_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/unrescue_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Take server out of rescue mode # @param [String] server_id id of server diff --git a/lib/fog/rackspace/requests/compute_v2/update_metadata.rb b/lib/fog/rackspace/requests/compute_v2/update_metadata.rb index a339253..7259c69 100644 --- a/lib/fog/rackspace/requests/compute_v2/update_metadata.rb +++ b/lib/fog/rackspace/requests/compute_v2/update_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Updates metadata items for a specified server or image. # @param [String] collection type of metadata diff --git a/lib/fog/rackspace/requests/compute_v2/update_server.rb b/lib/fog/rackspace/requests/compute_v2/update_server.rb index d89b835..063b398 100644 --- a/lib/fog/rackspace/requests/compute_v2/update_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/update_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class RackspaceV2 + module Rackspace + class ComputeV2 class Real # Update the editable attributes of a specified server. # @param [String] server_id diff --git a/lib/fog/rackspace/requests/dns/add_records.rb b/lib/fog/rackspace/requests/dns/add_records.rb index ca1ffb9..9ec219b 100644 --- a/lib/fog/rackspace/requests/dns/add_records.rb +++ b/lib/fog/rackspace/requests/dns/add_records.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def add_records(domain_id, records) validate_path_fragment :domain_id, domain_id diff --git a/lib/fog/rackspace/requests/dns/callback.rb b/lib/fog/rackspace/requests/dns/callback.rb index b2f91d7..ab7e310 100644 --- a/lib/fog/rackspace/requests/dns/callback.rb +++ b/lib/fog/rackspace/requests/dns/callback.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def callback(job_id, show_details=true) validate_path_fragment :job_id, job_id diff --git a/lib/fog/rackspace/requests/dns/create_domains.rb b/lib/fog/rackspace/requests/dns/create_domains.rb index 8697be4..1bbffc5 100644 --- a/lib/fog/rackspace/requests/dns/create_domains.rb +++ b/lib/fog/rackspace/requests/dns/create_domains.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def create_domains(domains) data = { diff --git a/lib/fog/rackspace/requests/dns/list_domain_details.rb b/lib/fog/rackspace/requests/dns/list_domain_details.rb index a216295..bbb5956 100644 --- a/lib/fog/rackspace/requests/dns/list_domain_details.rb +++ b/lib/fog/rackspace/requests/dns/list_domain_details.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def list_domain_details(domain_id, options={}) validate_path_fragment :domain_id, domain_id diff --git a/lib/fog/rackspace/requests/dns/list_domains.rb b/lib/fog/rackspace/requests/dns/list_domains.rb index cb6cf36..712c40e 100644 --- a/lib/fog/rackspace/requests/dns/list_domains.rb +++ b/lib/fog/rackspace/requests/dns/list_domains.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def list_domains(options={}) path = 'domains' diff --git a/lib/fog/rackspace/requests/dns/list_record_details.rb b/lib/fog/rackspace/requests/dns/list_record_details.rb index 63b1b0b..990a643 100644 --- a/lib/fog/rackspace/requests/dns/list_record_details.rb +++ b/lib/fog/rackspace/requests/dns/list_record_details.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def list_record_details(domain_id, record_id) validate_path_fragment :domain_id, domain_id diff --git a/lib/fog/rackspace/requests/dns/list_records.rb b/lib/fog/rackspace/requests/dns/list_records.rb index 593568f..aea6192 100644 --- a/lib/fog/rackspace/requests/dns/list_records.rb +++ b/lib/fog/rackspace/requests/dns/list_records.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def list_records(domain_id, options={}) validate_path_fragment :domain_id, domain_id diff --git a/lib/fog/rackspace/requests/dns/list_subdomains.rb b/lib/fog/rackspace/requests/dns/list_subdomains.rb index 88f227f..93a7e09 100644 --- a/lib/fog/rackspace/requests/dns/list_subdomains.rb +++ b/lib/fog/rackspace/requests/dns/list_subdomains.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def list_subdomains(domain_id, options={}) validate_path_fragment :domain_id, domain_id diff --git a/lib/fog/rackspace/requests/dns/modify_domain.rb b/lib/fog/rackspace/requests/dns/modify_domain.rb index ea3cdd8..2ef8737 100644 --- a/lib/fog/rackspace/requests/dns/modify_domain.rb +++ b/lib/fog/rackspace/requests/dns/modify_domain.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def modify_domain(domain_id, options={}) validate_path_fragment :domain_id, domain_id diff --git a/lib/fog/rackspace/requests/dns/modify_record.rb b/lib/fog/rackspace/requests/dns/modify_record.rb index e66b948..72f7fa6 100644 --- a/lib/fog/rackspace/requests/dns/modify_record.rb +++ b/lib/fog/rackspace/requests/dns/modify_record.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def modify_record(domain_id, record_id, options={}) validate_path_fragment :domain_id, domain_id diff --git a/lib/fog/rackspace/requests/dns/remove_domain.rb b/lib/fog/rackspace/requests/dns/remove_domain.rb index 9039abf..a8c4d54 100644 --- a/lib/fog/rackspace/requests/dns/remove_domain.rb +++ b/lib/fog/rackspace/requests/dns/remove_domain.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def remove_domain(domain_id, options={}) validate_path_fragment :domain_id, domain_id diff --git a/lib/fog/rackspace/requests/dns/remove_domains.rb b/lib/fog/rackspace/requests/dns/remove_domains.rb index bc2c1ae..b80ca88 100644 --- a/lib/fog/rackspace/requests/dns/remove_domains.rb +++ b/lib/fog/rackspace/requests/dns/remove_domains.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def remove_domains(domain_ids, options={}) path = "domains?" + domain_ids.map { |domain_id| "id=#{domain_id}" }.join('&') diff --git a/lib/fog/rackspace/requests/dns/remove_record.rb b/lib/fog/rackspace/requests/dns/remove_record.rb index 650a240..46f9465 100644 --- a/lib/fog/rackspace/requests/dns/remove_record.rb +++ b/lib/fog/rackspace/requests/dns/remove_record.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def remove_record(domain_id, record_id) validate_path_fragment :domain_id, domain_id diff --git a/lib/fog/rackspace/requests/dns/remove_records.rb b/lib/fog/rackspace/requests/dns/remove_records.rb index 5651c26..ee6e8ce 100644 --- a/lib/fog/rackspace/requests/dns/remove_records.rb +++ b/lib/fog/rackspace/requests/dns/remove_records.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class Rackspace + module Rackspace + class DNS class Real def remove_records(domain_id, record_ids) validate_path_fragment :domain_id, domain_id