fog 1.33.0 → 1.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54e5d06378a8bcb46784753de3c7fa8f8252e196
-  data.tar.gz: f3b2c0a9ae87d177341e3eff3b291a8e832eae02
+  metadata.gz: c821b9ebefd673f9820e7ae4f41afa5add225538
+  data.tar.gz: 1432597d1fa4695ea327825276f2720a2d460036
 SHA512:
-  metadata.gz: 155cc3a6c109f0b7097c0a0a9576c77377b188c37b62137f0b17110659926695db1d8120765c55f75188a1dfef012ac62bc8bdaf5cf059451cb14551afbbe771
-  data.tar.gz: 9354b948a15c1b36c53b18b34f6abb74a01aad171494885dbd8f8f961432803f66b5a879ccb2de87d035365b435436fd29db5961a86153079cd7a654d765113b
+  metadata.gz: 2afc927bafda27b29fffb39f59ffeb25f6e0a04cd5bbbba091c10b8fb44d997611b86a9e188103343a3821f5660daccc497220710646a39fc01b6ca38f669b15
+  data.tar.gz: 667d372ed314968334671ae4569c934236610958dc2e54717dd02d14c212eb8c3e5553500e795d77493723c66a4385fdace66bb06a4abf4602a0baa542bab683

data/CHANGELOG.md

@@ -1,3 +1,50 @@
+## 1.34.0 09/03/2015
+*Hash* 23467f391cbc9d8d3262da33cec533f8b8e80cee
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Downloads     | 11446261
+Forks         | 1472
+Open Issues   | 82
+Watchers      | 3594
+
+**MVP!** Oleg Vivtash
+
+#### [Brightbox]
+*   Remove provider specific tests. thanks Paul Thornthwaite
+
+#### [OpenStack]
+*   Enable list_snapshots_detailed request. thanks Greg Blomquist
+
+#### [misc]
+*   Adding #get_by_id for Fog::Compute::VcloudDirector::VmCustomizations. thanks Adam Leff
+*   Fix attach router to also use port id if passed. thanks Andrew Battye
+*   When getting a v3 identity service from the catalog, make sure the path includes /v3. thanks Darren Hague
+*   Fix issue #3662 - copy openstack_identity_endpoint option to @openstack_identity_public_endpoint. thanks Darren Hague
+*   Extract dynect bin from fog to fog-dynect. thanks Glenn Pratt
+*   Fix deprecated call to security_groups. thanks Greg Blomquist
+*   Fix deprecated call to resources. thanks Greg Blomquist
+*   Cloud Director supports multiple peer subnets. thanks Josh Myers
+*   Openstack missing passing of unscoped_token. thanks Ladislav Smola
+*   Allow Rackspace-specific options for get_object_https_url. thanks Oleg Vivtash
+*   Code prettified. thanks Oleg Vivtash
+*   Ruby187 hash syntax. thanks Oleg Vivtash
+*   Fog::Storage[:rackspace] object requests test update. thanks Oleg Vivtash
+*   Fog::Storage[:rackspace] object requests test cleanup. thanks Oleg Vivtash
+*   relax dependency for fog-ecloud. thanks Praveen Arimbrathodiyil
+*   support allowed address pairs. thanks pyama86
+*   style. thanks pyama86
+*   api path set. thanks pyama86
+
+#### [openstack]
+*   allow auth_token attribute to be written to. thanks Darren Hague
+*   align recognized parameters, move common things among services into openstack core. thanks Maurice Schreiber
+*   undo premature move of identity_service_type: default value does no good. thanks Maurice Schreiber
+*   orchestration: add missing collection requires, path variable already contains tenant_id. thanks Maurice Schreiber
+*   core: fix wrong merge in 3b129ab9b2eac1cddc3fa680c88f436a6a853474. thanks Maurice Schreiber
+
+
 ## 1.33.0 08/12/2015
 *Hash* 514fb792da07e6c5beaf4b735ea944fa873483f0
 

data/Rakefile

@@ -81,6 +81,9 @@ namespace :test do
   task :openstack do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openstack")
   end
+  task :rackspace do
+      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/rackspace")
+  end
   task :cloudstack do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/cloudstack")
   end

data/fog.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = "fog"
-  s.version           = "1.33.0"
-  s.date              = "2015-08-12"
+  s.version           = "1.34.0"
+  s.date              = "2015-09-03"
   s.rubyforge_project = "fog"
 
   ## Make sure your summary is short. The description may be as long
@@ -55,8 +55,8 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-atmos")
   s.add_dependency("fog-aws", ">= 0.6.0")
   s.add_dependency("fog-brightbox", "~> 0.4")
-  s.add_dependency("fog-dynect")
-  s.add_dependency("fog-ecloud", "= 0.1.1")
+  s.add_dependency("fog-dynect", "~> 0.0.2")
+  s.add_dependency("fog-ecloud", "~> 0.1")
   s.add_dependency("fog-google", ">= 0.0.2")
   s.add_dependency("fog-local")
   s.add_dependency("fog-powerdns", ">= 0.1.1")

data/lib/fog/openstack/baremetal.rb

@@ -6,10 +6,15 @@ module Fog
       SUPPORTED_VERSIONS = /(.)*/
 
       requires :openstack_auth_url
-      recognizes :openstack_auth_token, :openstack_management_url, :persistent,
-                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
-                 :openstack_api_key, :openstack_username,
-                 :current_user, :current_tenant, :openstack_endpoint_type, :openstack_region
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant, :openstack_tenant_id,
+                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
+                 :current_user, :current_tenant, :openstack_region,
+                 :openstack_endpoint_type,
+                 :openstack_project_name, :openstack_project_id,
+                 :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
+                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
 
       ## MODELS
       #
@@ -241,55 +246,29 @@ module Fog
       end
 
       class Real
-        attr_reader :current_user
-        attr_reader :current_tenant
+        include Fog::OpenStack::Core
 
         def initialize(options={})
-          @openstack_auth_token = options[:openstack_auth_token]
+          initialize_identity options
 
-          unless @openstack_auth_token
-            missing_credentials = Array.new
-            @openstack_api_key  = options[:openstack_api_key]
-            @openstack_username = options[:openstack_username]
-
-            missing_credentials << :openstack_api_key  unless @openstack_api_key
-            missing_credentials << :openstack_username unless @openstack_username
-            raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
-          end
-
-          @openstack_tenant               = options[:openstack_tenant]
-          @openstack_auth_uri             = URI.parse(options[:openstack_auth_url])
-          @openstack_management_url       = options[:openstack_management_url]
-          @openstack_must_reauthenticate  = false
-          @openstack_service_type         = options[:openstack_service_type] || ['baremetal']
-          @openstack_service_name         = options[:openstack_service_name]
-          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'adminURL'
-          @openstack_region               = options[:openstack_region]
+          @openstack_service_type  = options[:openstack_service_type] || ['baremetal']
+          @openstack_service_name  = options[:openstack_service_name]
 
           @connection_options = options[:connection_options] || {}
 
-          @current_user = options[:current_user]
-          @current_tenant = options[:current_tenant]
-
           authenticate
 
+          unless @path.match(SUPPORTED_VERSIONS)
+            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
+                                                               @openstack_management_uri,
+                                                               @auth_token,
+                                                               @connection_options)
+          end
+
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
-        def credentials
-          { :provider                 => 'openstack',
-            :openstack_auth_url       => @openstack_auth_uri.to_s,
-            :openstack_auth_token     => @auth_token,
-            :openstack_management_url => @openstack_management_url,
-            :current_user             => @current_user,
-            :current_tenant           => @current_tenant }
-        end
-
-        def reload
-          @connection.reset
-        end
-
         def request(params)
           begin
             response = @connection.request(params.merge({
@@ -323,47 +302,6 @@ module Fog
 
         private
 
-        def authenticate
-          if !@openstack_management_url || @openstack_must_reauthenticate
-            options = {
-              :openstack_tenant   => @openstack_tenant,
-              :openstack_api_key  => @openstack_api_key,
-              :openstack_username => @openstack_username,
-              :openstack_auth_uri => @openstack_auth_uri,
-              :openstack_region   => @openstack_region,
-              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
-              :openstack_service_type => @openstack_service_type,
-              :openstack_service_name => @openstack_service_name,
-              :openstack_endpoint_type => @openstack_endpoint_type
-            }
-
-            credentials = Fog::OpenStack.authenticate(options, @connection_options)
-
-            @current_user = credentials[:user]
-            @current_tenant = credentials[:tenant]
-
-            @openstack_must_reauthenticate = false
-            @auth_token = credentials[:token]
-            @openstack_management_url = credentials[:server_management_url]
-            uri = URI.parse(@openstack_management_url)
-          else
-            @auth_token = @openstack_auth_token
-            uri = URI.parse(@openstack_management_url)
-          end
-
-          @host   = uri.host
-          @path   = uri.path
-          @path.sub!(/\/$/, '')
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
-                                                               uri,
-                                                               @auth_token,
-                                                               @connection_options)
-          end
-          @port   = uri.port
-          @scheme = uri.scheme
-          true
-        end
       end
     end
   end

data/lib/fog/openstack/compute.rb

@@ -327,28 +327,27 @@ module Fog
       end
 
       class Real
-
         include Fog::OpenStack::Core
 
         def initialize(options={})
           initialize_identity options
 
           @openstack_identity_service_type = options[:openstack_identity_service_type] || 'identity'
-          @openstack_service_type  = options[:openstack_service_type] || ['nova', 'compute']
-          @openstack_service_name  = options[:openstack_service_name]
-
-          @connection_options = options[:connection_options] || {}
 
-          authenticate_compute
+          @openstack_service_type   = options[:openstack_service_type] || ['nova', 'compute']
+          @openstack_service_name   = options[:openstack_service_name]
 
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
+          @connection_options       = options[:connection_options] || {}
 
+          authenticate
 
+          unless @path.match(/1\.1|v2/)
+            raise Fog::OpenStack::Errors::ServiceUnavailable.new(
+                    "OpenStack compute binding only supports version 2 (a.k.a. 1.1)")
+          end
 
-        def reload
-          @connection.reset
+          @persistent = options[:persistent] || false
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def request(params)
@@ -365,7 +364,7 @@ module Fog
           rescue Excon::Errors::Unauthorized => error
             if error.response.body != 'Bad username or password' # token expiration
               @openstack_must_reauthenticate = true
-              authenticate_compute
+              authenticate
               retry
             else # Bad Credentials
               raise error
@@ -388,28 +387,6 @@ module Fog
 
         private
 
-        def authenticate_compute
-          authenticate
-
-          uri = URI.parse(@openstack_management_url)
-          @host   = uri.host
-          @path   = uri.path
-
-          @path.sub!(/\/$/, '')
-          unless @path.match(/1\.1|v2/)
-            raise Fog::OpenStack::Errors::ServiceUnavailable.new(
-                    "OpenStack compute binding only supports version 2 (a.k.a. 1.1)")
-          end
-
-          # Not all implementations have identity service in the catalog
-          if @openstack_identity_public_endpoint || @openstack_management_url
-            @identity_connection = Fog::Core::Connection.new(
-              @openstack_identity_public_endpoint || @openstack_management_url,
-              false, @connection_options)
-          end
-
-          true
-        end
       end
     end
   end

data/lib/fog/openstack/core.rb

@@ -56,7 +56,7 @@ module Fog
     service(:planning,      'Planning')
 
     module Core
-      attr_reader :auth_token
+      attr_accessor :auth_token
       attr_reader :auth_token_expiration
       attr_reader :current_user
       attr_reader :current_user_id
@@ -75,6 +75,7 @@ module Fog
         end
 
         @auth_token        ||= options[:openstack_auth_token]
+        @openstack_identity_public_endpoint = options[:openstack_identity_endpoint]
 
         @openstack_auth_uri    = URI.parse(options[:openstack_auth_url])
         @openstack_must_reauthenticate  = false
@@ -97,16 +98,22 @@ module Fog
       end
 
       def credentials
-        options =  { :provider => 'openstack',
-          :openstack_auth_url       => @openstack_auth_uri.to_s,
-          :openstack_auth_token     => @auth_token,
+        options =  {
+          :provider                    => 'openstack',
+          :openstack_auth_url          => @openstack_auth_uri.to_s,
+          :openstack_auth_token        => @auth_token,
           :openstack_identity_endpoint => @openstack_identity_public_endpoint,
-          :current_user             => @current_user,
-          :current_user_id          => @current_user_id,
-          :current_tenant           => @current_tenant }
+          :current_user                => @current_user,
+          :current_user_id             => @current_user_id,
+          :current_tenant              => @current_tenant,
+          :unscoped_token              => @unscoped_token}
         openstack_options.merge options
       end
 
+      def reload
+        @connection.reset
+      end
+
       private
 
       def openstack_options
@@ -135,6 +142,7 @@ module Fog
           @openstack_must_reauthenticate = false
           @auth_token = credentials[:token]
           @openstack_management_url = credentials[:server_management_url]
+          @unscoped_token = credentials[:unscoped_token]
         else
           @auth_token = @openstack_auth_token
         end
@@ -142,8 +150,17 @@ module Fog
 
         @host   = @openstack_management_uri.host
         @path   = @openstack_management_uri.path
+        @path.sub!(/\/$/, '')
         @port   = @openstack_management_uri.port
         @scheme = @openstack_management_uri.scheme
+
+        # Not all implementations have identity service in the catalog
+        if @openstack_identity_public_endpoint || @openstack_management_url
+          @identity_connection = Fog::Core::Connection.new(
+            @openstack_identity_public_endpoint || @openstack_management_url,
+            false, @connection_options)
+        end
+
         true
       end
     end
@@ -342,7 +359,7 @@ module Fog
         raise Fog::Errors::NotFound.new("Multiple regions available choose one of these '#{regions.join(',')}'")
       end
 
-      identity_service = get_service_v3(body, identity_service_type) if identity_service_type
+      identity_service = get_service_v3(body, identity_service_type, nil, nil, :endpoint_path_matches => /\/v3/) if identity_service_type
 
       management_url = service['endpoints'].find { |e| e['interface']==endpoint_type }['url']
       identity_url = identity_service['endpoints'].find { |e| e['interface']=='public' }['url'] if identity_service
@@ -502,8 +519,9 @@ module Fog
       [response.headers["X-Subject-Token"], Fog::JSON.decode(response.body)]
     end
 
-    def self.get_service_v3(hash, service_type=[], service_name=nil, region=nil)
+    def self.get_service_v3(hash, service_type=[], service_name=nil, region=nil, options={})
 
+      # Find all services matching any of the types in service_type, filtered by service_name if it's non-nil
       services = hash['token']['catalog'].find_all do |s|
         if service_name.nil? or service_name.empty?
           service_type.include?(s['type'])
@@ -512,12 +530,21 @@ module Fog
         end
       end if hash['token']['catalog']
 
+      # Filter the found services by region (if specified) and whether the endpoint path matches the given regex (e.g. /\/v3/)
       services.find do |s|
-        region.nil? or s['endpoints'].any? { |ep| ep['region'] == region }
+        s['endpoints'].any? { |ep| endpoint_region?(ep, region) && endpoint_path_match?(ep, options[:endpoint_path_matches])}
       end if services
 
     end
 
+    def self.endpoint_region?(endpoint, region)
+      region.nil? || endpoint['region'] == region
+    end
+
+    def self.endpoint_path_match?(endpoint, match_regex)
+      match_regex.nil? || URI(endpoint['url']).path =~ match_regex
+    end
+
     def self.get_supported_version(supported_versions, uri, auth_token, connection_options = {})
       connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options)
       response = connection.request({

data/lib/fog/openstack/identity.rb

@@ -22,53 +22,42 @@ module Fog
       end
 
       module Common
-
-        def authenticate
-          if !@openstack_management_url || @openstack_must_reauthenticate
-            options = {
-                :openstack_api_key => @openstack_api_key,
-                :openstack_username => @openstack_username,
-                :openstack_userid => @openstack_userid,
-                :openstack_domain_name => @openstack_domain_name,
-                :openstack_domain_id => @openstack_domain_id,
-                :openstack_project_name => @openstack_project_name,
-                :openstack_auth_token => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
-                :openstack_auth_uri => @openstack_auth_uri,
-                :openstack_tenant => @openstack_tenant,
-                :openstack_service_type => @openstack_service_type,
-                :openstack_service_name => @openstack_service_name,
-                :openstack_endpoint_type => @openstack_endpoint_type,
-                :openstack_region => @openstack_region
-            }
-
-            credentials = Fog::OpenStack.authenticate(options, @connection_options)
-
-            @current_user = credentials[:user]
-            @current_user_id = credentials[:current_user_id]
-            @current_tenant = credentials[:tenant]
-
-            @openstack_must_reauthenticate = false
-            @auth_token = credentials[:token]
-            @openstack_management_url = credentials[:server_management_url]
-            @openstack_current_user_id = credentials[:current_user_id]
-            @unscoped_token = credentials[:unscoped_token]
-            uri = URI.parse(@openstack_management_url)
-          else
-            @auth_token = @openstack_auth_token
-            uri = URI.parse(@openstack_management_url)
+        attr_reader :unscoped_token
+
+        include Fog::OpenStack::Core
+
+        def request(params)
+          retried = false
+          begin
+            response = @connection.request(params.merge({
+              :headers => params.fetch(:headers,{}).merge({
+                'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
+                'X-Auth-Token' => @auth_token
+              }),
+              :path => "#{@path}/#{params[:path]}"
+            }))
+          rescue Excon::Errors::Unauthorized => error
+            raise if retried
+            retried = true
+
+            @openstack_must_reauthenticate = true
+            authenticate
+            retry
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+                    when Excon::Errors::NotFound
+                      Fog::Identity::OpenStack::NotFound.slurp(error)
+                    else
+                      error
+                  end
           end
-
-          @host = uri.host
-          @path = uri.path
-          @path.sub!(/\/$/, '')
-          @port = uri.port
-          @scheme = uri.scheme
-          true
+          unless response.body.empty?
+            response.body = Fog::JSON.decode(response.body)
+          end
+          response
         end
-
       end
     end
-
-
   end
 end