fog-openstack 0.1.31 → 0.2.0

data/lib/fog/identity/openstack.rb

@@ -1,38 +1,32 @@
-
-
 module Fog
   module Identity
     class OpenStack < Fog::Service
       autoload :V2, 'fog/identity/openstack/v2'
       autoload :V3, 'fog/identity/openstack/v3'
 
-      requires :openstack_auth_url
-      recognizes :openstack_auth_token, :openstack_management_url, :persistent,
-                 :openstack_service_type, :openstack_service_name, :openstack_tenant,
-                 :openstack_endpoint_type, :openstack_region, :openstack_domain_id,
-                 :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, :openstack_cache_ttl,
-                 :provider, :openstack_identity_prefix, :openstack_endpoint_path_matches
-
-      # Fog::Identity::OpenStack.new() will return a Fog::Identity::OpenStack::V3 by default
       def self.new(args = {})
-        version = '3'
-        url = Fog.credentials[:openstack_auth_url] || args[:openstack_auth_url]
-        if url
-          uri = URI(url)
-          version = '2.0' if uri.path =~ /v2\.0/
-        end
-
-        service = case version
-                  when '2.0'
-                    Fog::Identity::OpenStack::V2.new(args)
-                  else
-                    Fog::Identity::OpenStack::V3.new(args)
+        version = if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i
+                    '2.0'
+                  elsif args[:openstack_auth_url] =~ /v3|v2(\.0)*/
+                    # Deprecated from fog-openstack 0.2.0
+                    # Will be removed in future after hard deprecation is enforced for a couple of releases
+                    Fog::Logger.deprecation("An authentication URL including a version is deprecated")
+                    case args[:openstack_auth_url]
+                    when /v3/
+                      args[:openstack_auth_url].gsub!(/\/v3(\/)*.*/, '')
+                      'v3'
+                    when /v2(\.0)*/
+                      args[:openstack_auth_url].gsub!(/\/v2(\.0)*(\/)*.*/, '')
+                      '2.0'
+                    end
                   end
-        service
+
+        case version
+        when '2.0'
+          Fog::Identity::OpenStack::V2.new(args)
+        else
+          Fog::Identity::OpenStack::V3.new(args)
+        end
       end
 
       class Mock
@@ -47,39 +41,10 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
-        DEFAULT_SERVICE_TYPE_V3 = %w(identity_v3 identityv3 identity).collect(&:freeze).freeze
-        DEFAULT_SERVICE_TYPE    = %w(identity).collect(&:freeze).freeze
-
         def self.not_found_class
           Fog::Identity::OpenStack::NotFound
         end
 
-        def initialize(options = {})
-          if options.respond_to?(:config_service?) && options.config_service?
-            configure(options)
-            return
-          end
-
-          initialize_identity(options)
-
-          @openstack_service_type   = options[:openstack_service_type] || default_service_type(options)
-          @openstack_service_name   = options[:openstack_service_name]
-
-          @connection_options       = options[:connection_options] || {}
-
-          @openstack_endpoint_type  = options[:openstack_endpoint_type] || 'adminURL'
-          initialize_endpoint_path_matches(options)
-
-          authenticate
-
-          if options[:openstack_identity_prefix]
-            @path = "/#{options[:openstack_identity_prefix]}/#{@path}"
-          end
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
-
         def config_service?
           true
         end
@@ -88,23 +53,11 @@ module Fog
           self
         end
 
-        private
-
-        def default_service_type(options)
-          unless options[:openstack_identity_prefix]
-            if @openstack_auth_uri.path =~ %r{/v3} ||
-               (options[:openstack_endpoint_path_matches] && options[:openstack_endpoint_path_matches] =~ '/v3')
-              return DEFAULT_SERVICE_TYPE_V3
-            end
-          end
-          DEFAULT_SERVICE_TYPE
+        def default_endpoint_type
+          'admin'
         end
 
-        def initialize_endpoint_path_matches(options)
-          if options[:openstack_endpoint_path_matches]
-            @openstack_endpoint_path_matches = options[:openstack_endpoint_path_matches]
-          end
-        end
+        private
 
         def configure(source)
           source.instance_variables.each do |v|

data/lib/fog/identity/openstack/v2.rb

@@ -14,7 +14,7 @@ module Fog
                    :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, :openstack_endpoint_path_matches
+                   :openstack_identity_api_version
 
         model_path 'fog/identity/openstack/v2/models'
         model :tenant
@@ -169,10 +169,12 @@ module Fog
         end
 
         class Real < Fog::Identity::OpenStack::Real
-          private
+          def default_path_prefix
+            'v2.0'
+          end
 
-          def default_service_type(_)
-            DEFAULT_SERVICE_TYPE
+          def default_service_type
+            %w[identity_v2 identityv2 identity]
           end
         end
       end

data/lib/fog/identity/openstack/v3.rb

@@ -13,7 +13,7 @@ module Fog
                    :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, :openstack_endpoint_path_matches, :openstack_cache_ttl
+                   :provider, :openstack_identity_api_version, :openstack_cache_ttl
 
         model_path 'fog/identity/openstack/v3/models'
         model :domain
@@ -142,18 +142,12 @@ module Fog
         end
 
         class Real < Fog::Identity::OpenStack::Real
-          private
-
-          def default_service_type(_)
-            DEFAULT_SERVICE_TYPE_V3
+          def default_path_prefix
+            'v3'
           end
 
-          def initialize_endpoint_path_matches(options)
-            if options[:openstack_endpoint_path_matches]
-              @openstack_endpoint_path_matches = options[:openstack_endpoint_path_matches]
-            else
-              @openstack_endpoint_path_matches = %r{/v3} unless options[:openstack_identity_prefix]
-            end
+          def default_service_type
+            %w[identity_v3 identityv3 identity]
           end
         end
       end

data/lib/fog/image/openstack/v1.rb

@@ -16,7 +16,7 @@ module Fog
                    :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
+                   :openstack_identity_api_version
 
         model_path 'fog/image/openstack/v1/models'
 
@@ -102,29 +102,16 @@ module Fog
             Fog::Image::OpenStack::NotFound
           end
 
-          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
-            set_api_path
+          def default_endpoint_type
+            'admin'
+          end
 
-            @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          def default_path_prefix
+            'v1'
           end
 
-          def set_api_path
-            unless @path.match(SUPPORTED_VERSIONS)
-              @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
-                                                                @openstack_management_uri,
-                                                                @auth_token,
-                                                                @connection_options)
-            end
+          def default_service_type
+            %w[image]
           end
         end
       end

data/lib/fog/image/openstack/v2.rb

@@ -16,7 +16,7 @@ module Fog
                    :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
+                   :openstack_identity_api_version
 
         model_path 'fog/image/openstack/v2/models'
 
@@ -110,29 +110,16 @@ module Fog
             Fog::Image::OpenStack::NotFound
           end
 
-          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
-            set_api_path
+          def default_endpoint_type
+            'admin'
+          end
 
-            @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          def default_path_prefix
+            'v2'
           end
 
-          def set_api_path
-            unless @path.match(SUPPORTED_VERSIONS)
-              @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
-                                                                @openstack_management_uri,
-                                                                @auth_token,
-                                                                @connection_options)
-            end
+          def default_service_type
+            %w[image]
           end
         end
       end

data/lib/fog/image/openstack/v2/models/image.rb

@@ -47,7 +47,7 @@ module Fog
             elsif attributes.key?(method_sym.to_s)
               attributes[method_sym.to_s]
             elsif method_sym.to_s.end_with?('=')
-              attributes[method_sym.to_s.gsub(/=$/, '')] = arguments[0]
+              attributes[method_sym.to_s.gsub(/=$/, '').to_sym] = arguments[0]
             else
               super
             end

data/lib/fog/introspection/openstack.rb

@@ -57,8 +57,6 @@ module Fog
         def initialize(options = {})
           @auth_token = Fog::Mock.random_base64(64)
           @auth_token_expiration = (Time.now.utc + 86_400).iso8601
-
-          initialize_identity options
         end
 
         def data
@@ -77,25 +75,12 @@ module Fog
           Fog::Introspection::OpenStack::NotFound
         end
 
-        def initialize(options = {})
-          initialize_identity options
-
-          @openstack_service_type  = options[:openstack_service_type] || ['baremetal-introspection']
-          @openstack_service_name  = options[:openstack_service_name]
-
-          @connection_options = options[:connection_options] || {}
-
-          authenticate
-          set_api_path
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        def default_path_prefix
+          'v1'
         end
 
-        def set_api_path
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/v1"
-          end
+        def default_service_type
+          %w[baremetal-introspection]
         end
       end
     end

data/lib/fog/key_manager/openstack.rb

@@ -13,7 +13,7 @@ module Fog
                  :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, :openstack_temp_url_key, :openstack_cache_ttl
+                 :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl
 
 
       ## MODELS
@@ -96,55 +96,13 @@ module Fog
           Fog::KeyManager::OpenStack::NotFound
         end
 
-        def initialize(options = {})
-          initialize_identity options
-
-          @openstack_service_type           = options[:openstack_service_type] || ['key-manager']
-          @openstack_service_name           = options[:openstack_service_name]
-          @connection_options               = options[:connection_options] || {}
-
-          authenticate
-          set_api_path
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
-
-        def set_api_path
-          @path.sub!(%r{/$}, '')
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = supported_version(SUPPORTED_VERSIONS, @openstack_management_uri, @auth_token, @connection_options)
-          end
+        def default_path_prefix
+          'v1'
         end
 
-        def 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({ :expects => [200, 204, 300],
-                                          :headers => {'Content-Type' => 'application/json',
-                                                       'Accept' => 'application/json',
-                                                       'X-Auth-Token' => auth_token},
-                                          :method => 'GET'
-                                        })
-
-          body = Fog::JSON.decode(response.body)
-          version = nil
-
-          versions =  body.fetch('versions',{}).fetch('values',[])
-          versions.each do |v|
-            if v.fetch('id', "").match(supported_versions) &&
-              ['current', 'supported', 'stable'].include?(v.fetch('status','').downcase)
-              version = v['id']
-            end
-          end
-
-          if !version  || version.empty?
-            raise Fog::OpenStack::Errors::ServiceUnavailable.new(
-                    "OpenStack service only supports API versions #{supported_versions.inspect}")
-          end
-
-          version
+        def default_service_type
+          %w[key-manager]
         end
-
       end
     end
   end

data/lib/fog/metering/openstack.rb

@@ -15,7 +15,7 @@ module Fog
                  :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
+                 :openstack_identity_api_version
 
       model_path 'fog/metering/openstack/models'
 
@@ -100,31 +100,16 @@ module Fog
           Fog::Metering::OpenStack::NotFound
         end
 
-        def initialize(options = {})
-          initialize_identity options
-
-          @openstack_service_type           = options[:openstack_service_type] || ['metering']
-          @openstack_service_name           = options[:openstack_service_name]
-          @openstack_endpoint_type          = options[:openstack_endpoint_type] || 'adminURL'
-
-          @connection_options               = options[:connection_options] || {}
-
-          authenticate
-          set_api_path
+        def default_endpoint_type
+          'admin'
+        end
 
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        def default_path_prefix
+          'v2'
         end
 
-        def set_api_path
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(
-              SUPPORTED_VERSIONS,
-              @openstack_management_uri,
-              @auth_token,
-              @connection_options
-            )
-          end
+        def default_service_type
+          %w[metering]
         end
       end
     end

data/lib/fog/metric/openstack.rb

@@ -13,7 +13,7 @@ module Fog
                  :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
+                 :openstack_identity_api_version
 
       model_path 'fog/metric/openstack/models'
 
@@ -90,35 +90,16 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
-        def self.not_found_class
-          Fog::Metric::OpenStack::NotFound
+        def default_path_prefix
+          'v1'
         end
 
-        def initialize(options = {})
-          initialize_identity options
-
-          @openstack_service_type           = options[:openstack_service_type] || ['metric']
-          @openstack_service_name           = options[:openstack_service_name]
-          @openstack_endpoint_type          = options[:openstack_endpoint_type] || 'publicURL'
-
-          @connection_options               = options[:connection_options] || {}
-
-          authenticate
-          set_api_path
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        def self.not_found_class
+          Fog::Metric::OpenStack::NotFound
         end
 
-        def set_api_path
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = Fog::OpenStack.get_supported_version_path(
-              SUPPORTED_VERSIONS,
-              @openstack_management_uri,
-              @auth_token,
-              @connection_options
-            )
-          end
+        def default_service_type
+          %w[metric]
         end
       end
     end