fog-openstack 0.1.31 → 0.2.0

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '0.1.31'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/fog/orchestration/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/orchestration/openstack/models'
       model       :stack
@@ -105,10 +105,6 @@ module Fog
           management_url.port = 8774
           management_url.path = '/v1'
           @openstack_management_url = management_url.to_s
-
-          identity_public_endpoint = URI.parse(options[:openstack_auth_url])
-          identity_public_endpoint.port = 5000
-          @openstack_identity_public_endpoint = identity_public_endpoint.to_s
         end
 
         def data
@@ -123,8 +119,7 @@ module Fog
           {:provider                    => 'openstack',
            :openstack_auth_url          => @openstack_auth_uri.to_s,
            :openstack_auth_token        => @auth_token,
-           :openstack_management_url    => @openstack_management_url,
-           :openstack_identity_endpoint => @openstack_identity_public_endpoint}
+           :openstack_management_url    => @openstack_management_url}
         end
       end
 
@@ -135,20 +130,8 @@ module Fog
           Fog::Orchestration::OpenStack::NotFound
         end
 
-        def initialize(options = {})
-          initialize_identity options
-
-          @openstack_identity_service_type = options[:openstack_identity_service_type] || 'identity'
-
-          @openstack_service_type           = options[:openstack_service_type] || ['orchestration']
-          @openstack_service_name           = options[:openstack_service_name]
-
-          @connection_options               = options[:connection_options] || {}
-
-          authenticate
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        def default_service_type
+          %w[orchestration]
         end
       end
     end

data/lib/fog/planning/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
 
       ## MODELS
       #
@@ -97,32 +97,22 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
-        # NOTE: uncommenting this should be treated as api-change!
-        # def self.not_found_class
-        #   Fog::Planning::OpenStack::NotFound
-        # end
-
-        def initialize(options = {})
-          initialize_identity options
-
-          @openstack_service_type           = options[:openstack_service_type] || ['management'] # currently Tuskar is configured as 'management' service in Keystone
-          @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 = "/v2"
-          end
+        def default_service_type
+          %w[management]
         end
+
+        # NOTE: uncommenting this should be treated as api-change!
+        # def self.not_found_class
+        #   Fog::Planning::OpenStack::NotFound
+        # end
       end
     end
 

data/lib/fog/shared_file_system/openstack.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_shared_file_system_microversion
+                 :openstack_identity_api_version, :openstack_shared_file_system_microversion
 
       model_path 'fog/shared_file_system/openstack/models'
       model       :network
@@ -351,37 +351,20 @@ module Fog
           Fog::SharedFileSystem::OpenStack::NotFound
         end
 
+        def action_prefix
+          microversion_newer_than?('2.6') ? '' : 'os-'
+        end
+
+        def default_service_type
+          %w[sharev2]
+        end
+
         def initialize(options = {})
           @supported_versions     = SUPPORTED_VERSIONS
           @supported_microversion = SUPPORTED_MICROVERSION
           @fixed_microversion     = options[:openstack_shared_file_system_microversion]
           @microversion_key       = 'X-Openstack-Manila-Api-Version'.freeze
-
-          initialize_identity options
-
-          @openstack_service_type  = options[:openstack_service_type] || ['sharev2']
-          @openstack_service_name  = options[:openstack_service_name]
-          @connection_options      = options[:connection_options] || {}
-
-          authenticate
-          set_api_path
-          set_microversion
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        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
-        end
-
-        def action_prefix
-          microversion_newer_than?('2.6') ? '' : 'os-'
+          super
         end
       end
     end

data/lib/fog/storage/openstack.rb

@@ -13,7 +13,7 @@ module Fog
                  :openstack_project_name, :openstack_project_id, :openstack_cache_ttl,
                  :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_identity_api_version, :openstack_temp_url_key
 
       model_path 'fog/storage/openstack/models'
       model       :directory
@@ -112,18 +112,13 @@ module Fog
           Fog::Storage::OpenStack::NotFound
         end
 
+        def default_service_type
+          %w[object-store]
+        end
+
         def initialize(options = {})
           require_mime_types
-          initialize_identity options
-
-          @openstack_service_type           = options[:openstack_service_type] || ['object-store']
-          @openstack_service_name           = options[:openstack_service_name]
-
-          @connection_options               = options[:connection_options] || {}
-
-          authenticate
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          super
         end
 
         # Change the current account while re-using the auth token.

data/lib/fog/volume/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]
 
       # Fog::Image::OpenStack.new() will return a Fog::Volume::OpenStack::V2 or a Fog::Volume::OpenStack::V1,
       #  choosing the V2 by default, as V1 is deprecated since OpenStack Juno

data/lib/fog/volume/openstack/models/backup.rb

@@ -30,9 +30,9 @@ module Fog
           true
         end
 
-        def restore(volume_id)
+        def restore(volume_id = nil, name = nil)
           requires :id
-          service.restore_backup(id, volume_id)
+          service.restore_backup(id, volume_id, name)
           true
         end
 

data/lib/fog/volume/openstack/requests/restore_backup.rb

@@ -2,8 +2,8 @@ module Fog
   module Volume
     class OpenStack
       module Real
-        def restore_backup(backup_id, volume_id)
-          data = { 'restore' => { 'volume_id' => volume_id } }
+        def restore_backup(backup_id, volume_id = nil, name = nil)
+          data = {'restore' => {'volume_id' => volume_id, 'name' => name}}
           request(
             :expects  => 202,
             :method   => 'POST',

data/lib/fog/volume/openstack/requests/update_volume.rb

@@ -1,7 +1,18 @@
 module Fog
   module Volume
     class OpenStack
-       module Mock
+      module Real
+        def update_volume(volume_id, data = {})
+          request(
+            :body    => Fog::JSON.encode('volume' => data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "volumes/#{volume_id}"
+          )
+        end
+      end
+
+      module Mock
         def update_volume(volume_id, data = {})
           response        = Excon::Response.new
           response.status = 200

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

@@ -152,29 +152,12 @@ module Fog
             Fog::Volume::OpenStack::NotFound
           end
 
-          def initialize(options = {})
-            initialize_identity options
-
-            @openstack_service_type  = options[:openstack_service_type] || ['volume']
-            @openstack_service_name  = options[:openstack_service_name]
-            @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
-
-            @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_endtpoint_type
+            'admin'
           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[volume]
           end
         end
       end

data/lib/fog/volume/openstack/v1/models/volume.rb

@@ -17,8 +17,7 @@ module Fog
             data = if id.nil?
                      service.create_volume(display_name, display_description, size, attributes)
                    else
-                     attrib = attributes.select { |key| %i(display_name display_description metadata).include?(key) }
-                     service.update_volume(id, attrib)
+                     service.update_volume(id, attributes.reject { |k, _v| k == :id })
                    end
             merge_attributes(data.body['volume'])
             true

data/lib/fog/volume/openstack/v1/requests/update_volume.rb

@@ -1,19 +1,2 @@
 require 'fog/volume/openstack/requests/update_volume'
 require 'fog/volume/openstack/v1/requests/real'
-
-module Fog
-  module Volume
-    class OpenStack
-      module Real
-        def update_volume(volume_id, data = {})
-          request(
-            :body    => Fog::JSON.encode('volume' => data),
-            :expects => 200,
-            :method  => 'PUT',
-            :path    => "volumes/#{volume_id}"
-          )
-        end
-      end
-    end
-  end
-end

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

@@ -154,29 +154,12 @@ module Fog
             Fog::Volume::OpenStack::NotFound
           end
 
-          def initialize(options = {})
-            initialize_identity options
-
-            @openstack_service_type  = options[:openstack_service_type] || ['volumev2']
-            @openstack_service_name  = options[:openstack_service_name]
-            @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
-
-            @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_endtpoint_type
+            'admin'
           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[volumev2]
           end
         end
       end

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

@@ -17,7 +17,7 @@ module Fog
             data = if id.nil?
                      service.create_volume(name, description, size, attributes)
                    else
-                     service.update_volume(id, attributes.select { |key| %i(name description metadata).include?(key) })
+                     service.update_volume(id, attributes.reject { |k, _v| k == :id })
                    end
             merge_attributes(data.body['volume'])
             true

data/lib/fog/volume/openstack/v2/requests/update_volume.rb

@@ -1,20 +1,2 @@
 require 'fog/volume/openstack/requests/update_volume'
 require 'fog/volume/openstack/v2/requests/real'
-
-module Fog
-  module Volume
-    class OpenStack
-      module Real
-        def update_volume(volume_id, data = {})
-          data = data.select { |key| key == :name || key == :description || key == :metadata }
-          request(
-            :body    => Fog::JSON.encode('volume' => data),
-            :expects => 200,
-            :method  => 'PUT',
-            :path    => "volumes/#{volume_id}"
-          )
-        end
-      end
-    end
-  end
-end

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

@@ -83,8 +83,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
@@ -99,27 +97,12 @@ module Fog
         class Real
           include Fog::OpenStack::Core
 
-          def initialize(options = {})
-            initialize_identity options
-
-            @openstack_service_type  = options[:openstack_service_type] || ['workflowv2']
-            @openstack_service_name  = options[:openstack_service_name]
-
-            @connection_options = options[:connection_options] || {}
-
-            authenticate
-
-            unless @path.match(SUPPORTED_VERSIONS)
-              @path = "/" + Fog::OpenStack.get_supported_version(
-                SUPPORTED_VERSIONS,
-                @openstack_management_uri,
-                @auth_token,
-                @connection_options
-              )
-            end
+          def default_path_prefix
+            'v2'
+          end
 
-            @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          def default_service_type
+            %w[workflowv2]
           end
 
           def request(params)

data/playbooks/fog-openstack-unittest-spec/run.yaml

@@ -24,7 +24,8 @@
               rvm use ${version} > /dev/null 2>&1
               echo "Running tests based on Ruby ${version}..."
               ruby --version
-              gem install bundler --version '~> 1'
+              gem install bundler
+              gem update bundler
               bundle install --jobs=3 --retry=3
               bundle exec rake spec TESTOPTS="--verbose"
           done