fog 1.31.0 → 1.37.0

data/lib/fog/openstack/identity_v2.rb

@@ -1,4 +1,5 @@
 require 'fog/openstack/core'
+require 'fog/openstack/common'
 require 'fog/openstack/identity'
 
 module Fog
@@ -7,11 +8,16 @@ module Fog
       class V2 < Fog::Service
 
         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, :openstack_current_user_id,
-                   :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,
+                   :openstack_identity_prefix
 
         model_path 'fog/openstack/models/identity_v2'
         model :tenant
@@ -166,97 +172,27 @@ module Fog
         end
 
         class Real
-          attr_reader :current_user
-          attr_reader :current_tenant
-          attr_reader :unscoped_token
-
-          include Fog::Identity::OpenStack::Common
+          def self.not_found_class
+            Fog::Identity::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
 
           def initialize(options={})
-            @openstack_auth_token = options[:openstack_auth_token]
-
-            unless @openstack_auth_token
-              missing_credentials = Array.new
-              @openstack_api_key = options[:openstack_api_key]
-              @openstack_username = options[:openstack_username]
-              @openstack_region = options[:openstack_region]
+            initialize_identity options
 
-              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_service_type   = options[:openstack_service_type] || ['identity']
+            @openstack_service_name   = options[:openstack_service_name]
+            @identity_prefix          = options[:openstack_identity_prefix] ? "/#{options[:openstack_identity_prefix]}" : nil
 
-            @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] || ['identity']
-            @openstack_service_name = options[:openstack_service_name]
+            @connection_options       = options[:connection_options] || {}
 
-            @connection_options = options[:connection_options] || {}
-
-            @openstack_current_user_id = options[:openstack_current_user_id]
-
-            @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
-
-            @current_user = options[:current_user]
-            @current_tenant = options[:current_tenant]
+            @openstack_endpoint_type  = options[:openstack_endpoint_type] || 'adminURL'
 
             authenticate
 
             @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,
-             :openstack_current_user_id => @openstack_current_user_id,
-             :current_user => @current_user,
-             :current_tenant => @current_tenant}
-          end
-
-          def reload
-            @connection.reset
+            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}#{@identity_prefix}", @persistent, @connection_options)
           end
-
-          def request(params)
-            retried = false
-            begin
-              response = @connection.request(params.merge({
-                                                              :headers => {
-                                                                  'Content-Type' => 'application/json',
-                                                                  'Accept' => 'application/json',
-                                                                  'X-Auth-Token' => @auth_token
-                                                              }.merge!(params[:headers] || {}),
-                                                              :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
-            unless response.body.empty?
-              response.body = Fog::JSON.decode(response.body)
-            end
-            response
-          end
-
-          private
-
-
         end
       end
     end

data/lib/fog/openstack/identity_v3.rb

@@ -1,19 +1,21 @@
 require 'fog/openstack/core'
+require 'fog/openstack/common'
 require 'fog/openstack/identity'
 
 module Fog
   module Identity
     class OpenStack
       class V3 < Fog::Service
-
         requires :openstack_auth_url
         recognizes :openstack_auth_token, :openstack_management_url, :persistent,
                    :openstack_service_type, :openstack_service_name, :openstack_tenant,
-                   :openstack_project_name, :openstack_domain_name, :openstack_userid,
-                   :openstack_api_key, :openstack_username, :openstack_current_user_id,
-                   :current_user, :current_tenant,
                    :openstack_endpoint_type, :openstack_region, :openstack_domain_id,
-                   :openstack_domain, :openstack_project, :provider
+                   :openstack_project_name, :openstack_domain_name,
+                   :openstack_user_domain, :openstack_project_domain,
+                   :openstack_user_domain_id, :openstack_project_domain_id,
+                   :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username,
+                   :current_user, :current_user_id, :current_tenant,
+                   :provider, :openstack_identity_prefix
 
         model_path 'fog/openstack/models/identity_v3'
         model :domain
@@ -118,6 +120,7 @@ module Fog
         request :delete_policy
 
         class Mock
+          include Fog::OpenStack::Core
           def initialize(options={})
 
           end
@@ -146,104 +149,30 @@ module Fog
         end
 
         class Real
-          attr_reader :current_user
-          attr_reader :current_tenant
-          attr_reader :unscoped_token
-          attr_reader :auth_token
-
-          include Fog::Identity::OpenStack::Common
+          def self.not_found_class
+            Fog::Identity::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
 
           def initialize(options={})
-            @openstack_auth_token = options[:openstack_auth_token]
-
-            @openstack_region = options[:openstack_region]
-
-            unless @openstack_auth_token
-              missing_credentials = Array.new
-              @openstack_api_key = options[:openstack_api_key]
-              @openstack_username = options[:openstack_username]
-              @openstack_userid = options[:openstack_userid]
-
-              missing_credentials << :openstack_api_key unless @openstack_api_key
-              unless @openstack_username || @openstack_userid
-                missing_credentials << 'openstack_username or openstack_userid'
-              end
-              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] || ['identity_v3','identityv3','identity']
-            @openstack_service_name = options[:openstack_service_name]
-
-            @connection_options = options[:connection_options] || {}
+            initialize_identity options
 
-            @openstack_current_user_id = options[:openstack_current_user_id]
+            @openstack_service_type   = options[:openstack_service_type] || ['identity_v3','identityv3','identity']
+            @openstack_service_name   = options[:openstack_service_name]
+            @identity_prefix          = options[:openstack_identity_prefix] ? "/#{options[:openstack_identity_prefix]}" : nil
 
-            @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
+            @connection_options       = options[:connection_options] || {}
 
-            @current_user = options[:current_user]
-            @current_tenant = options[:current_tenant]
+            @openstack_endpoint_type  = options[:openstack_endpoint_type] || 'adminURL'
 
+            @openstack_endpoint_path_matches = options[:openstack_endpoint_path_matches] ||= /\/v3/
             authenticate
 
             @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}#{@identity_prefix}", @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,
-             :openstack_current_user_id => @openstack_current_user_id,
-             :current_user => @current_user,
-             :current_tenant => @current_tenant}
-          end
-
-          def reload
-            @connection.reset
-          end
-
-          def request(params)
-            retried = false
-            begin
-              response = @connection.request(params.merge({
-                                                              :headers => {
-                                                                  'Content-Type' => 'application/json',
-                                                                  'Accept' => 'application/json',
-                                                                  'X-Auth-Token' => @auth_token
-                                                              }.merge!(params[:headers] || {}),
-                                                              :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
-            unless response.body.empty?
-              response.body = Fog::JSON.decode(response.body)
-            end
-            response
-          end
-
-
         end
-
       end
     end
   end
-end
+end

data/lib/fog/openstack/image.rb

@@ -3,216 +3,20 @@ require 'fog/openstack/core'
 module Fog
   module Image
     class OpenStack < Fog::Service
-      SUPPORTED_VERSIONS = /v1(\.(0|1))*/
 
-      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
-
-      model_path 'fog/openstack/models/image'
-
-      model       :image
-      collection  :images
-
-      request_path 'fog/openstack/requests/image'
-
-      request :list_public_images
-      request :list_public_images_detailed
-      request :get_image
-      request :create_image
-      request :update_image
-      request :get_image_members
-      request :update_image_members
-      request :get_shared_images
-      request :add_member_to_image
-      request :remove_member_from_image
-      request :delete_image
-      request :get_image_by_id
-      request :set_tenant
-
-      class Mock
-        def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {
-              :images => {}
-            }
-          end
-        end
-
-        def self.reset
-          @data = nil
-        end
-
-        def initialize(options={})
-          @openstack_username = options[:openstack_username]
-          @openstack_tenant   = options[:openstack_tenant]
-          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
-
-          @auth_token = Fog::Mock.random_base64(64)
-          @auth_token_expiration = (Time.now.utc + 86400).iso8601
-
-          management_url = URI.parse(options[:openstack_auth_url])
-          management_url.port = 9292
-          management_url.path = '/v1'
-          @openstack_management_url = management_url.to_s
-
-          @data ||= { :users => {} }
-          unless @data[:users].find {|u| u['name'] == options[:openstack_username]}
-            id = Fog::Mock.random_numbers(6).to_s
-            @data[:users][id] = {
-              'id'       => id,
-              'name'     => options[:openstack_username],
-              'email'    => "#{options[:openstack_username]}@mock.com",
-              'tenantId' => Fog::Mock.random_numbers(6).to_s,
-              'enabled'  => true
-            }
-          end
-        end
-
-        def data
-          self.class.data[@openstack_username]
-        end
-
-        def reset_data
-          self.class.data.delete(@openstack_username)
-        end
-
-        def credentials
-          { :provider                 => 'openstack',
-            :openstack_auth_url       => @openstack_auth_uri.to_s,
-            :openstack_auth_token     => @auth_token,
-            :openstack_region         => @openstack_region,
-            :openstack_management_url => @openstack_management_url }
-        end
+      # Fog::Image::OpenStack.new() will return a Fog::Image::OpenStack::V2 or a Fog::Image::OpenStack::V1,
+      #  choosing the latest available
+      def self.new(args = {})
+        @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url]
+        if self.inspect == 'Fog::Image::OpenStack'
+          service = Fog::Image::OpenStack::V2.new(args) unless args.empty?
+          service ||= Fog::Image::OpenStack::V1.new(args)
+        else
+          service = Fog::Service.new(args)
+        end
+        service
       end
 
-      class Real
-        attr_reader :current_user
-        attr_reader :current_tenant
-
-        def initialize(options={})
-          @openstack_auth_token = options[:openstack_auth_token]
-
-          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] || ['image']
-          @openstack_service_name         = options[:openstack_service_name]
-          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'adminURL'
-          @openstack_region               = options[:openstack_region]
-
-          @connection_options = options[:connection_options] || {}
-
-          @current_user = options[:current_user]
-          @current_tenant = options[:current_tenant]
-
-          authenticate
-
-          @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({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              }.merge!(params[:headers] || {}),
-              :path     => "#{@path}/#{params[:path]}"#,
-            }))
-          rescue Excon::Errors::Unauthorized => error
-            if error.response.body != 'Bad username or password' # token expiration
-              @openstack_must_reauthenticate = true
-              authenticate
-              retry
-            else # bad credentials
-              raise error
-            end
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Compute::OpenStack::NotFound.slurp(error)
-            else
-              error
-            end
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
-        end
-
-        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
 end

data/lib/fog/openstack/image_v1.rb

@@ -0,0 +1,148 @@
+require 'fog/openstack/common'
+require 'fog/openstack/core'
+require 'fog/openstack/image'
+
+module Fog
+  module Image
+    class OpenStack
+      class V1 < Fog::Service
+
+        SUPPORTED_VERSIONS = /v1(\.(0|1))*/
+
+        requires :openstack_auth_url
+        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,
+                   :openstack_identity_prefix
+
+        model_path 'fog/openstack/models/image_v1'
+
+        model       :image
+        collection  :images
+
+        request_path 'fog/openstack/requests/image_v1'
+
+        request :list_public_images
+        request :list_public_images_detailed
+        request :get_image
+        request :create_image
+        request :update_image
+        request :get_image_members
+        request :update_image_members
+        request :get_shared_images
+        request :add_member_to_image
+        request :remove_member_from_image
+        request :delete_image
+        request :get_image_by_id
+        request :set_tenant
+
+        class Mock
+          def self.data
+            @data ||= Hash.new do |hash, key|
+              hash[key] = {
+                :images => {}
+              }
+            end
+          end
+
+          def self.reset
+            @data = nil
+          end
+
+          def initialize(options={})
+            @openstack_username = options[:openstack_username]
+            @openstack_tenant   = options[:openstack_tenant]
+            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+            @auth_token = Fog::Mock.random_base64(64)
+            @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+            management_url = URI.parse(options[:openstack_auth_url])
+            management_url.port = 9292
+            management_url.path = '/v1'
+            @openstack_management_url = management_url.to_s
+
+            @data ||= { :users => {} }
+            unless @data[:users].find {|u| u['name'] == options[:openstack_username]}
+              id = Fog::Mock.random_numbers(6).to_s
+              @data[:users][id] = {
+                'id'       => id,
+                'name'     => options[:openstack_username],
+                'email'    => "#{options[:openstack_username]}@mock.com",
+                'tenantId' => Fog::Mock.random_numbers(6).to_s,
+                'enabled'  => true
+              }
+            end
+          end
+
+          def data
+            self.class.data[@openstack_username]
+          end
+
+          def reset_data
+            self.class.data.delete(@openstack_username)
+          end
+
+          def credentials
+            { :provider                 => 'openstack',
+              :openstack_auth_url       => @openstack_auth_uri.to_s,
+              :openstack_auth_token     => @auth_token,
+              :openstack_region         => @openstack_region,
+              :openstack_management_url => @openstack_management_url }
+          end
+        end
+
+        class Real
+          include Fog::OpenStack::Core
+
+          def self.not_found_class
+            Fog::Image::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
+
+          def initialize(options={})
+            initialize_identity options
+
+            @openstack_service_type           = options[:openstack_service_type] || ['image']
+            @openstack_service_name           = options[:openstack_service_name]
+            @openstack_endpoint_type          = options[:openstack_endpoint_type] || 'adminURL'
+
+            @connection_options               = options[:connection_options] || {}
+
+            authenticate
+
+            process_path @openstack_management_uri
+            unless @path.match(SUPPORTED_VERSIONS)
+              @path = Fog::OpenStack.get_supported_version_path(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 process_path uri
+            unless @path.match(SUPPORTED_VERSIONS)
+              @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
+                                                                 uri,
+                                                                 @auth_token,
+                                                                 @connection_options)
+            end
+            @path
+          end
+
+          private
+
+        end
+      end
+    end
+  end
+end