fog 1.8.0 → 1.9.0

data/lib/fog/linode/models/compute/stack_scripts.rb

@@ -15,13 +15,13 @@ module Fog
           new stackscripts(id).first
         rescue Fog::Compute::Linode::NotFound
           nil
-        end        
+        end
 
         private
         def stackscripts(id=nil)
-          connection.stackscript_list(id).body['DATA'].map { |script| map_stackscript script }
+          service.stackscript_list(id).body['DATA'].map { |script| map_stackscript script }
         end
-        
+
         def map_stackscript(script)
           script = script.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           script.merge! :id => script[:stackscriptid], :name => script[:label]

data/lib/fog/linode/models/dns/record.rb

@@ -29,7 +29,7 @@ module Fog
 
         def destroy
           requires :identity, :zone
-          connection.domain_resource_delete(zone.id, identity)
+          service.domain_resource_delete(zone.id, identity)
           true
         end
 
@@ -42,25 +42,25 @@ module Fog
           options = {}
           # * options<~Hash>
           #   * weight<~Integer>: default: 5
-          #   * port<~Integer>: default: 80 
-          #   * protocol<~String>: The protocol to append to an SRV record. Ignored on other record 
+          #   * port<~Integer>: default: 80
+          #   * protocol<~String>: The protocol to append to an SRV record. Ignored on other record
           #                        types. default: udp
           options[:name]      = name if name
           options[:priority]  = priority if priority
           options[:target]    = value if value
           options[:ttl_sec]   = ttl if ttl
           response = unless identity
-            connection.domain_resource_create(zone.identity, type, options)
+            service.domain_resource_create(zone.identity, type, options)
           else
             options[:type] = type if type
-            connection.domain_resource_update(zone.identity, identity, options)
+            service.domain_resource_update(zone.identity, identity, options)
           end
           merge_attributes(response.body['DATA'])
           true
         end
 
         private
-        
+
         def zone=(new_zone)
           @zone = new_zone
         end

data/lib/fog/linode/models/dns/records.rb

@@ -13,12 +13,12 @@ module Fog
 
         def all
           requires :zone
-          data = connection.domain_resource_list(zone.id).body['DATA']
+          data = service.domain_resource_list(zone.id).body['DATA']
           load(data)
         end
 
         def get(record_id)
-          if data = connection.domain_resource_list(zone.id, record_id).body['DATA'].first
+          if data = service.domain_resource_list(zone.id, record_id).body['DATA'].first
             new(data)
           else
             nil

data/lib/fog/linode/models/dns/zone.rb

@@ -30,15 +30,15 @@ module Fog
 
         def destroy
           requires :identity
-          connection.domain_delete(identity)
+          service.domain_delete(identity)
           true
         end
 
         def records
           @records ||= begin
             Fog::DNS::Linode::Records.new(
-              :zone       => self,
-              :connection => connection
+              :zone    => self,
+              :service => service
             )
           end
         end
@@ -61,17 +61,17 @@ module Fog
           #   * refresh_sec<~Integer> numeric, default: '0'
           #   * retry_sec<~Integer> numeric, default: '0'
           #   * expire_sec<~Integer> numeric, default: '0'
-          #   * status<~Integer> 0, 1, or 2 (disabled, active, edit mode), default: 1 
+          #   * status<~Integer> 0, 1, or 2 (disabled, active, edit mode), default: 1
           #   * master_ips<~String> When type=slave, the zone's master DNS servers list, semicolon separated
           options[:description] = description if description
           options[:soa_email]   = email if email
           options[:ttl_sec]     = ttl if ttl
           response = unless identity
-            connection.domain_create(domain, type, options)
+            service.domain_create(domain, type, options)
           else
             options[:domain]  = domain if domain
             options[:type]    = type if type
-            connection.domain_update(identity, options)
+            service.domain_update(identity, options)
           end
           merge_attributes(response.body['DATA'])
           true

data/lib/fog/linode/models/dns/zones.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::DNS::Linode::Zone
 
         def all
-          data = connection.domain_list.body['DATA']
+          data = service.domain_list.body['DATA']
           load(data)
         end
 
         def get(zone_id)
-          if data = connection.domain_list(zone_id).body['DATA'].first
+          if data = service.domain_list(zone_id).body['DATA'].first
             new(data)
           else
             nil

data/lib/fog/local/models/storage/directories.rb

@@ -10,8 +10,8 @@ module Fog
         model Fog::Storage::Local::Directory
 
         def all
-          data = Dir.entries(connection.local_root).select do |entry|
-            entry[0...1] != '.' && ::File.directory?(connection.path_to(entry))
+          data = Dir.entries(service.local_root).select do |entry|
+            entry[0...1] != '.' && ::File.directory?(service.path_to(entry))
           end.map do |entry|
             {:key => entry}
           end
@@ -19,7 +19,7 @@ module Fog
         end
 
         def get(key)
-          if ::File.directory?(connection.path_to(key))
+          if ::File.directory?(service.path_to(key))
             new(:key => key)
           else
             nil

data/lib/fog/local/models/storage/directory.rb

@@ -24,7 +24,7 @@ module Fog
           @files ||= begin
             Fog::Storage::Local::Files.new(
               :directory    => self,
-              :connection   => connection
+              :service   => service
             )
           end
         end
@@ -47,7 +47,7 @@ module Fog
         private
 
         def path
-          connection.path_to(key)
+          service.path_to(key)
         end
 
       end

data/lib/fog/local/models/storage/file.rb

@@ -40,8 +40,8 @@ module Fog
 
         def copy(target_directory_key, target_file_key, options={})
           requires :directory, :key
-          connection.copy_object(directory.key, key, target_directory_key, target_file_key)
-          target_directory = connection.directories.new(:key => target_directory_key)
+          service.copy_object(directory.key, key, target_directory_key, target_file_key)
+          target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
         end
 
@@ -55,7 +55,7 @@ module Fog
               next
             end
             # don't delete the containing directory or higher
-            if dir_path == connection.path_to(directory.key)
+            if dir_path == service.path_to(directory.key)
               break
             end
             pwd = Dir.pwd
@@ -77,11 +77,11 @@ module Fog
         def public_url
           requires :directory, :key
 
-          if connection.endpoint
+          if service.endpoint
             escaped_directory = URI.escape(directory.key)
             escaped_key = URI.escape(key)
 
-            ::File.join(connection.endpoint, escaped_directory, escaped_key)
+            ::File.join(service.endpoint, escaped_directory, escaped_key)
           else
             nil
           end
@@ -121,7 +121,7 @@ module Fog
         end
 
         def path
-          connection.path_to(::File.join(directory.key, key))
+          service.path_to(::File.join(directory.key, key))
         end
 
       end

data/lib/fog/local/models/storage/files.rb

@@ -15,7 +15,7 @@ module Fog
           requires :directory
           if directory.collection.get(directory.key)
             pwd = Dir.pwd
-            Dir.chdir(connection.path_to(directory.key))
+            Dir.chdir(service.path_to(directory.key))
             data = Dir.glob('**/*').reject do |file|
               ::File.directory?(file)
             end.map do |key|
@@ -78,7 +78,7 @@ module Fog
         private
 
         def file_path(key)
-          connection.path_to(::File.join(directory.key, key))
+          service.path_to(::File.join(directory.key, key))
         end
 
       end

data/lib/fog/ninefold/models/compute/address.rb

@@ -35,19 +35,19 @@ module Fog
 
         def destroy
           requires :identity
-          self.jobid = extract_job_id(connection.disassociate_ip_address(:id => identity))
+          self.jobid = extract_job_id(service.disassociate_ip_address(:id => identity))
           true
         end
 
         def enable_static_nat(server)
           server.kind_of?(Integer) ? serverid = server : serverid = server.identity
-          res = connection.enable_static_nat(:virtualmachineid => serverid, :ipaddressid => identity)
+          res = service.enable_static_nat(:virtualmachineid => serverid, :ipaddressid => identity)
           reload
           to_boolean(res['success'])
         end
 
         def disable_static_nat()
-          self.jobid = extract_job_id(connection.disable_static_nat(:ipaddressid => identity))
+          self.jobid = extract_job_id(service.disable_static_nat(:ipaddressid => identity))
           true
         end
 
@@ -59,7 +59,7 @@ module Fog
         end
 
         def ready?
-          if jobid && connection.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
+          if jobid && service.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
             false
           else # No running job, we are ready. Refresh data.
             reload
@@ -77,7 +77,7 @@ module Fog
             :account => account,
             :domainid => domainid
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.associate_ip_address(options)
+          data = service.associate_ip_address(options)
           merge_attributes(data)
           true
         end

data/lib/fog/ninefold/models/compute/addresses.rb

@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ninefold::Address
 
         def all
-          data = connection.list_public_ip_addresses
+          data = service.list_public_ip_addresses
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.list_public_ip_addresses(:id => identifier)
+          data = service.list_public_ip_addresses(:id => identifier)
           if data.empty?
             nil
           else

data/lib/fog/ninefold/models/compute/flavors.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ninefold::Flavor
 
         def all
-          data = connection.list_service_offerings
+          data = service.list_service_offerings
           load(data)
         end
 
         def get(identifier)
-          data = connection.list_service_offerings(:id => identifier)
+          data = service.list_service_offerings(:id => identifier)
           if data.empty?
             nil
           else

data/lib/fog/ninefold/models/compute/images.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ninefold::Image
 
         def all(offering = 'executable')
-          data = connection.list_templates(:templatefilter => offering)
+          data = service.list_templates(:templatefilter => offering)
           load(data)
         end
 
         def get(identifier, offering = 'executable')
-          data = connection.list_templates(:templatefilter => offering, :id => identifier)
+          data = service.list_templates(:templatefilter => offering, :id => identifier)
           if data.empty?
             nil
           else

data/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb

@@ -25,12 +25,12 @@ module Fog
 
         def destroy
           requires :identity
-          self.jobid = extract_job_id(connection.delete_ip_forwarding_rule(:id => identity))
+          self.jobid = extract_job_id(service.delete_ip_forwarding_rule(:id => identity))
           true
         end
 
         def ready?
-          if jobid && connection.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
+          if jobid && service.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
             false
           else # No running job, we are ready. Refresh data.
             reload
@@ -58,7 +58,7 @@ module Fog
             :startport => startport,
             :endport => endport
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_ip_forwarding_rule(options)
+          data = service.create_ip_forwarding_rule(options)
           merge_attributes(data)
           true
         end

data/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb

@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ninefold::IpForwardingRule
 
         def all
-          data = connection.list_ip_forwarding_rules
+          data = service.list_ip_forwarding_rules
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.list_ip_forwarding_rules(:id => identifier)
+          data = service.list_ip_forwarding_rules(:id => identifier)
           if data.empty?
             nil
           else

data/lib/fog/ninefold/models/compute/server.rb

@@ -82,43 +82,43 @@ module Fog
 
         def reboot
           requires :identity
-          self.jobid = extract_job_id(connection.reboot_virtual_machine(:id => identity))
+          self.jobid = extract_job_id(service.reboot_virtual_machine(:id => identity))
           puts "jobid: " + jobid.to_s
           true
         end
 
         def start
           requires :identity
-          self.jobid = extract_job_id(connection.start_virtual_machine(:id => identity))
+          self.jobid = extract_job_id(service.start_virtual_machine(:id => identity))
           true
         end
 
         def stop
           requires :identity
-          self.jobid = extract_job_id(connection.stop_virtual_machine(:id => identity))
+          self.jobid = extract_job_id(service.stop_virtual_machine(:id => identity))
           true
         end
 
         def destroy
           requires :identity
-          self.jobid = extract_job_id(connection.destroy_virtual_machine(:id => identity))
+          self.jobid = extract_job_id(service.destroy_virtual_machine(:id => identity))
           true
         end
 
         def flavor
           requires :flavor_id
-          connection.flavors.get(flavor_id)
+          service.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
         end
 
         def ready?
           if jobid
             # we do this by polling the last job id status.
-            res = connection.query_async_job_result(:jobid => jobid)
+            res = service.query_async_job_result(:jobid => jobid)
             if res['jobstatus'] == 0
               false
             else
@@ -138,7 +138,7 @@ module Fog
 
           unless networkids
             # No network specified, use first in this zone.
-            networks = connection.list_networks(:zoneid => zoneid)
+            networks = service.list_networks(:zoneid => zoneid)
             if networks.empty?
               raise "No networks. Please create one, or specify a network ID"
             else
@@ -164,7 +164,7 @@ module Fog
             :size => size,
             :userdata => userdata
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.deploy_virtual_machine(options)
+          data = service.deploy_virtual_machine(options)
           merge_attributes(data)
           true
         end

data/lib/fog/ninefold/models/compute/servers.rb

@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ninefold::Server
 
         def all
-          data = connection.list_virtual_machines
+          data = service.list_virtual_machines
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.list_virtual_machines(:id => identifier)
+          data = service.list_virtual_machines(:id => identifier)
           if data.empty?
             nil
           else

data/lib/fog/openstack.rb

@@ -15,6 +15,9 @@ module Fog
           else
             data = Fog::JSON.decode(error.response.body)
             message = data['message']
+            if message.nil? and !data.values.first.nil?
+              message = data.values.first['message']
+            end
           end
 
           new_error = super(error, message)
@@ -23,9 +26,6 @@ module Fog
         end
       end
 
-      class InternalServerError < ServiceError; end
-      class Conflict < ServiceError; end
-      class NotFound < ServiceError; end
       class ServiceUnavailable < ServiceError; end
 
       class BadRequest < ServiceError
@@ -33,8 +33,8 @@ module Fog
 
         def self.slurp(error)
           new_error = super(error)
-          unless new_error.response_data.nil?
-            new_error.instance_variable_set(:@validation_errors, new_error.response_data['validationErrors'])
+          unless new_error.response_data.nil? or new_error.response_data['badRequest'].nil?
+            new_error.instance_variable_set(:@validation_errors, new_error.response_data['badRequest']['validationErrors'])
           end
           new_error
         end
@@ -74,15 +74,15 @@ module Fog
     def self.authenticate_v2(options, connection_options = {})
       uri                   = options[:openstack_auth_uri]
       tenant_name           = options[:openstack_tenant]
+      service_type          = options[:openstack_service_type]
       service_name          = options[:openstack_service_name]
-      identity_service_name = options[:openstack_identity_service_name]
+      identity_service_type = options[:openstack_identity_service_type]
       endpoint_type         = (options[:openstack_endpoint_type] || 'publicURL').to_s
       openstack_region      = options[:openstack_region]
 
 
       body = retrieve_tokens_v2(options, connection_options)
-      service = body['access']['serviceCatalog'].
-        detect {|s| service_name.include?(s['type']) }
+      service = get_service(body, service_type, service_name)
 
       options[:unscoped_token] = body['access']['token']['id']
 
@@ -100,28 +100,43 @@ module Fog
 
           body = Fog::JSON.decode(response.body)
           if body['tenants'].empty?
-            raise Errors::NotFound.new('No Tenant Found')
+            raise Fog::Errors::NotFound.new('No Tenant Found')
           else
             options[:openstack_tenant] = body['tenants'].first['name']
           end
         end
 
         body = retrieve_tokens_v2(options, connection_options)
-        service = body['access']['serviceCatalog'].
-          detect{|s| service_name.include?(s['type']) }
+        service = get_service(body, service_type, service_name)
+
       end
 
       service['endpoints'] = service['endpoints'].select do |endpoint|
         endpoint['region'] == openstack_region
       end if openstack_region
 
+      if service['endpoints'].empty?
+        raise Errors::NotFound.new("No endpoints available for region '#{openstack_region}'")
+      end if openstack_region
+
+      unless service
+        available = body['access']['serviceCatalog'].map { |endpoint|
+          endpoint['type']
+        }.sort.join ', '
+
+        missing = service_type.join ', '
+
+        message = "Could not find service #{missing}.  Have #{available}"
+
+        raise Fog::Errors::NotFound, message
+      end
+
       if service['endpoints'].count > 1
         regions = service["endpoints"].map{ |e| e['region'] }.uniq.join(',')
-        raise Errors::NotFound.new("Multiple regions available choose one of these '#{regions}'")
+        raise Fog::Errors::NotFound.new("Multiple regions available choose one of these '#{regions}'")
       end
 
-      identity_service = body['access']['serviceCatalog'].
-        detect{|x| identity_service_name.include?(x['type']) } if identity_service_name
+      identity_service = get_service(body, identity_service_type) if identity_service_type
       tenant = body['access']['token']['tenant']
       user = body['access']['user']
 
@@ -138,6 +153,17 @@ module Fog
         :current_user_id          => body['access']['user']['id'],
         :unscoped_token           => options[:unscoped_token]
       }
+
+    end
+
+    def self.get_service(body, service_type=[], service_name=nil)
+      body['access']['serviceCatalog'].detect do |s|
+        if service_name.nil? or service_name.empty?
+          service_type.include?(s['type'])
+        else
+          service_type.include?(s['type']) and s['name'] == service_name
+        end
+      end
     end
 
     def self.retrieve_tokens_v2(options, connection_options = {})