fog-openstack 0.1.7 → 0.1.8

data/gemfiles/Gemfile-1.9

@@ -16,4 +16,5 @@ group :development, :test do
   gem "minitest"
   gem "vcr"
   gem "webmock",         "~> 1.24.6"
+  gem "json",            "< 2.0"
 end

data/lib/fog/openstack.rb

@@ -3,7 +3,6 @@ require 'fog/core'
 require 'fog/json'
 
 require 'fog/openstack/core'
-require 'fog/openstack/common'
 require 'fog/openstack/errors'
 
 require 'fog/openstack/compute'
@@ -62,6 +61,10 @@ module Fog
     autoload :OpenStack, File.expand_path('../fog/openstack/monitoring', __FILE__)
   end
 
+  module Workflow
+    autoload :OpenStack, File.expand_path('../openstack/workflow', __FILE__)
+  end
+
   module OpenStack
     extend Fog::Provider
 
@@ -78,6 +81,7 @@ module Fog
     service(:planning,      'Planning')
     service(:introspection, 'Introspection')
     service(:monitoring,    'Monitoring')
+    service(:workflow,      'Workflow')
 
     @@token_cache = {}
 

data/lib/fog/openstack/baremetal.rb

@@ -248,7 +248,12 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
-        def initialize(options={})
+        # NOTE: uncommenting this should be treated as api-change!
+        # def self.not_found_class
+        #   Fog::Baremetal::OpenStack::NotFound
+        # end
+
+        def initialize(options = {})
           initialize_identity options
 
           @openstack_service_type  = options[:openstack_service_type] || ['baremetal']
@@ -257,51 +262,22 @@ module Fog
           @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
+
+        private
+
+        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
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        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
-
       end
     end
   end

data/lib/fog/openstack/compute.rb

@@ -341,6 +341,10 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
+        def self.not_found_class
+          Fog::Compute::OpenStack::NotFound
+        end
+
         def initialize(options = {})
           initialize_identity options
 
@@ -361,39 +365,6 @@ module Fog
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
-
-        def request(params)
-          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]}",
-                                                        :query   => params[:query]))
-          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
-
-          if !response.body.empty? && response.get_header('Content-Type') == 'application/json'
-            response.body = Fog::JSON.decode(response.body)
-          end
-
-          response
-        end
       end
     end
   end

data/lib/fog/openstack/core.rb

@@ -2,6 +2,7 @@ module Fog
   module OpenStack
     module Core
       attr_accessor :auth_token
+      attr_reader :unscoped_token
       attr_reader :openstack_cache_ttl
       attr_reader :auth_token_expiration
       attr_reader :current_user
@@ -16,39 +17,46 @@ module Fog
       attr_reader :openstack_project_domain_id
       attr_reader :openstack_identity_prefix
 
-      def initialize_identity options
+      # fallback
+      def self.not_found_class
+        Fog::Compute::OpenStack::NotFound
+      end
+
+      def initialize_identity(options)
         # Create @openstack_* instance variables from all :openstack_* options
-        options.select{|x|x.to_s.start_with? 'openstack'}.each do |openstack_param, value|
+        options.select { |x| x.to_s.start_with? 'openstack' }.each do |openstack_param, value|
           instance_variable_set "@#{openstack_param}".to_sym, value
         end
 
-        @auth_token        ||= options[:openstack_auth_token]
+        @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
+        @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+        @openstack_must_reauthenticate = false
         @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL'
 
         @openstack_cache_ttl = options[:openstack_cache_ttl] || 0
 
-        unless @auth_token
-          missing_credentials = Array.new
+        if @auth_token
+          @openstack_can_reauthenticate = false
+        else
+          missing_credentials = []
 
           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?
+          @openstack_can_reauthenticate = true
         end
 
         @current_user = options[:current_user]
         @current_user_id = options[:current_user_id]
         @current_tenant = options[:current_tenant]
-
       end
 
       def credentials
-        options =  {
+        options = {
           :provider                    => 'openstack',
           :openstack_auth_url          => @openstack_auth_uri.to_s,
           :openstack_auth_token        => @auth_token,
@@ -56,63 +64,109 @@ module Fog
           :current_user                => @current_user,
           :current_user_id             => @current_user_id,
           :current_tenant              => @current_tenant,
-          :unscoped_token              => @unscoped_token}
-          openstack_options.merge options
+          :unscoped_token              => @unscoped_token
+        }
+        openstack_options.merge options
+      end
+
+      def reload
+        @connection.reset
+      end
+
+      private
+
+      def request(params, parse_json = true)
+        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
+          # token expiration and token renewal possible
+          if error.response.body != 'Bad username or password' && @openstack_can_reauthenticate && !retried
+            @openstack_must_reauthenticate = true
+            authenticate
+            set_api_path
+            retried = true
+            retry
+          # bad credentials or token renewal not possible
+          else
+            raise error
+          end
+        rescue Excon::Errors::HTTPStatusError => error
+          raise case error
+                when Excon::Errors::NotFound
+                  self.class.not_found_class.slurp(error)
+                else
+                  error
+                end
         end
 
-        def reload
-          @connection.reset
+        if !response.body.empty? && response.get_header('Content-Type').match('application/json')
+          # TODO: remove parse_json in favor of :raw_body
+          response.body = Fog::JSON.decode(response.body) if parse_json && !params[:raw_body]
         end
 
-        private
+        response
+      end
+
+      def set_api_path
+        # if the service supports multiple versions, do the selection here
+      end
 
-        def openstack_options
-          options={}
-          # Create a hash of (:openstack_*, value) of all the @openstack_* instance variables
-          self.instance_variables.select{|x|x.to_s.start_with? '@openstack'}.each do |openstack_param|
-            option_name = openstack_param.to_s[1..-1]
-            options[option_name.to_sym] = instance_variable_get openstack_param
-          end
-          options
+      def openstack_options
+        options = {}
+        # Create a hash of (:openstack_*, value) of all the @openstack_* instance variables
+        instance_variables.select { |x| x.to_s.start_with? '@openstack' }.each do |openstack_param|
+          option_name = openstack_param.to_s[1..-1]
+          options[option_name.to_sym] = instance_variable_get openstack_param
         end
+        options
+      end
 
-        def authenticate
-          if !@openstack_management_url || @openstack_must_reauthenticate
+      def authenticate
+        if !@openstack_management_url || @openstack_must_reauthenticate
 
-            options = openstack_options
+          options = openstack_options
 
-            options[:openstack_auth_token] = @openstack_must_reauthenticate ? nil : @openstack_auth_token
+          options[:openstack_auth_token] = @openstack_must_reauthenticate ? nil : @openstack_auth_token
 
-            credentials = Fog::OpenStack.authenticate(options, @connection_options)
+          credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
-            @current_user = credentials[:user]
-            @current_user_id = credentials[:current_user_id]
-            @current_tenant = credentials[:tenant]
+          @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]
-            @unscoped_token = credentials[:unscoped_token]
-          else
-            @auth_token = @openstack_auth_token
-          end
-          @openstack_management_uri = URI.parse(@openstack_management_url)
+          @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
+        @openstack_management_uri = URI.parse(@openstack_management_url)
 
-          @host   = @openstack_management_uri.host
-          @path   = @openstack_management_uri.path
-          @path.sub!(/\/$/, '')
-          @port   = @openstack_management_uri.port
-          @scheme = @openstack_management_uri.scheme
+        @host   = @openstack_management_uri.host
+        @path   = @openstack_management_uri.path
+        @path.sub!(%r{/$}, '')
+        @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(
+        # 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
+            false, @connection_options
+          )
         end
+
+        true
       end
     end
   end
+end

data/lib/fog/openstack/identity.rb

@@ -42,13 +42,14 @@ module Fog
       end
 
       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
-        include Fog::OpenStack::Common
 
         def initialize(options = {})
           if options.respond_to?(:config_service?) && options.config_service?

data/lib/fog/openstack/identity_v2.rb

@@ -1,5 +1,3 @@
-
-require 'fog/openstack/common'
 require 'fog/openstack/identity'
 
 module Fog

data/lib/fog/openstack/identity_v3.rb

@@ -1,5 +1,3 @@
-
-require 'fog/openstack/common'
 require 'fog/openstack/identity'
 
 module Fog

data/lib/fog/openstack/image_v1.rb

@@ -1,5 +1,3 @@
-require 'fog/openstack/common'
-
 require 'fog/openstack/image'
 
 module Fog
@@ -103,7 +101,6 @@ module Fog
           def self.not_found_class
             Fog::Image::OpenStack::NotFound
           end
-          include Fog::OpenStack::Common
 
           def initialize(options = {})
             initialize_identity options
@@ -115,16 +112,19 @@ module Fog
             @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
             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
         end
       end

data/lib/fog/openstack/image_v2.rb

@@ -1,5 +1,3 @@
-require 'fog/openstack/common'
-
 require 'fog/openstack/image'
 
 module Fog
@@ -107,10 +105,10 @@ module Fog
 
         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
@@ -122,16 +120,19 @@ module Fog
             @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
             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
         end
       end