From 1173a7ef84bf9ac0b69b2531ad2d1c219f5b9349 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Mon, 15 Apr 2013 09:31:13 -0500 Subject: [PATCH 1/8] [rackspace] updated NotFound exceptions to include region when available. --- lib/fog/rackspace.rb | 12 ++++++++---- lib/fog/rackspace/block_storage.rb | 3 ++- lib/fog/rackspace/cdn.rb | 3 +-- lib/fog/rackspace/compute.rb | 3 ++- lib/fog/rackspace/compute_v2.rb | 3 ++- lib/fog/rackspace/databases.rb | 3 ++- lib/fog/rackspace/errors.rb | 27 +++++++++++++++++++++++++++ lib/fog/rackspace/load_balancers.rb | 3 ++- lib/fog/rackspace/storage.rb | 3 ++- 9 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 lib/fog/rackspace/errors.rb diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb index 6132fbc84..ddf810613 100644 --- a/lib/fog/rackspace.rb +++ b/lib/fog/rackspace.rb @@ -1,6 +1,7 @@ require File.join(File.dirname(__FILE__), 'core') require 'fog/rackspace/mock_data' require 'fog/rackspace/service' +require 'fog/rackspace/errors' module Fog module Rackspace @@ -25,21 +26,24 @@ module Fog if error.response status_code = error.response.status unless error.response.body.empty? - data = Fog::JSON.decode(error.response.body) - message = data.values.first ? data.values.first['message'] : data['message'] + begin + data = Fog::JSON.decode(error.response.body) + message = data.values.first ? data.values.first['message'] : data['message'] + rescue Fog::JSON::LoadError => e + data = error.response.body + end end end new_error = super(error, message) new_error.instance_variable_set(:@response_data, data) - new_error.instance_variable_set(:@status_code, status_code) + new_error.instance_variable_set(:@status_code, status_code) new_error end end class InternalServerError < ServiceError; end class Conflict < ServiceError; end - class NotFound < ServiceError; end class ServiceUnavailable < ServiceError; end class BadRequest < ServiceError diff --git a/lib/fog/rackspace/block_storage.rb b/lib/fog/rackspace/block_storage.rb index 6b8f78bf8..eeea7034d 100644 --- a/lib/fog/rackspace/block_storage.rb +++ b/lib/fog/rackspace/block_storage.rb @@ -3,6 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rackspace')) module Fog module Rackspace class BlockStorage < Fog::Service + include Fog::Rackspace::Errors class IdentifierTaken < Fog::Errors::Error; end class ServiceError < Fog::Rackspace::Errors::ServiceError; end @@ -98,7 +99,7 @@ module Fog :path => "#{endpoint_uri.path}/#{params[:path]}" })) rescue Excon::Errors::NotFound => error - raise NotFound.slurp error + raise NotFound.slurp(error, region) rescue Excon::Errors::BadRequest => error raise BadRequest.slurp error rescue Excon::Errors::InternalServerError => error diff --git a/lib/fog/rackspace/cdn.rb b/lib/fog/rackspace/cdn.rb index 80ef386d9..2bc8f559b 100644 --- a/lib/fog/rackspace/cdn.rb +++ b/lib/fog/rackspace/cdn.rb @@ -4,7 +4,6 @@ require 'fog/cdn' module Fog module CDN class Rackspace < Fog::Service - requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :persistent, :rackspace_cdn_ssl, :rackspace_region, :rackspace_cdn_url @@ -167,7 +166,7 @@ module Fog rescue Excon::Errors::HTTPStatusError => error raise case error when Excon::Errors::NotFound - Fog::Storage::Rackspace::NotFound.slurp(error) + Fog::Storage::Rackspace::NotFound.slurp(error, region) else error end diff --git a/lib/fog/rackspace/compute.rb b/lib/fog/rackspace/compute.rb index 8621ea460..0d61e7c92 100644 --- a/lib/fog/rackspace/compute.rb +++ b/lib/fog/rackspace/compute.rb @@ -4,6 +4,7 @@ require 'fog/compute' module Fog module Compute class Rackspace < Fog::Service + include Fog::Rackspace::Errors requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent @@ -223,7 +224,7 @@ module Fog rescue Excon::Errors::HTTPStatusError => error raise case error when Excon::Errors::NotFound - Fog::Compute::Rackspace::NotFound.slurp(error) + NotFound.slurp(error, region) else error end diff --git a/lib/fog/rackspace/compute_v2.rb b/lib/fog/rackspace/compute_v2.rb index 113765c09..1b66ff6f1 100644 --- a/lib/fog/rackspace/compute_v2.rb +++ b/lib/fog/rackspace/compute_v2.rb @@ -3,6 +3,7 @@ require 'fog/compute' module Fog module Compute class RackspaceV2 < Fog::Service + include Fog::Rackspace::Errors class ServiceError < Fog::Rackspace::Errors::ServiceError; end class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end @@ -148,7 +149,7 @@ module Fog :path => "#{endpoint_uri.path}/#{params[:path]}" })) rescue Excon::Errors::NotFound => error - raise NotFound.slurp error + raise NotFound.slurp(error, region) rescue Excon::Errors::BadRequest => error raise BadRequest.slurp error rescue Excon::Errors::InternalServerError => error diff --git a/lib/fog/rackspace/databases.rb b/lib/fog/rackspace/databases.rb index 4a8368881..ae5c0564a 100644 --- a/lib/fog/rackspace/databases.rb +++ b/lib/fog/rackspace/databases.rb @@ -3,6 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rackspace')) module Fog module Rackspace class Databases < Fog::Service + include Fog::Rackspace::Errors class ServiceError < Fog::Rackspace::Errors::ServiceError; end class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end @@ -96,7 +97,7 @@ module Fog :path => "#{endpoint_uri.path}/#{params[:path]}" })) rescue Excon::Errors::NotFound => error - raise NotFound.slurp error + raise NotFound.slurp(error, region) rescue Excon::Errors::BadRequest => error raise BadRequest.slurp error rescue Excon::Errors::InternalServerError => error diff --git a/lib/fog/rackspace/errors.rb b/lib/fog/rackspace/errors.rb new file mode 100644 index 000000000..a0196bd40 --- /dev/null +++ b/lib/fog/rackspace/errors.rb @@ -0,0 +1,27 @@ +module Fog + module Rackspace + module Errors + + def self.included(mod) + mod.class_eval <<-'EOS', __FILE__, __LINE__ + class NotFound < Fog::Service::NotFound + attr_reader :region, :status_code + + def to_s + status = status_code ? "[HTTP #{status_code}] " : "" + message = region ? "resource not found in #{region} region" : super + "#{status}#{message}" + end + + def self.slurp(error, region=nil) + exception = NotFound.new + exception.instance_variable_set(:@region, region) + exception.instance_variable_set(:@status_code, error.response.status) rescue nil + exception + end + end + EOS + end + end + end +end \ No newline at end of file diff --git a/lib/fog/rackspace/load_balancers.rb b/lib/fog/rackspace/load_balancers.rb index 9fdcfe8d5..7108f81d3 100644 --- a/lib/fog/rackspace/load_balancers.rb +++ b/lib/fog/rackspace/load_balancers.rb @@ -3,6 +3,7 @@ require 'fog/rackspace' module Fog module Rackspace class LoadBalancers < Fog::Service + include Fog::Rackspace::Errors #These references exist for backwards compatibility class ServiceError < Fog::Rackspace::Errors::ServiceError; end @@ -131,7 +132,7 @@ module Fog :path => "#{endpoint_uri.path}/#{params[:path]}" })) rescue Excon::Errors::NotFound => error - raise NotFound.slurp error + raise NotFound.slurp(error, region) rescue Excon::Errors::BadRequest => error raise BadRequest.slurp error rescue Excon::Errors::InternalServerError => error diff --git a/lib/fog/rackspace/storage.rb b/lib/fog/rackspace/storage.rb index 074763894..665ff116e 100644 --- a/lib/fog/rackspace/storage.rb +++ b/lib/fog/rackspace/storage.rb @@ -4,6 +4,7 @@ require 'fog/storage' module Fog module Storage class Rackspace < Fog::Service + include Fog::Rackspace::Errors requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :rackspace_servicenet, :rackspace_cdn_ssl, :persistent, :rackspace_region @@ -155,7 +156,7 @@ module Fog rescue Excon::Errors::HTTPStatusError => error raise case error when Excon::Errors::NotFound - Fog::Storage::Rackspace::NotFound.slurp(error) + NotFound.slurp(error, region) else error end From 5ed929938a50fe37350bf126257bc6745457c624 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Mon, 15 Apr 2013 13:12:14 -0500 Subject: [PATCH 2/8] [rackspace] correcting exception classes on YARD docs --- lib/fog/rackspace/cdn.rb | 14 +-- .../models/block_storage/snapshot.rb | 16 +-- .../models/block_storage/snapshots.rb | 16 +-- .../rackspace/models/block_storage/volume.rb | 32 ++--- .../models/block_storage/volume_types.rb | 16 +-- .../rackspace/models/block_storage/volumes.rb | 16 +-- .../rackspace/models/compute_v2/attachment.rb | 16 +-- .../models/compute_v2/attachments.rb | 16 +-- .../rackspace/models/compute_v2/flavors.rb | 16 +-- lib/fog/rackspace/models/compute_v2/image.rb | 16 +-- lib/fog/rackspace/models/compute_v2/images.rb | 16 +-- .../rackspace/models/compute_v2/metadata.rb | 24 ++-- .../rackspace/models/compute_v2/metadatum.rb | 16 +-- lib/fog/rackspace/models/compute_v2/server.rb | 112 +++++++++--------- .../rackspace/models/compute_v2/servers.rb | 24 ++-- lib/fog/rackspace/models/storage/account.rb | 16 +-- .../rackspace/models/storage/directories.rb | 16 +-- lib/fog/rackspace/models/storage/directory.rb | 64 +++++----- lib/fog/rackspace/models/storage/file.rb | 72 +++++------ lib/fog/rackspace/models/storage/files.rb | 40 +++---- .../requests/block_storage/create_snapshot.rb | 8 +- .../requests/block_storage/create_volume.rb | 8 +- .../requests/block_storage/delete_snapshot.rb | 8 +- .../requests/block_storage/delete_volume.rb | 8 +- .../requests/block_storage/get_snapshot.rb | 8 +- .../requests/block_storage/get_volume.rb | 8 +- .../requests/block_storage/get_volume_type.rb | 8 +- .../requests/block_storage/list_snapshots.rb | 8 +- .../block_storage/list_volume_types.rb | 8 +- .../requests/block_storage/list_volumes.rb | 8 +- .../rackspace/requests/cdn/delete_object.rb | 8 +- .../rackspace/requests/cdn/get_containers.rb | 8 +- .../rackspace/requests/cdn/head_container.rb | 8 +- .../rackspace/requests/cdn/post_container.rb | 8 +- .../rackspace/requests/cdn/put_container.rb | 8 +- .../requests/compute_v2/attach_volume.rb | 8 +- .../compute_v2/change_server_password.rb | 8 +- .../compute_v2/confirm_resize_server.rb | 8 +- .../requests/compute_v2/create_image.rb | 8 +- .../requests/compute_v2/create_server.rb | 8 +- .../requests/compute_v2/delete_attachment.rb | 8 +- .../requests/compute_v2/delete_image.rb | 8 +- .../compute_v2/delete_metadata_item.rb | 8 +- .../requests/compute_v2/delete_server.rb | 8 +- .../requests/compute_v2/get_attachment.rb | 8 +- .../requests/compute_v2/get_flavor.rb | 8 +- .../requests/compute_v2/get_image.rb | 8 +- .../requests/compute_v2/get_metadata_item.rb | 8 +- .../requests/compute_v2/get_server.rb | 8 +- .../requests/compute_v2/list_addresses.rb | 8 +- .../compute_v2/list_addresses_by_network.rb | 8 +- .../requests/compute_v2/list_attachments.rb | 8 +- .../requests/compute_v2/list_flavors.rb | 8 +- .../requests/compute_v2/list_images.rb | 8 +- .../requests/compute_v2/list_metadata.rb | 8 +- .../requests/compute_v2/list_servers.rb | 8 +- .../requests/compute_v2/reboot_server.rb | 8 +- .../requests/compute_v2/rebuild_server.rb | 8 +- .../requests/compute_v2/resize_server.rb | 8 +- .../compute_v2/revert_resize_server.rb | 8 +- .../requests/compute_v2/set_metadata.rb | 8 +- .../requests/compute_v2/set_metadata_item.rb | 8 +- .../requests/compute_v2/update_metadata.rb | 8 +- .../requests/compute_v2/update_server.rb | 8 +- .../rackspace/requests/storage/copy_object.rb | 8 +- .../requests/storage/delete_container.rb | 8 +- .../requests/storage/delete_object.rb | 8 +- .../requests/storage/get_container.rb | 8 +- .../requests/storage/get_containers.rb | 8 +- .../rackspace/requests/storage/get_object.rb | 8 +- .../requests/storage/get_object_https_url.rb | 8 +- .../requests/storage/head_container.rb | 8 +- .../requests/storage/head_containers.rb | 8 +- .../rackspace/requests/storage/head_object.rb | 8 +- .../storage/post_set_meta_temp_url_key.rb | 8 +- .../requests/storage/put_container.rb | 8 +- .../rackspace/requests/storage/put_object.rb | 8 +- .../requests/storage/put_object_manifest.rb | 8 +- 78 files changed, 519 insertions(+), 519 deletions(-) diff --git a/lib/fog/rackspace/cdn.rb b/lib/fog/rackspace/cdn.rb index 2bc8f559b..e07600f41 100644 --- a/lib/fog/rackspace/cdn.rb +++ b/lib/fog/rackspace/cdn.rb @@ -39,10 +39,10 @@ module Fog # @param [Fog::Storage::Rackspace::Directory] 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::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def publish_container(container, publish = true) enabled = publish ? 'True' : 'False' response = put_container(container.key, 'X-Cdn-Enabled' => enabled) @@ -53,9 +53,9 @@ module Fog # Returns hash of urls for container # @param [Fog::Storage::Rackspace::Directory] container to retrieve urls for # @return [Hash] hash containing urls for published container - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400 + # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500 + # @raise [Fog::Storage::Rackspace::ServiceError] # @note If unable to find container or container is not published this method will return an empty hash. def urls(container) begin diff --git a/lib/fog/rackspace/models/block_storage/snapshot.rb b/lib/fog/rackspace/models/block_storage/snapshot.rb index 96d5a34e5..1960af49f 100644 --- a/lib/fog/rackspace/models/block_storage/snapshot.rb +++ b/lib/fog/rackspace/models/block_storage/snapshot.rb @@ -52,10 +52,10 @@ module Fog # @param force [Boolean] Set to true to force service to create snapshot # @raise [Fog::Rackspace::BlockStorage::IdentifierTaken] if the snapshot has been previously saved. # @return [Boolean] returns true if snapshot is being created - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @note A snapshot object cannot be updated # @note All writes to the volume should be flushed before creating the snapshot, either by un-mounting any file systems on the volume or by detaching the volume. # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/POST_createSnapshot__v1__tenant_id__snapshots.html @@ -73,10 +73,10 @@ module Fog # Destroys snapshot # @return [Boolean] returns true if snapshot was deleted - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/DELETE_deleteSnapshot__v1__tenant_id__snapshots.html def destroy requires :identity diff --git a/lib/fog/rackspace/models/block_storage/snapshots.rb b/lib/fog/rackspace/models/block_storage/snapshots.rb index 456765d3e..a10c66b3e 100644 --- a/lib/fog/rackspace/models/block_storage/snapshots.rb +++ b/lib/fog/rackspace/models/block_storage/snapshots.rb @@ -10,10 +10,10 @@ module Fog # Returns list of snapshots # @return [Fog::Rackspace::BlockStorage::Snapshots] Retrieves a snapshots - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getSnapshotsSimple__v1__tenant_id__snapshots.html def all data = service.list_snapshots.body['snapshots'] @@ -23,10 +23,10 @@ module Fog # Retrieves snapshot # @param [String] snapshot_id for snapshot to be returned # @return [Fog::Rackspace::BlockStorage::Volume] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getSnapshot__v1__tenant_id__snapshots.html def get(snapshot_id) data = service.get_snapshot(snapshot_id).body['snapshot'] diff --git a/lib/fog/rackspace/models/block_storage/volume.rb b/lib/fog/rackspace/models/block_storage/volume.rb index c1d7eeb7b..491def59c 100644 --- a/lib/fog/rackspace/models/block_storage/volume.rb +++ b/lib/fog/rackspace/models/block_storage/volume.rb @@ -62,10 +62,10 @@ module Fog # Returns a list of snapshots associated with the volume # @return [Fog::Rackspace::BlockStorage::Snapshots] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] def snapshots service.snapshots.select { |s| s.volume_id == identity } end @@ -77,10 +77,10 @@ module Fog # @option options [String] :display_description of snapshot # @option options [Boolean] :force - If set to true, snapshot will be taken even if volume is still mounted. # @return [Fog::Rackspace::BlockStorage::Snapshot] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @note All writes to the volume should be flushed before creating the snapshot, either by un-mounting any file systems on the volume or by detaching the volume. # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/POST_createSnapshot__v1__tenant_id__snapshots.html def create_snapshot(options={}) @@ -91,10 +91,10 @@ module Fog # Creates volume # @raise [Fog::Rackspace::BlockStorage::IdentifierTaken] if the volume has been previously saved. # @return [Boolean] returns true if volume was successfully created - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @note A volume object cannot be updated # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/POST_createVolume__v1__tenant_id__volumes.html def save @@ -112,10 +112,10 @@ module Fog # Destroys Volume # @return [Boolean] returns true if volume was deleted - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @note You cannot delete a volume until all of its dependent snaphosts have been deleted. # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/DELETE_deleteVolume__v1__tenant_id__volumes.html def destroy diff --git a/lib/fog/rackspace/models/block_storage/volume_types.rb b/lib/fog/rackspace/models/block_storage/volume_types.rb index cef725720..09f58c3aa 100644 --- a/lib/fog/rackspace/models/block_storage/volume_types.rb +++ b/lib/fog/rackspace/models/block_storage/volume_types.rb @@ -10,10 +10,10 @@ module Fog # Returns list of volume types # @return [Fog::Rackspace::BlockStorage::VolumeTypes] Retrieves a list volume types. - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolumeTypes__v1__tenant_id__types.html def all data = service.list_volume_types.body['volume_types'] @@ -23,10 +23,10 @@ module Fog # Retrieves volume type # @param [String] volume_type_id for volume_type to be returned # @return [Fog::Rackspace::BlockStorage::VolumeType] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolumeType__v1__tenant_id__types.html def get(volume_type_id) data = service.get_volume_type(volume_type_id).body['volume_type'] diff --git a/lib/fog/rackspace/models/block_storage/volumes.rb b/lib/fog/rackspace/models/block_storage/volumes.rb index ff20b05a6..261091b20 100644 --- a/lib/fog/rackspace/models/block_storage/volumes.rb +++ b/lib/fog/rackspace/models/block_storage/volumes.rb @@ -10,10 +10,10 @@ module Fog # Returns list of volumes # @return [Fog::Rackspace::BlockStorage::Volumes] Retrieves a volumes - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolumesSimple__v1__tenant_id__volumes.html def all data = service.list_volumes.body['volumes'] @@ -23,10 +23,10 @@ module Fog # Retrieves volume # @param [String] volume_id for snapshot to be returned # @return [Fog::Rackspace::BlockStorage::Volume] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolume__v1__tenant_id__volumes.html def get(volume_id) data = service.get_volume(volume_id).body['volume'] diff --git a/lib/fog/rackspace/models/compute_v2/attachment.rb b/lib/fog/rackspace/models/compute_v2/attachment.rb index 1d530c961..89e1a0dc2 100644 --- a/lib/fog/rackspace/models/compute_v2/attachment.rb +++ b/lib/fog/rackspace/models/compute_v2/attachment.rb @@ -26,10 +26,10 @@ module Fog # Attaches volume to volume to server. # Requires :server_id, :volume_id, and device to be populated # @return [Boolean] true if volume is attaching - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Attach_Volume_to_Server.html def save requires :server_id, :volume_id, :device @@ -40,10 +40,10 @@ module Fog # Detaches volume from server # @return [Boolean] true if volume is detaching - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Volume_Attachment.html def destroy requires :server_id, :volume_id diff --git a/lib/fog/rackspace/models/compute_v2/attachments.rb b/lib/fog/rackspace/models/compute_v2/attachments.rb index 163fa9b4d..993353355 100644 --- a/lib/fog/rackspace/models/compute_v2/attachments.rb +++ b/lib/fog/rackspace/models/compute_v2/attachments.rb @@ -12,10 +12,10 @@ module Fog # Retrieves attachments belonging to server # @return [Fog::Compute::RackspaceV2::Attachments] list of attachments - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see Server#attachments def all data = service.list_attachments(server.id).body['volumeAttachments'] @@ -25,10 +25,10 @@ module Fog # Retrieves attachment belonging to server # @param [String] volume_id # @return [Fog::Compute::RackspaceV2::Attachment] attachment for volume id - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def get(volume_id) data = service.get_attachment(server.id, volume_id).body['volumeAttachment'] data && new(data) diff --git a/lib/fog/rackspace/models/compute_v2/flavors.rb b/lib/fog/rackspace/models/compute_v2/flavors.rb index 8d8ab9f31..d2a722df2 100644 --- a/lib/fog/rackspace/models/compute_v2/flavors.rb +++ b/lib/fog/rackspace/models/compute_v2/flavors.rb @@ -10,10 +10,10 @@ module Fog # Retrieves information for all available flavors # @return [Fog::Compute::RackspaceV2::Flavors] list of flavors - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note Fog's currentl implementation only returns 1000 flavors. # @note Fog does not retrieve all flavor details. Please use #get to retrieve all details for a specific flavor. def all @@ -24,10 +24,10 @@ module Fog # Retrieve image # @param [String] flavor_id id of flavor # @return [Fog::Compute::RackspaceV2::Flavor] flavor - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Flavor_Details-d1e4317.html def get(flavor_id) data = service.get_flavor(flavor_id).body['flavor'] diff --git a/lib/fog/rackspace/models/compute_v2/image.rb b/lib/fog/rackspace/models/compute_v2/image.rb index 8788fc02b..03e90c5ae 100644 --- a/lib/fog/rackspace/models/compute_v2/image.rb +++ b/lib/fog/rackspace/models/compute_v2/image.rb @@ -89,10 +89,10 @@ module Fog # @param [String] ready_state By default state is ACTIVE # @param [Array,String] error_states By default state is ERROR # @return [Boolean] returns true if server is in a ready state - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @raise [Fog::Compute::RackspaceV2::InvalidImageStateException] if server state is an error state def ready?(ready_state = ACTIVE, error_states=[ERROR]) if error_states @@ -104,10 +104,10 @@ module Fog # Destroy image - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def destroy requires :identity service.delete_image(identity) diff --git a/lib/fog/rackspace/models/compute_v2/images.rb b/lib/fog/rackspace/models/compute_v2/images.rb index e4bcdc8c1..566a54781 100644 --- a/lib/fog/rackspace/models/compute_v2/images.rb +++ b/lib/fog/rackspace/models/compute_v2/images.rb @@ -10,10 +10,10 @@ module Fog # Returns list of images # @return [Fog::Compute::RackspaceV2::Images] Retrieves a list images. - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note Fog's current implementation only returns 1000 images. # @note Fog does not retrieve all image details. Please use get to retrieve all details for a specific image. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Images-d1e4435.html @@ -25,10 +25,10 @@ module Fog # Retrieve image # @param [String] image_id id of image # @return [Fog::Compute::RackspaceV2:Image] image - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Image_Details-d1e4848.html def get(image_id) data = service.get_image(image_id).body['image'] diff --git a/lib/fog/rackspace/models/compute_v2/metadata.rb b/lib/fog/rackspace/models/compute_v2/metadata.rb index 548ac41b0..37dbb63e5 100644 --- a/lib/fog/rackspace/models/compute_v2/metadata.rb +++ b/lib/fog/rackspace/models/compute_v2/metadata.rb @@ -16,10 +16,10 @@ module Fog # Retrieves all of the metadata from server # @return [Fog::Compute::RackspaceV2::Metadatum] list of metadatum - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def all requires :parent return unless parent.identity @@ -30,10 +30,10 @@ module Fog # Retrieves specific metadata from server # @param [String] key for metadatum # @return [Fog::Compute::RackspaceV2::Metadatum] metadatum - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def get(key) requires :parent data = service.get_metadata_item(collection_name, parent.id, key).body["meta"] @@ -73,10 +73,10 @@ module Fog end # Saves the current metadata on server - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def save requires :parent service.set_metadata(collection_name, parent.id, to_hash) diff --git a/lib/fog/rackspace/models/compute_v2/metadatum.rb b/lib/fog/rackspace/models/compute_v2/metadatum.rb index afe16a2fd..173a88555 100644 --- a/lib/fog/rackspace/models/compute_v2/metadatum.rb +++ b/lib/fog/rackspace/models/compute_v2/metadatum.rb @@ -13,10 +13,10 @@ module Fog # Remove metadatum from server # @return [Boolean] return true if metadatum is deleting - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def destroy requires :identity connection.delete_metadata_item(collection_name, parent.id, key) @@ -25,10 +25,10 @@ module Fog # Save metadatum on server # @return [Boolean] return true if metadatum is saving - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def save requires :identity, :value connection.set_metadata_item(collection_name, parent.id, key, value) diff --git a/lib/fog/rackspace/models/compute_v2/server.rb b/lib/fog/rackspace/models/compute_v2/server.rb index d7a928984..b361a5448 100644 --- a/lib/fog/rackspace/models/compute_v2/server.rb +++ b/lib/fog/rackspace/models/compute_v2/server.rb @@ -180,10 +180,10 @@ module Fog # * requires attributes: service:, :name, :image_id, and :flavor_id # * optional attributes :disk_config, :metadata, :personality # @return [Boolean] returns true if server is being created - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note You should use servers.create to create servers instead calling this method directly # @see Servers#create # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/CreateServers.html @@ -211,10 +211,10 @@ module Fog # This will update :name, :accessIPv4, and :accessIPv6 attributes. # @note If you edit the server name, the server host name does not change. Also, server names are not guaranteed to be unique. # @return true if update has started updating - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/ServerUpdate.html # # * State Transition @@ -234,10 +234,10 @@ module Fog # Destroy the server # @return [Boolean] returns true if server has started deleting - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Server-d1e2883.html # # * Status Transition: @@ -251,10 +251,10 @@ module Fog # Server flavor # @return [Fog::Compute::RackspaceV2::Flavor] server flavor - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def flavor requires :flavor_id @flavor ||= service.flavors.get(flavor_id) @@ -262,10 +262,10 @@ module Fog # Server image # @return [Fog::Compute::RackspaceV2::Image] server image - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def image requires :image_id @image ||= service.images.get(image_id) @@ -276,10 +276,10 @@ module Fog # @param options [Hash]: # @option options [Hash] metadata hash of containing metadata key value pairs. # @return [Fog::ComputeRackspaceV2::Image] image being created - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_Image-d1e4655.html # # * State Transition: @@ -298,10 +298,10 @@ module Fog # Attached Cloud Block Volumes # @return [Fog::Compute::RackspaceV2::Attachments] attached Cloud Block Volumes - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Volume_Attachments.html def attachments @attachments ||= begin @@ -316,10 +316,10 @@ module Fog # @param [Fog::Rackspace::BlockStorage::Volume, String] volume object or the volume id of volume to mount # @param [String] device name of the device /dev/xvd[a-p] (optional) # @return [Fog::Compute::RackspaceV2::Attachment] resulting attachment object - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Attach_Volume_to_Server.html def attach_volume(volume, device=nil) requires :identity @@ -355,10 +355,10 @@ module Fog # Reboot server # @param [String] type 'SOFT' will do a soft reboot. 'HARD' will do a hard reboot. # @return [Boolean] returns true if server is being rebooted - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Reboot_Server-d1e3371.html # # * State transition: @@ -375,10 +375,10 @@ module Fog # Rebuild removes all data on the server and replaces it with the specified image. The id and all IP addresses remain the same. # @param [String] image_id image to use for rebuild # @return [Boolean] returns true if rebuild is in process - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Rebuild_Server-d1e3538.html # # * Status Transition: @@ -394,10 +394,10 @@ module Fog # Resize existing server to a different flavor, in essence, scaling the server up or down. The original server is saved for a period of time to allow rollback if there is a problem. All resizes should be tested and explicitly confirmed, at which time the original server is removed. All resizes are automatically confirmed after 24 hours if they are not confirmed or reverted. # @param [String] flavor_id to resize # @return [Boolean] returns true if resize is in process - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Resize_Server-d1e3707.html # @see #confirm_resize @@ -415,10 +415,10 @@ module Fog # Confirms server resize operation # @return [Boolean] returns true if resize has been confirmed - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Confirm_Resized_Server-d1e3868.html # @see #resize @@ -434,10 +434,10 @@ module Fog # Reverts server resize operation # @return [Boolean] returns true if resize is being reverted - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Revert_Resized_Server-d1e4024.html # @see #resize @@ -454,10 +454,10 @@ module Fog # Change admin password # @param [String] password The administrator password. # @return [Boolean] returns true if operation was scheduled - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note Though Rackspace does not enforce complexity requirements for the password, the operating system might. If the password is not complex enough, the server might enter an ERROR state. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Change_Password-d1e3234.html # diff --git a/lib/fog/rackspace/models/compute_v2/servers.rb b/lib/fog/rackspace/models/compute_v2/servers.rb index d2c02ed99..dbfb42151 100644 --- a/lib/fog/rackspace/models/compute_v2/servers.rb +++ b/lib/fog/rackspace/models/compute_v2/servers.rb @@ -11,10 +11,10 @@ module Fog # Returns list of servers # @return [Fog::Compute::RackspaceV2::Servers] Retrieves a list servers. - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note Fog's current implementation only returns 1000 servers # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html def all @@ -24,10 +24,10 @@ module Fog # Creates a new server and populates ssh keys # @return [Fog::Compute::RackspaceV2::Server] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note This method is incompatible with Cloud Servers utlizing RackConnect. RackConnect users # should use server personalization to install keys. Please see Server#personality for more information. # @example @@ -48,10 +48,10 @@ module Fog # Retrieves server # @param [String] server_id for server to be returned # @return [Fog::Compute::RackspaceV2:Server] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Server_Details-d1e2623.html def get(server_id) data = service.get_server(server_id).body['server'] diff --git a/lib/fog/rackspace/models/storage/account.rb b/lib/fog/rackspace/models/storage/account.rb index 9af4a0bae..656ae20be 100644 --- a/lib/fog/rackspace/models/storage/account.rb +++ b/lib/fog/rackspace/models/storage/account.rb @@ -25,10 +25,10 @@ module Fog # Saves account settings (meta_temp_url_key) # @return [Boolean] returns true if successfully updated - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def save service.post_set_meta_temp_url_key meta_temp_url_key true @@ -36,10 +36,10 @@ module Fog # Reload account with latest data from Cloud Files # @return [Fog::Storage::Rackspace::Account] returns itself - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def reload response = service.head_containers merge_attributes response.headers diff --git a/lib/fog/rackspace/models/storage/directories.rb b/lib/fog/rackspace/models/storage/directories.rb index 99c36c1ab..ad651dd40 100644 --- a/lib/fog/rackspace/models/storage/directories.rb +++ b/lib/fog/rackspace/models/storage/directories.rb @@ -11,10 +11,10 @@ module Fog # Returns list of directories # @return [Fog::Storage::Rackspace::Directories] Retrieves a list directories. - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @note Fog's current implementation only returns 10,000 directories # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/View_List_of_Containers-d1e1100.html def all @@ -27,10 +27,10 @@ module Fog # @param options [Hash]: # @option options [String] cdn_cname CDN CNAME used when calling Directory#public_url # @return [Fog::Storage::Rackspace::Directory] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @example # directory = fog.directories.get('video', :cdn_cname => 'http://cdn.lunenburg.org') # files = directory.files diff --git a/lib/fog/rackspace/models/storage/directory.rb b/lib/fog/rackspace/models/storage/directory.rb index 201c78ebb..a4e860290 100644 --- a/lib/fog/rackspace/models/storage/directory.rb +++ b/lib/fog/rackspace/models/storage/directory.rb @@ -58,10 +58,10 @@ module Fog # Destroy the directory and remove it from CDN # @return [Boolean] returns true if directory was deleted - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @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 @@ -75,10 +75,10 @@ module Fog # Returns collection of files in directory # @return [Fog::Storage::Rackspace::Files] collection of files in directory - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def files @files ||= begin Fog::Storage::Rackspace::Files.new( @@ -90,10 +90,10 @@ module Fog # Is directory published to CDN # @return [Boolean] return true if published to CDN - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def public? if @public.nil? @public ||= (key && public_url) ? true : false @@ -103,10 +103,10 @@ module Fog # Reload directory with latest data from Cloud Files # @return [Fog::Storage::Rackspace::Directory] returns itself - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def reload @public = nil @urls = nil @@ -123,10 +123,10 @@ module Fog # 3. return the default CDN url. # # @return [String] public url for directory - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def public_url return nil if urls.empty? return urls[:ssl_uri] if service.ssl? @@ -135,10 +135,10 @@ module Fog # URL used to stream video to iOS devices. Cloud Files will auto convert to the approprate format. # @return [String] iOS URL - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/iOS-Streaming-d1f3725.html def ios_url urls[:ios_uri] @@ -146,10 +146,10 @@ module Fog # URL used to stream resources # @return [String] streaming url - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Streaming-CDN-Enabled_Containers-d1f3721.html def streaming_url urls[:streaming_uri] @@ -157,10 +157,10 @@ module Fog # Create or update directory and associated metadata # @return [Boolean] returns true if directory was saved - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @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 diff --git a/lib/fog/rackspace/models/storage/file.rb b/lib/fog/rackspace/models/storage/file.rb index 8d89a9652..1fe3e2373 100644 --- a/lib/fog/rackspace/models/storage/file.rb +++ b/lib/fog/rackspace/models/storage/file.rb @@ -51,10 +51,10 @@ module Fog attr_writer :public # Returns the body/contents of file - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @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) } @@ -77,10 +77,10 @@ module Fog # @param [String] target_directory_key # @param [String] target_file_key # @param options [Hash] used to pass in file attributes - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @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 @@ -94,10 +94,10 @@ module Fog # Destroy the file # @return [Boolean] returns true if file is destroyed - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Delete_Object-d1e2264.html def destroy requires :directory, :key @@ -134,10 +134,10 @@ module Fog # Is file published to CDN # @return [Boolean] return true if published to CDN - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def public? directory.public? end @@ -151,20 +151,20 @@ module Fog # 3. return the default CDN url. # # @return [String] public url for file - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] 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::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @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 @@ -172,20 +172,20 @@ module Fog # URL used to stream resources # @return [String] streaming url - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @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::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @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 @@ -198,10 +198,10 @@ module Fog # Create or updates file and associated metadata # @param options [Hash] additional parameters to pass to Cloud Files - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @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 77a6fa6ae..ccc4e8d8e 100644 --- a/lib/fog/rackspace/models/storage/files.rb +++ b/lib/fog/rackspace/models/storage/files.rb @@ -35,10 +35,10 @@ module Fog # Returns list of files # @return [Fog::Storage::Rackspace::Files] Retrieves a list files. - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/List_Objects-d1e1284.html def all(options = {}) requires :directory @@ -63,10 +63,10 @@ module Fog # Calls block for each file in the directory # @yieldparam [Fog::Storage::Rackspace::File] # @return [Fog::Storage::Rackspace::Directory] returns itself - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @note This method retrieves files in pages. Page size is defined by the limit attribute alias :each_file_this_page :each def each @@ -92,10 +92,10 @@ module Fog # @yieldparam [Integer] remaining # @yieldparam [Integer] content_length # @return [Fog::Storage::Rackspace:File] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @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 @@ -125,10 +125,10 @@ module Fog # Returns the public_url for the given object key # @param key of the object # @return [String] url for object - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # @see Directory#public_url def get_url(key) requires :directory @@ -141,10 +141,10 @@ module Fog # @param key of the object # @param options Required for compatibility with other Fog providers. Not Used. # @return [Fog::Storage::Rackspace::File] - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def head(key, options = {}) requires :directory data = service.head_object(directory.key, key) diff --git a/lib/fog/rackspace/requests/block_storage/create_snapshot.rb b/lib/fog/rackspace/requests/block_storage/create_snapshot.rb index 2e97fe26b..ecd520cc8 100644 --- a/lib/fog/rackspace/requests/block_storage/create_snapshot.rb +++ b/lib/fog/rackspace/requests/block_storage/create_snapshot.rb @@ -20,10 +20,10 @@ module Fog # * 'size' [Fixnum]: - size of the snapshot in GB # * 'display_name' [String]: - display name of snapshot # * 'created_at' [String]: - creation time of snapshot - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @note All writes to the volume should be flushed before creating the snapshot, either by un-mounting any file systems on the volume or by detaching the volume. # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/POST_createSnapshot__v1__tenant_id__snapshots.html def create_snapshot(volume_id, options = {}) diff --git a/lib/fog/rackspace/requests/block_storage/create_volume.rb b/lib/fog/rackspace/requests/block_storage/create_volume.rb index 62d2db139..781f5c1d1 100644 --- a/lib/fog/rackspace/requests/block_storage/create_volume.rb +++ b/lib/fog/rackspace/requests/block_storage/create_volume.rb @@ -25,10 +25,10 @@ module Fog # * 'snapshot_id' [String]: - The optional snapshot from which to create a volume. # * 'display_name' [String]: - display name of volume # * 'created_at' [String]: - the volume creation time - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/POST_createVolume__v1__tenant_id__volumes.html def create_volume(size, options = {}) data = { diff --git a/lib/fog/rackspace/requests/block_storage/delete_snapshot.rb b/lib/fog/rackspace/requests/block_storage/delete_snapshot.rb index feb78a723..f0e7ad07d 100644 --- a/lib/fog/rackspace/requests/block_storage/delete_snapshot.rb +++ b/lib/fog/rackspace/requests/block_storage/delete_snapshot.rb @@ -7,10 +7,10 @@ module Fog # # @param [String] snapshot_id Id of snapshot to delete # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/POST_createSnapshot__v1__tenant_id__snapshots.html def delete_snapshot(snapshot_id) request( diff --git a/lib/fog/rackspace/requests/block_storage/delete_volume.rb b/lib/fog/rackspace/requests/block_storage/delete_volume.rb index 58b7d4cc6..472b42ca9 100644 --- a/lib/fog/rackspace/requests/block_storage/delete_volume.rb +++ b/lib/fog/rackspace/requests/block_storage/delete_volume.rb @@ -7,10 +7,10 @@ module Fog # # @param [String] volume_id Id of volume to delete # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @note You cannot delete a volume until all of its dependent snaphosts have been deleted. # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/DELETE_deleteVolume__v1__tenant_id__volumes.html def delete_volume(volume_id) diff --git a/lib/fog/rackspace/requests/block_storage/get_snapshot.rb b/lib/fog/rackspace/requests/block_storage/get_snapshot.rb index e4ee8f591..acd41c07e 100644 --- a/lib/fog/rackspace/requests/block_storage/get_snapshot.rb +++ b/lib/fog/rackspace/requests/block_storage/get_snapshot.rb @@ -17,10 +17,10 @@ module Fog # * 'os-extended-snapshot-attributes:progress' [String]: - # * 'display_name' [String]: - display name of snapshot # * 'created_at' [String]: - creation time of snapshot - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getSnapshot__v1__tenant_id__snapshots.html def get_snapshot(snapshot_id) request( diff --git a/lib/fog/rackspace/requests/block_storage/get_volume.rb b/lib/fog/rackspace/requests/block_storage/get_volume.rb index 9f999b71a..643347c33 100644 --- a/lib/fog/rackspace/requests/block_storage/get_volume.rb +++ b/lib/fog/rackspace/requests/block_storage/get_volume.rb @@ -21,10 +21,10 @@ module Fog # * 'display_name' [String]: - display name of volume # * 'created_at' [String]: - the volume creation time # * 'os-vol-tenant-attr:tenant_id' [String]: - - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolume__v1__tenant_id__volumes.html def get_volume(volume_id) request( diff --git a/lib/fog/rackspace/requests/block_storage/get_volume_type.rb b/lib/fog/rackspace/requests/block_storage/get_volume_type.rb index a48797213..675fb89c7 100644 --- a/lib/fog/rackspace/requests/block_storage/get_volume_type.rb +++ b/lib/fog/rackspace/requests/block_storage/get_volume_type.rb @@ -11,10 +11,10 @@ module Fog # * 'name' [String]: - name of volume type # * 'extra_specs' [Hash]: - # * 'id' [String]: - id of volume type - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolumeType__v1__tenant_id__types.html def get_volume_type(volume_type_id) request( diff --git a/lib/fog/rackspace/requests/block_storage/list_snapshots.rb b/lib/fog/rackspace/requests/block_storage/list_snapshots.rb index 4998f900c..8cf4b6308 100644 --- a/lib/fog/rackspace/requests/block_storage/list_snapshots.rb +++ b/lib/fog/rackspace/requests/block_storage/list_snapshots.rb @@ -14,10 +14,10 @@ module Fog # * 'size' [Fixnum]: - size of the snapshot in GB # * 'display_name' [String]: - display name of snapshot # * 'created_at' [String]: - creation time of snapshot - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getSnapshotsSimple__v1__tenant_id__snapshots.html def list_snapshots request( diff --git a/lib/fog/rackspace/requests/block_storage/list_volume_types.rb b/lib/fog/rackspace/requests/block_storage/list_volume_types.rb index 5dd174402..d4285c5c7 100644 --- a/lib/fog/rackspace/requests/block_storage/list_volume_types.rb +++ b/lib/fog/rackspace/requests/block_storage/list_volume_types.rb @@ -10,10 +10,10 @@ module Fog # * 'name' [String]: - name of volume type # * 'extra_specs' [Hash]: - # * 'id' [Fixnum]: - id of volume type - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolumeTypes__v1__tenant_id__types.html def list_volume_types request( diff --git a/lib/fog/rackspace/requests/block_storage/list_volumes.rb b/lib/fog/rackspace/requests/block_storage/list_volumes.rb index 935f7ccfa..725fff873 100644 --- a/lib/fog/rackspace/requests/block_storage/list_volumes.rb +++ b/lib/fog/rackspace/requests/block_storage/list_volumes.rb @@ -18,10 +18,10 @@ module Fog # * 'snapshot_id' [String]: - optional snapshot from which to create a volume. # * 'display_name' [String]: - display name of bolume # * 'created_at' [String]: - volume creation time - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Rackspace::BlockStorage::NotFound] - HTTP 404 + # @raise [Fog::Rackspace::BlockStorage::BadRequest] - HTTP 400 + # @raise [Fog::Rackspace::BlockStorage::InternalServerError] - HTTP 500 + # @raise [Fog::Rackspace::BlockStorage::ServiceError] # @see http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolumesSimple__v1__tenant_id__volumes.html def list_volumes request( diff --git a/lib/fog/rackspace/requests/cdn/delete_object.rb b/lib/fog/rackspace/requests/cdn/delete_object.rb index 329cb06a2..3ac3ac45f 100644 --- a/lib/fog/rackspace/requests/cdn/delete_object.rb +++ b/lib/fog/rackspace/requests/cdn/delete_object.rb @@ -9,10 +9,10 @@ module Fog # * container<~String> - Name of container to delete # * object<~String> - Name of object to delete # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] 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 3ed23149c..a735edc3b 100644 --- a/lib/fog/rackspace/requests/cdn/get_containers.rb +++ b/lib/fog/rackspace/requests/cdn/get_containers.rb @@ -16,10 +16,10 @@ module Fog # * body<~Array>: # * container<~String>: Name of container # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] 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 758bdd260..ad696ad54 100644 --- a/lib/fog/rackspace/requests/cdn/head_container.rb +++ b/lib/fog/rackspace/requests/cdn/head_container.rb @@ -18,10 +18,10 @@ module Fog # * 'X-User-Agent-ACL'<~String> - ? # * 'X-Referrer-ACL'<~String> - ? # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def head_container(container) response = request( :expects => 204, diff --git a/lib/fog/rackspace/requests/cdn/post_container.rb b/lib/fog/rackspace/requests/cdn/post_container.rb index 3bb87691e..822ffd534 100644 --- a/lib/fog/rackspace/requests/cdn/post_container.rb +++ b/lib/fog/rackspace/requests/cdn/post_container.rb @@ -15,10 +15,10 @@ module Fog # * 'X-User-Agent-ACL'<~String> - ? # * 'X-Referrer-ACL'<~String> - ? # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def post_container(name, options = {}) response = request( :expects => [201, 202], diff --git a/lib/fog/rackspace/requests/cdn/put_container.rb b/lib/fog/rackspace/requests/cdn/put_container.rb index 108fdb96c..02f95170e 100644 --- a/lib/fog/rackspace/requests/cdn/put_container.rb +++ b/lib/fog/rackspace/requests/cdn/put_container.rb @@ -15,10 +15,10 @@ module Fog # * 'X-User-Agent-ACL'<~String> - ? # * 'X-Referrer-ACL'<~String> - ? # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def put_container(name, options = {}) response = request( :expects => [201, 202], diff --git a/lib/fog/rackspace/requests/compute_v2/attach_volume.rb b/lib/fog/rackspace/requests/compute_v2/attach_volume.rb index 96858a729..1fd95cd9e 100644 --- a/lib/fog/rackspace/requests/compute_v2/attach_volume.rb +++ b/lib/fog/rackspace/requests/compute_v2/attach_volume.rb @@ -14,10 +14,10 @@ module Fog # * serverId [String] - The id of the server that attached the volume # * id [String] - The id of the attachment # * volumeId [String] - The id of the volume that was attached - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Attach_Volume_to_Server.html def attach_volume(server_id, volume_id, device) data = { 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 ec8804a17..076487a49 100644 --- a/lib/fog/rackspace/requests/compute_v2/change_server_password.rb +++ b/lib/fog/rackspace/requests/compute_v2/change_server_password.rb @@ -7,10 +7,10 @@ module Fog # @param [String] server_id # @param [String] password # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note Though Rackspace does not enforce complexity requirements for the password, the operating system might. If the password is not complex enough, the server might enter an ERROR state. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Change_Password-d1e3234.html def change_server_password(server_id, password) 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 9407fc5f1..0ec811cd2 100644 --- a/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/confirm_resize_server.rb @@ -6,10 +6,10 @@ module Fog # Confirm server resize operation # @param [String] server_id The id of the server to revert # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Revert_Resized_Server-d1e4024.html # diff --git a/lib/fog/rackspace/requests/compute_v2/create_image.rb b/lib/fog/rackspace/requests/compute_v2/create_image.rb index 92a56de64..0de9a0cc5 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_image.rb @@ -10,10 +10,10 @@ module Fog # @param [Hash] options # @option options [Hash] :metadata - key value pairs of image metadata # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_Image-d1e4655.html # # * State Transition: diff --git a/lib/fog/rackspace/requests/compute_v2/create_server.rb b/lib/fog/rackspace/requests/compute_v2/create_server.rb index bf8cf8aa3..1b2eb44c0 100644 --- a/lib/fog/rackspace/requests/compute_v2/create_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/create_server.rb @@ -28,10 +28,10 @@ module Fog # * networks [Array]: # * [Hash]: # * uuid [String] - uuid of attached network - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/CreateServers.html # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Server_Metadata-d1e2529.html # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Server_Personality-d1e2543.html diff --git a/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb b/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb index 81b53434c..85252ff78 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_attachment.rb @@ -7,10 +7,10 @@ module Fog # @param [String] server_id id of server containing volume to delete # @param [String] volume_id id of volume on server to delete # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Volume_Attachment.html def delete_attachment(server_id, volume_id) request( diff --git a/lib/fog/rackspace/requests/compute_v2/delete_image.rb b/lib/fog/rackspace/requests/compute_v2/delete_image.rb index 8885d8045..495ce3e1b 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_image.rb @@ -6,10 +6,10 @@ module Fog # Delete an image # @param [String] image_id Id of image to delete # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Image-d1e4957.html def delete_image(image_id) request( 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 399306008..1cccdd79b 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb @@ -8,10 +8,10 @@ module Fog # @param [String] obj_id id of the object where the metadata is attached # @param [String] key the key of the metadata to delete # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Metadata_Item-d1e5790.html def delete_metadata_item(collection, obj_id, key) request( diff --git a/lib/fog/rackspace/requests/compute_v2/delete_server.rb b/lib/fog/rackspace/requests/compute_v2/delete_server.rb index fa00fe831..3eca0ed35 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_server.rb @@ -6,10 +6,10 @@ module Fog # Deletes a specified server instance from the system. # @param [String] server_id the id of the server to delete # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Server-d1e2883.html def delete_server(server_id) request( diff --git a/lib/fog/rackspace/requests/compute_v2/get_attachment.rb b/lib/fog/rackspace/requests/compute_v2/get_attachment.rb index 13df1b5b3..799536748 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_attachment.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_attachment.rb @@ -13,10 +13,10 @@ module Fog # * serverId [String] - The id of the server that attached the volume # * id [String] - The id of the attachment # * volumeId [String] - The id of the volume that was attached - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Volume_Attachment_Details.html def get_attachment(server_id, volume_id) request( diff --git a/lib/fog/rackspace/requests/compute_v2/get_flavor.rb b/lib/fog/rackspace/requests/compute_v2/get_flavor.rb index 9174602e2..bc0835756 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_flavor.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_flavor.rb @@ -15,10 +15,10 @@ module Fog # * swap [Fixnum] - amount of swap in GB # * vcpus [Fixnum] - number of virtual CPUs # * links [Array] - links to flavor - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Flavor_Details-d1e4317.html def get_flavor(flavor_id) request( diff --git a/lib/fog/rackspace/requests/compute_v2/get_image.rb b/lib/fog/rackspace/requests/compute_v2/get_image.rb index 5854447ed..e52cc50b3 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_image.rb @@ -19,10 +19,10 @@ module Fog # * status [String] - status of current image # * updated [String] - updated timestamp # * links [Array] - links to flavor - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Image_Details-d1e4848.html def get_image(image_id) request( 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 ff243c0d5..692f73329 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb @@ -10,10 +10,10 @@ module Fog # @return [Excon::Response] response: # * body [Hash]: # * meta [Hash]: - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Metadata_Item-d1e5507.html def get_metadata_item(collection, obj_id, key) request( diff --git a/lib/fog/rackspace/requests/compute_v2/get_server.rb b/lib/fog/rackspace/requests/compute_v2/get_server.rb index c31931d3a..9c14ca998 100644 --- a/lib/fog/rackspace/requests/compute_v2/get_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/get_server.rb @@ -33,10 +33,10 @@ module Fog # * tenant_id [String] - The tenant ID. # * updated [String] - updated timestamp # * user_id [Array] - The user ID. - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Get_Server_Details-d1e2623.html def get_server(server_id) request( diff --git a/lib/fog/rackspace/requests/compute_v2/list_addresses.rb b/lib/fog/rackspace/requests/compute_v2/list_addresses.rb index e7717066d..6e13ef158 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_addresses.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_addresses.rb @@ -8,10 +8,10 @@ module Fog # @return [Excon::Response] response: # * body [Hash]: # * addresses [Hash] - key is the network name and the value are an array of addresses allocated for that network - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] def list_addresses(server_id) request( :method => 'GET', 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 b32d7e866..63212aead 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 @@ -14,10 +14,10 @@ module Fog # * [Hash]: # * version [Fixnum] - version of the address # * addr [String] - ip address - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Addresses_by_Network-d1e3118.html def list_addresses_by_network(server_id, network_id) request( diff --git a/lib/fog/rackspace/requests/compute_v2/list_attachments.rb b/lib/fog/rackspace/requests/compute_v2/list_attachments.rb index 73e3dc3d8..34e45076d 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_attachments.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_attachments.rb @@ -13,10 +13,10 @@ module Fog # * serverId [String] - The id of the server that attached the volume # * id [String] - The id of the attachment # * volumeId [String] - The id of the volume that was attached - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Volume_Attachments.html def list_attachments(server_id) request( diff --git a/lib/fog/rackspace/requests/compute_v2/list_flavors.rb b/lib/fog/rackspace/requests/compute_v2/list_flavors.rb index 9bd34261a..f03c59228 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_flavors.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_flavors.rb @@ -11,10 +11,10 @@ module Fog # * id [String] - flavor id # * links [Array] - flavor links # * name [String] - flavor name - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Flavors-d1e4188.html def list_flavors request( diff --git a/lib/fog/rackspace/requests/compute_v2/list_images.rb b/lib/fog/rackspace/requests/compute_v2/list_images.rb index 9920c44c3..08e10fdda 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_images.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_images.rb @@ -11,10 +11,10 @@ module Fog # * id [String] - flavor id # * links [Array] - image links # * name [String] - image name - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Flavors-d1e4188.html def list_images request( diff --git a/lib/fog/rackspace/requests/compute_v2/list_metadata.rb b/lib/fog/rackspace/requests/compute_v2/list_metadata.rb index 7a4b6326a..1fb19d01c 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_metadata.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_metadata.rb @@ -9,10 +9,10 @@ module Fog # @return [Excon::Response] response: # * body [Hash]: # * meta [Hash]: - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Metadata-d1e5089.html def list_metadata(collection, obj_id) request( diff --git a/lib/fog/rackspace/requests/compute_v2/list_servers.rb b/lib/fog/rackspace/requests/compute_v2/list_servers.rb index 23b0443cd..c4f58fc3a 100644 --- a/lib/fog/rackspace/requests/compute_v2/list_servers.rb +++ b/lib/fog/rackspace/requests/compute_v2/list_servers.rb @@ -32,10 +32,10 @@ module Fog # * tenant_id [String] - The tenant ID. # * updated [String] - updated timestamp # * user_id [Array] - The user ID. - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html def list_servers request( diff --git a/lib/fog/rackspace/requests/compute_v2/reboot_server.rb b/lib/fog/rackspace/requests/compute_v2/reboot_server.rb index 049fcd37a..1f08e1adc 100644 --- a/lib/fog/rackspace/requests/compute_v2/reboot_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/reboot_server.rb @@ -6,10 +6,10 @@ module Fog # Reboots server # @param [String] server_id # @param [String] type type of reboot - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Reboot_Server-d1e3371.html def reboot_server(server_id, type) data = { diff --git a/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb b/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb index 48178c709..fc0926066 100644 --- a/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/rebuild_server.rb @@ -31,10 +31,10 @@ module Fog # * networks [Array]: # * [Hash]: # * uuid [String] - uuid of attached network - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Rebuild_Server-d1e3538.html # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Server_Metadata-d1e2529.html # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Server_Personality-d1e2543.html diff --git a/lib/fog/rackspace/requests/compute_v2/resize_server.rb b/lib/fog/rackspace/requests/compute_v2/resize_server.rb index c60172442..da5f10e4b 100644 --- a/lib/fog/rackspace/requests/compute_v2/resize_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/resize_server.rb @@ -7,10 +7,10 @@ module Fog # @param [String] server_id id of server to resize # @param [String] flavor_id id of the desired flavor # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Revert_Resized_Server-d1e4024.html # 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 ab540dcb7..a537db61c 100644 --- a/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/revert_resize_server.rb @@ -6,10 +6,10 @@ module Fog # Reverts server resize operation # @param [String] server_id # @return [Excon::Response] response - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Revert_Resized_Server-d1e4024.html # @see Server#resize diff --git a/lib/fog/rackspace/requests/compute_v2/set_metadata.rb b/lib/fog/rackspace/requests/compute_v2/set_metadata.rb index 32d5077c1..e45c2c48e 100644 --- a/lib/fog/rackspace/requests/compute_v2/set_metadata.rb +++ b/lib/fog/rackspace/requests/compute_v2/set_metadata.rb @@ -10,10 +10,10 @@ module Fog # @return [Excon::Response] response: # * body [Hash]: # * metadata [Hash]: - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Replace_Metadata-d1e5358.html def set_metadata(collection, obj_id, metadata = {}) request( 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 d72bb3ecc..65763c461 100644 --- a/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb +++ b/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb @@ -11,10 +11,10 @@ module Fog # @return [Excon::Response] response: # * body [Hash]: # * meta [Hash]: - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Update_a_Metadata_Item-d1e5633.html def set_metadata_item(collection, obj_id, key, value) request( diff --git a/lib/fog/rackspace/requests/compute_v2/update_metadata.rb b/lib/fog/rackspace/requests/compute_v2/update_metadata.rb index d1fa4cddd..4e1aa7a9c 100644 --- a/lib/fog/rackspace/requests/compute_v2/update_metadata.rb +++ b/lib/fog/rackspace/requests/compute_v2/update_metadata.rb @@ -10,10 +10,10 @@ module Fog # @return [Excon::Response] response: # * body [Hash]: # * metadata [Hash]: - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Update_Metadata-d1e5208.html def update_metadata(collection, obj_id, metadata = {}) request( diff --git a/lib/fog/rackspace/requests/compute_v2/update_server.rb b/lib/fog/rackspace/requests/compute_v2/update_server.rb index 000ceb07e..c3b8e6a1c 100644 --- a/lib/fog/rackspace/requests/compute_v2/update_server.rb +++ b/lib/fog/rackspace/requests/compute_v2/update_server.rb @@ -9,10 +9,10 @@ module Fog # @option options [Hash] name name for server # @option options [String] accessIPv4 The IP version 4 address. # @option options [Hash] accessIPv6 The IP version 6 address. - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404 + # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400 + # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::RackspaceV2::ServiceError] # @note If you edit the server name, the server host name does not change. Also, server names are not guaranteed to be unique. # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/ServerUpdate.html def update_server(server_id, options={}) diff --git a/lib/fog/rackspace/requests/storage/copy_object.rb b/lib/fog/rackspace/requests/storage/copy_object.rb index 95554c0d4..629ababb4 100644 --- a/lib/fog/rackspace/requests/storage/copy_object.rb +++ b/lib/fog/rackspace/requests/storage/copy_object.rb @@ -11,10 +11,10 @@ module Fog # * 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::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] 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 d4ff17ccc..d809b4a79 100644 --- a/lib/fog/rackspace/requests/storage/delete_container.rb +++ b/lib/fog/rackspace/requests/storage/delete_container.rb @@ -7,10 +7,10 @@ module Fog # # ==== Parameters # * name<~String> - Name of container to delete - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def delete_container(name) request( :expects => 204, diff --git a/lib/fog/rackspace/requests/storage/delete_object.rb b/lib/fog/rackspace/requests/storage/delete_object.rb index 9a17463ff..c10377658 100644 --- a/lib/fog/rackspace/requests/storage/delete_object.rb +++ b/lib/fog/rackspace/requests/storage/delete_object.rb @@ -8,10 +8,10 @@ module Fog # ==== Parameters # * container<~String> - Name of container to delete # * object<~String> - Name of object to delete - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def delete_object(container, object) request( :expects => 204, diff --git a/lib/fog/rackspace/requests/storage/get_container.rb b/lib/fog/rackspace/requests/storage/get_container.rb index f212a979d..292dbbd43 100644 --- a/lib/fog/rackspace/requests/storage/get_container.rb +++ b/lib/fog/rackspace/requests/storage/get_container.rb @@ -28,10 +28,10 @@ module Fog # * 'hash'<~String> - Hash of object (etag?) # * 'last_modified'<~String> - Last modified timestamp # * 'name'<~String> - Name of object - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] 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 6a47d3f36..230500695 100644 --- a/lib/fog/rackspace/requests/storage/get_containers.rb +++ b/lib/fog/rackspace/requests/storage/get_containers.rb @@ -17,10 +17,10 @@ module Fog # * 'bytes'<~Integer>: - Number of bytes used by container # * 'count'<~Integer>: - Number of items in container # * 'name'<~String>: - Name of container - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] 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 33d7458bd..2353e6fcd 100644 --- a/lib/fog/rackspace/requests/storage/get_object.rb +++ b/lib/fog/rackspace/requests/storage/get_object.rb @@ -8,10 +8,10 @@ module Fog # ==== Parameters # * container<~String> - Name of container to look in # * object<~String> - Name of object to look for - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def get_object(container, object, &block) params = {} 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 76222d1c2..a494c8ac7 100644 --- a/lib/fog/rackspace/requests/storage/get_object_https_url.rb +++ b/lib/fog/rackspace/requests/storage/get_object_https_url.rb @@ -14,10 +14,10 @@ module Fog # ==== Returns # * response<~Excon::Response>: # * body<~String> - url for object - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # ==== 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 bde224465..feca53e38 100644 --- a/lib/fog/rackspace/requests/storage/head_container.rb +++ b/lib/fog/rackspace/requests/storage/head_container.rb @@ -13,10 +13,10 @@ module Fog # * headers<~Hash>: # * 'X-Container-Object-Count'<~String> - Count of containers # * 'X-Container-Bytes-Used'<~String> - Bytes used - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] 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 ea2cce585..e29f73e70 100644 --- a/lib/fog/rackspace/requests/storage/head_containers.rb +++ b/lib/fog/rackspace/requests/storage/head_containers.rb @@ -10,10 +10,10 @@ module Fog # * headers<~Hash>: # * 'X-Account-Container-Count'<~String> - Count of containers # * 'X-Account-Bytes-Used'<~String> - Bytes used - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] 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 630bcf644..fdf4a9295 100644 --- a/lib/fog/rackspace/requests/storage/head_object.rb +++ b/lib/fog/rackspace/requests/storage/head_object.rb @@ -8,10 +8,10 @@ module Fog # ==== Parameters # * container<~String> - Name of container to look in # * object<~String> - Name of object to look for - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] 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 df12a1291..e6192a17e 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 @@ -19,10 +19,10 @@ module Fog # # ==== Returns # * response<~Excon::Response> - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] # ==== 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 cc47dfbde..b7b1c94db 100644 --- a/lib/fog/rackspace/requests/storage/put_container.rb +++ b/lib/fog/rackspace/requests/storage/put_container.rb @@ -7,10 +7,10 @@ module Fog # # ==== Parameters # * name<~String> - Name for container, should be < 256 bytes and must not contain '/' - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def put_container(name, options={}) request( :expects => [201, 202], diff --git a/lib/fog/rackspace/requests/storage/put_object.rb b/lib/fog/rackspace/requests/storage/put_object.rb index 68c149c32..dfcc52f4a 100644 --- a/lib/fog/rackspace/requests/storage/put_object.rb +++ b/lib/fog/rackspace/requests/storage/put_object.rb @@ -10,10 +10,10 @@ module Fog # * object<~String> - Name for object # * data<~String|File> - data to upload # * options<~Hash> - config headers for object. Defaults to {}. - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def put_object(container, object, data, options = {}) data = Fog::Storage.parse_data(data) headers = data[:headers].merge!(options) diff --git a/lib/fog/rackspace/requests/storage/put_object_manifest.rb b/lib/fog/rackspace/requests/storage/put_object_manifest.rb index 4215ca36c..024730006 100644 --- a/lib/fog/rackspace/requests/storage/put_object_manifest.rb +++ b/lib/fog/rackspace/requests/storage/put_object_manifest.rb @@ -8,10 +8,10 @@ module Fog # ==== Parameters # * container<~String> - Name for container, should be < 256 bytes and must not contain '/' # * object<~String> - Name for object - # @raise [Fog::Rackspace::Errors::NotFound] - HTTP 404 - # @raise [Fog::Rackspace::Errors::BadRequest] - HTTP 400 - # @raise [Fog::Rackspace::Errors::InternalServerError] - HTTP 500 - # @raise [Fog::Rackspace::Errors::ServiceError] + # @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] def put_object_manifest(container, object) path = "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}" request( From aa2f1065bab62050e64cf4b4a656d1895700be8d Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Mon, 15 Apr 2013 13:21:37 -0500 Subject: [PATCH 3/8] [rackspace|storage] updated storage and cdn services to wrap excon exceptions in the same manner as the other Rackspace services. --- lib/fog/rackspace/cdn.rb | 13 +++++++------ lib/fog/rackspace/storage.rb | 17 +++++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/fog/rackspace/cdn.rb b/lib/fog/rackspace/cdn.rb index e07600f41..a77dde286 100644 --- a/lib/fog/rackspace/cdn.rb +++ b/lib/fog/rackspace/cdn.rb @@ -163,13 +163,14 @@ module Fog :host => endpoint_uri.host, :path => "#{endpoint_uri.path}/#{params[:path]}", })) + rescue Excon::Errors::NotFound => error + raise Fog::Storage::Rackspace::NotFound.slurp(error, region) + rescue Excon::Errors::BadRequest => error + raise Fog::Storage::Rackspace::BadRequest.slurp error + rescue Excon::Errors::InternalServerError => error + raise Fog::Storage::Rackspace::InternalServerError.slurp error rescue Excon::Errors::HTTPStatusError => error - raise case error - when Excon::Errors::NotFound - Fog::Storage::Rackspace::NotFound.slurp(error, region) - else - error - end + raise Fog::Storage::Rackspace::ServiceError.slurp error end if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json} response.body = Fog::JSON.decode(response.body) diff --git a/lib/fog/rackspace/storage.rb b/lib/fog/rackspace/storage.rb index 665ff116e..d01a48750 100644 --- a/lib/fog/rackspace/storage.rb +++ b/lib/fog/rackspace/storage.rb @@ -6,6 +6,10 @@ module Fog class Rackspace < Fog::Service include Fog::Rackspace::Errors + class ServiceError < Fog::Rackspace::Errors::ServiceError; end + class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end + class BadRequest < Fog::Rackspace::Errors::BadRequest; end + requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :rackspace_servicenet, :rackspace_cdn_ssl, :persistent, :rackspace_region recognizes :rackspace_temp_url_key, :rackspace_storage_url, :rackspace_cdn_url @@ -153,13 +157,14 @@ module Fog else # bad credentials raise error end + rescue Excon::Errors::NotFound => error + raise NotFound.slurp(error, region) + rescue Excon::Errors::BadRequest => error + raise BadRequest.slurp error + rescue Excon::Errors::InternalServerError => error + raise InternalServerError.slurp error rescue Excon::Errors::HTTPStatusError => error - raise case error - when Excon::Errors::NotFound - NotFound.slurp(error, region) - else - error - end + raise ServiceError.slurp error end if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json} response.body = Fog::JSON.decode(response.body) From c1a744475e16a6568568044f0da183a854da6190 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Tue, 16 Apr 2013 14:22:40 -0500 Subject: [PATCH 4/8] [rackspace] fixing delete image tests --- tests/rackspace/requests/compute/image_tests.rb | 2 +- tests/rackspace/requests/compute_v2/image_tests.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/rackspace/requests/compute/image_tests.rb b/tests/rackspace/requests/compute/image_tests.rb index 582b894b9..4f486b4ac 100644 --- a/tests/rackspace/requests/compute/image_tests.rb +++ b/tests/rackspace/requests/compute/image_tests.rb @@ -56,7 +56,7 @@ Shindo.tests('Fog::Compute[:rackspace] | image requests', ['rackspace']) do tests('failure') do - tests('#delete_image(0)').raises(Excon::Errors::BadRequest) do + tests('#delete_image(0)').raises(Fog::Compute::Rackspace::NotFound) do @service.delete_image(Fog::Rackspace::MockData::NOT_FOUND_ID) end diff --git a/tests/rackspace/requests/compute_v2/image_tests.rb b/tests/rackspace/requests/compute_v2/image_tests.rb index 1bdba2013..ea3eb5a80 100644 --- a/tests/rackspace/requests/compute_v2/image_tests.rb +++ b/tests/rackspace/requests/compute_v2/image_tests.rb @@ -58,8 +58,8 @@ Shindo.tests('Fog::Compute::RackspaceV2 | image_tests', ['rackspace']) do end tests('failure') do - tests('#delete_image').raises(Excon::Errors::BadRequest) do - Fog::Compute[:rackspace].delete_image(Fog::Rackspace::MockData::NOT_FOUND_ID) + tests('#delete_image').raises(Fog::Compute::RackspaceV2::NotFound) do + service.delete_image(Fog::Rackspace::MockData::NOT_FOUND_ID) end tests('#get_image').raises(Fog::Compute::RackspaceV2::NotFound) do From 39bc3715136fb8d3462749b3dadc72c47cdf1bc4 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Tue, 16 Apr 2013 14:57:34 -0500 Subject: [PATCH 5/8] [rackspace] updated ServiceException to catch JSON decoding exception and display a warning message. --- lib/fog/rackspace.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb index ddf810613..0d2398ba3 100644 --- a/lib/fog/rackspace.rb +++ b/lib/fog/rackspace.rb @@ -29,7 +29,9 @@ module Fog begin data = Fog::JSON.decode(error.response.body) message = data.values.first ? data.values.first['message'] : data['message'] - rescue Fog::JSON::LoadError => e + rescue => e + Fog::Logger.warning("Received exception '#{e}' while decoding>> #{error.response.body}") + message = error.response.body data = error.response.body end end From 9f1050c5c44dd04f8f328123bd036cd371aa20b7 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Tue, 16 Apr 2013 15:01:07 -0500 Subject: [PATCH 6/8] [rackspace|dns] updated DNS service to use Fog::DNS::Rackspace::NotFound exceptions in keeping with the rest of the services. --- lib/fog/rackspace/dns.rb | 3 ++- lib/fog/rackspace/models/dns/records.rb | 2 +- lib/fog/rackspace/models/dns/zones.rb | 2 +- tests/rackspace/requests/dns/dns_tests.rb | 2 +- tests/rackspace/requests/dns/records_tests.rb | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/fog/rackspace/dns.rb b/lib/fog/rackspace/dns.rb index 81b7757d9..ca9ba219d 100644 --- a/lib/fog/rackspace/dns.rb +++ b/lib/fog/rackspace/dns.rb @@ -4,6 +4,7 @@ require 'fog/dns' module Fog module DNS class Rackspace < Fog::Service + include Fog::Rackspace::Errors class CallbackError < Fog::Errors::Error attr_reader :response, :message, :details @@ -118,7 +119,7 @@ module Fog rescue Excon::Errors::Conflict => error raise Fog::Rackspace::Errors::Conflict.slurp error rescue Excon::Errors::NotFound => error - raise Fog::Rackspace::Errors::NotFound.slurp error + raise NotFound.slurp(error, region) rescue Excon::Errors::ServiceUnavailable => error raise Fog::Rackspace::Errors::ServiceUnavailable.slurp error end diff --git a/lib/fog/rackspace/models/dns/records.rb b/lib/fog/rackspace/models/dns/records.rb index f41dc1962..5d37fba51 100644 --- a/lib/fog/rackspace/models/dns/records.rb +++ b/lib/fog/rackspace/models/dns/records.rb @@ -24,7 +24,7 @@ module Fog #nil or empty string will trigger an argument error rescue ArgumentError nil - rescue Fog::Rackspace::Errors::NotFound + rescue Fog::DNS::Rackspace::NotFound nil end diff --git a/lib/fog/rackspace/models/dns/zones.rb b/lib/fog/rackspace/models/dns/zones.rb index 9de234f25..c5fc76a7a 100644 --- a/lib/fog/rackspace/models/dns/zones.rb +++ b/lib/fog/rackspace/models/dns/zones.rb @@ -50,7 +50,7 @@ module Fog data = service.list_domain_details(zone_id).body new(data) - rescue Fog::Rackspace::Errors::NotFound + rescue Fog::DNS::Rackspace::NotFound nil #Accessing a valid (but other customer's) id returns a 503 error rescue Fog::Rackspace::Errors::ServiceUnavailable diff --git a/tests/rackspace/requests/dns/dns_tests.rb b/tests/rackspace/requests/dns/dns_tests.rb index 208961fd3..af8c59563 100644 --- a/tests/rackspace/requests/dns/dns_tests.rb +++ b/tests/rackspace/requests/dns/dns_tests.rb @@ -111,7 +111,7 @@ Shindo.tests('Fog::DNS[:rackspace] | DNS requests', ['rackspace', 'dns']) do Fog::DNS[:rackspace].list_domains :limit => 5, :offset => 8 end - tests('list_domain_details 34335353').raises(Fog::Rackspace::Errors::NotFound) do + tests('list_domain_details 34335353').raises(Fog::DNS::Rackspace::NotFound) do Fog::DNS[:rackspace].list_domain_details 34335353 end diff --git a/tests/rackspace/requests/dns/records_tests.rb b/tests/rackspace/requests/dns/records_tests.rb index ea9bb36d4..d066e312d 100644 --- a/tests/rackspace/requests/dns/records_tests.rb +++ b/tests/rackspace/requests/dns/records_tests.rb @@ -55,7 +55,7 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns'] Fog::DNS[:rackspace].list_records('') end - tests("list_records('abc')").raises(Fog::Rackspace::Errors::NotFound) do + tests("list_records('abc')").raises(Fog::DNS::Rackspace::NotFound) do Fog::DNS[:rackspace].list_records('abc') end @@ -63,7 +63,7 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns'] Fog::DNS[:rackspace].list_record_details(@domain_id, '') end - tests("list_record_details(#{@domain_id}, 'abc')").raises(Fog::Rackspace::Errors::NotFound) do + tests("list_record_details(#{@domain_id}, 'abc')").raises(Fog::DNS::Rackspace::NotFound) do Fog::DNS[:rackspace].list_record_details(@domain_id, 'abc') end @@ -71,7 +71,7 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns'] Fog::DNS[:rackspace].remove_record(@domain_id, '') end - tests("remove_record(#{@domain_id}, 'abc')").raises(Fog::Rackspace::Errors::NotFound) do + tests("remove_record(#{@domain_id}, 'abc')").raises(Fog::DNS::Rackspace::NotFound) do Fog::DNS[:rackspace].remove_record(@domain_id, 'abc') end From a082abf2f8192cf9a308034711ce9ce85594fe24 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Wed, 17 Apr 2013 10:18:47 -0500 Subject: [PATCH 7/8] [rackspace|compute_v2] fixed bug in InvalidStateExceptions --- lib/fog/rackspace/compute_v2.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fog/rackspace/compute_v2.rb b/lib/fog/rackspace/compute_v2.rb index 1b66ff6f1..c9cdf861f 100644 --- a/lib/fog/rackspace/compute_v2.rb +++ b/lib/fog/rackspace/compute_v2.rb @@ -22,13 +22,13 @@ module Fog class InvalidServerStateException < InvalidStateException def to_s - "Server should have transitioned to '#{desired_state}' not '#{state}'" + "Server should have transitioned to '#{desired_state}' not '#{current_state}'" end end class InvalidImageStateException < InvalidStateException def to_s - "Image should have transitioned to '#{desired_state}' not '#{state}'" + "Image should have transitioned to '#{desired_state}' not '#{current_state}'" end end From b747795501e0527a4cd8a5b0a90b4d86decf9490 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Wed, 17 Apr 2013 10:19:07 -0500 Subject: [PATCH 8/8] [rackspace] fixing broken tests --- lib/fog/rackspace/requests/compute/delete_image.rb | 2 +- lib/fog/rackspace/requests/compute_v2/delete_image.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/fog/rackspace/requests/compute/delete_image.rb b/lib/fog/rackspace/requests/compute/delete_image.rb index a91977b3f..2ea4a4562 100644 --- a/lib/fog/rackspace/requests/compute/delete_image.rb +++ b/lib/fog/rackspace/requests/compute/delete_image.rb @@ -34,7 +34,7 @@ module Fog response else response.status = 400 - raise(Excon::Errors.status_error({:expects => 202}, response)) + raise Fog::Compute::Rackspace::NotFound.new end end diff --git a/lib/fog/rackspace/requests/compute_v2/delete_image.rb b/lib/fog/rackspace/requests/compute_v2/delete_image.rb index 495ce3e1b..301d25369 100644 --- a/lib/fog/rackspace/requests/compute_v2/delete_image.rb +++ b/lib/fog/rackspace/requests/compute_v2/delete_image.rb @@ -23,6 +23,7 @@ module Fog class Mock def delete_image(image_id) + raise Fog::Compute::RackspaceV2::NotFound.new if image_id == Fog::Rackspace::MockData::NOT_FOUND_ID response = Excon::Response.new response.status = 202 response.body = ""