fog-ecloud 0.2.0 → 0.3.0

data/Rakefile

@@ -8,11 +8,13 @@ Rake::TestTask.new do |t|
 end
 
 namespace :test do
-  mock = ENV['FOG_MOCK'] || 'true'
-  task :travis do
-    sh("export FOG_MOCK=#{mock} && bundle exec shindont")
+  task :mock do
+    sh("export FOG_MOCK=true && bundle exec shindont -livespec")
+  end
+  task :livespec do
+    sh("export FOG_MOCK=false && bundle exec shindont +livespec")
   end
 end
 
 desc 'Default Task'
-task :default => [ :test, 'test:travis' ]
+task :default => [ :test, 'test:mock', 'test:livespec' ]

data/lib/fog/compute/ecloud.rb

@@ -1,5 +1,6 @@
 require File.expand_path("../ecloud/models/model", __FILE__)
 require File.expand_path("../ecloud/models/collection", __FILE__)
+require File.expand_path("../ecloud/errors", __FILE__)
 
 module Fog
   module Compute
@@ -268,6 +269,9 @@ module Fog
 
       class Real
         include Shared
+        include Errors
+
+        class Fog::Compute::Ecloud::ServiceError < Fog::Ecloud::Errors::ServiceError; end
 
         class << self
           def basic_request(name, expects = [200], method = :get, headers = {}, body = "")
@@ -335,7 +339,13 @@ module Fog
           unless params[:body].nil? || params[:body].empty?
             options.merge!(:body => params[:body])
           end
-          response = @connections[host_url].request(options)
+
+          begin
+            response = @connections[host_url].request(options)
+          rescue Excon::Errors::Error => error
+            raise ServiceError.slurp(error)
+          end
+
           # Parse the response body into a hash
           unless response.body.empty?
             if params[:parse]
@@ -387,7 +397,7 @@ module Fog
         end
 
         def cloud_api_signature(params)
-          verb = params[:method].upcase
+          verb = params[:method].to_s.upcase
           headers = params[:headers]
           path = params[:uri].path
           canonicalized_headers = canonicalize_headers(headers)
@@ -426,6 +436,9 @@ module Fog
 
       class Mock
         include Shared
+        include Errors
+
+        class Fog::Compute::Ecloud::ServiceError < Fog::Ecloud::Errors::ServiceError; end
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -828,7 +841,9 @@ module Fog
 
           response = Excon::Response.new(:body => body, :headers => headers, :status => status)
           if params.key?(:expects) && ![*params[:expects]].include?(response.status)
-            raise(Excon::Errors.status_error(params, response))
+            e = Excon::Errors::NotFound.new("Expected([200]) <=> Actual(404 Not Found)", "404", response)
+            raise ServiceError.slurp(e)
+
           else response
           end
         end

data/lib/fog/compute/ecloud/errors.rb

@@ -0,0 +1,91 @@
+module Fog
+  module Ecloud
+    # Custom errors specific to our implementation
+    module Errors
+      # The parent class for all errors in the Fog::Compute::Ecloud module.
+      class ServiceError < Fog::Errors::Error
+        # @!attribute [r] response_data
+        #   @return [string] the response from the HTTP request
+
+        # @!attribute [r] status_code
+        #   @return [Integer] the HTTP status code returned
+        attr_reader :response_data, :status_code, :minor_error_code
+
+        # Make the HTTP status code pretty
+        #
+        # @return [String] the cleaned up status code
+        def to_s
+          status = status_code ? "HTTP #{status_code}" : "HTTP <Unknown>"
+          minor_code = minor_error_code ? minor_error_code : "Unknown"
+          "[#{status} - #{minor_code}] #{super}"
+        end
+
+        # Parse the response from the HTTP request to create a user friendly
+        #   message, including HTTP response code and error message (if any)
+        #
+        # @param [Object] error the error object from the rescue block
+        #
+        # @return [Object] the new error object
+        def self.slurp(error)
+          data = nil
+          message = nil
+          status_code = nil
+          minor_code = nil
+
+          if error.response
+            status_code = error.response.status
+            unless error.response.body.empty?
+              begin
+                document = Fog::ToHashDocument.new
+                parser = Nokogiri::XML::SAX::PushParser.new(document)
+                parser << error.response.body
+                parser.finish
+
+                data = document.body
+
+                message = extract_message(data)
+                minor_code = extract_minor_code(data)
+
+              rescue => e
+                Fog::Logger.warning("Received exception '#{e}' while decoding: #{error.response.body}")
+                message = error.response.body
+                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(:@minor_error_code, minor_code)
+          new_error
+        end
+
+        # Parse the response body for an error message
+        #
+        # @param [Hash] data the decoded XML response
+        #
+        # @return [String] the error message, if found, otherwise the raw data
+        def self.extract_message(data)
+          if data.is_a?(Hash)
+            message = data[:message]
+          end
+          message || data.inspect
+        end
+
+        # Parse the response body for the minor error code
+        #
+        # @param [Hash] data the decoded XML response
+        #
+        # @return [String] the error minor error code, if found, otherwise nil
+        def self.extract_minor_code(data)
+          minor_code = nil
+          if data.is_a?(Hash)
+            minor_code = data[:minorErrorCode]
+          end
+          minor_code
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/ecloud/models/admin_organizations.rb

@@ -12,7 +12,8 @@ module Fog
           if data = service.get_admin_organization(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/api_keys.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_api_key(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/associations.rb

@@ -25,7 +25,8 @@ module Fog
           if data = service.get_association(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/authentication_levels.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_authentication_level(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/backup_internet_services.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_backup_internet_service(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
 

data/lib/fog/compute/ecloud/models/catalog.rb

@@ -9,7 +9,7 @@ module Fog
         model Fog::Compute::Ecloud::CatalogItem
 
         def all
-          data = service.get_catalog(href).body#[:Locations][:Location][:Catalog][:CatalogEntry]
+          data = service.get_catalog(href).body # [:Locations][:Location][:Catalog][:CatalogEntry]
           if data[:Locations][:Location].is_a?(Hash)
             data = [] if data[:Locations][:Location][:Catalog].is_a?(String) && data[:Locations][:Location][:Catalog].empty?
             load(data)
@@ -30,7 +30,8 @@ module Fog
           if data = service.get_catalog_item(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/catalog_configurations.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_catalog_configuration(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/compute_pools.rb

@@ -20,7 +20,8 @@ module Fog
           if data = service.get_compute_pool(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
 

data/lib/fog/compute/ecloud/models/cpu_usage_detail_summary.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_cpu_usage_detail(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/detached_disks.rb

@@ -10,14 +10,15 @@ module Fog
 
         def all
           data = service.get_detached_disks(href).body[:DetachedDisk]
-					data = [] if data.nil?
+          data = [] if data.nil?
           load(data)
         end
 
         def get(uri)
           data = service.get_detached_disk(uri).body
           new(data)
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/environments.rb

@@ -38,7 +38,8 @@ module Fog
           if data = service.get_environment(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
 

data/lib/fog/compute/ecloud/models/firewall_acls.rb

@@ -18,7 +18,8 @@ module Fog
           if data = service.get_firewall_acl(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/groups.rb

@@ -29,7 +29,8 @@ module Fog
           else
             new(data)
           end
-        rescue Excon::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/guest_processes.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_guest_process(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/hardware_configurations.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_hardware_configuration(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/internet_services.rb

@@ -20,19 +20,20 @@ module Fog
         def get(uri)
           data = service.get_internet_service(uri).body
           new(data)
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
 
         def create(options)
           options[:uri] = "#{service.base_path}/internetServices/publicIps/#{public_ip_id}/action/createInternetService"
-          options[:protocol]           ||= "TCP"
-          options[:enabled]            ||= true
-          options[:description]        ||= ""
-          options[:persistence]        ||= {}
+          options[:protocol] ||= "TCP"
+          options[:enabled] ||= true
+          options[:description] ||= ""
+          options[:persistence] ||= {}
           options[:persistence][:type] ||= "None"
           data = service.internet_service_create(options).body
-          object = new(data)
+          new(data)
         end
 
         def public_ip_id

data/lib/fog/compute/ecloud/models/ip_addresses.rb

@@ -23,7 +23,8 @@ module Fog
           if data = service.get_ip_address(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/layouts.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_layout(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/locations.rb

@@ -19,7 +19,8 @@ module Fog
           if data = service.get_location(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/login_banners.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_login_banner(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/memory_usage_detail_summary.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_memory_usage_detail(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/monitors.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_monitor(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
 

data/lib/fog/compute/ecloud/models/networks.rb

@@ -9,7 +9,7 @@ module Fog
         model Fog::Compute::Ecloud::Network
 
         def all
-          body = service.get_networks(self.href).body
+          body = service.get_networks(href).body
           body = body[:Networks] ? body[:Networks][:Network] : body[:Network]
           data = case body
                  when NilClass then []
@@ -23,7 +23,8 @@ module Fog
           if data = service.get_network(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end