fog-openstack 0.1.7 → 0.1.8

data/lib/fog/openstack/introspection.rb

@@ -73,6 +73,10 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
+        def self.not_found_class
+          Fog::Introspection::OpenStack::NotFound
+        end
+
         def initialize(options = {})
           initialize_identity options
 
@@ -82,7 +86,13 @@ 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(
               SUPPORTED_VERSIONS,
@@ -91,41 +101,6 @@ module Fog
               @connection_options
             )
           end
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
-
-        def request(params)
-          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::Introspection::OpenStack::NotFound.slurp(error)
-                else
-                  error
-                end
-        else
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
         end
       end
     end

data/lib/fog/openstack/metering.rb

@@ -3,6 +3,8 @@
 module Fog
   module Metering
     class OpenStack < Fog::Service
+      SUPPORTED_VERSIONS = /v2/
+
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url,
                  :persistent, :openstack_service_type, :openstack_service_name,
@@ -93,7 +95,11 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
-        def initialize(options={})
+        def self.not_found_class
+          Fog::Metering::OpenStack::NotFound
+        end
+
+        def initialize(options = {})
           initialize_identity options
 
           @openstack_service_type           = options[:openstack_service_type] || ['metering']
@@ -103,47 +109,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
 
-        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}/v2/#{params[:path]}"#,
-              # Causes errors for some requests like tenants?limit=1
-              # :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)
-            }))
-          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::Metering::OpenStack::NotFound.slurp(error)
-            else
-              error
-            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
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
         end
-
-        private
-
       end
     end
   end

data/lib/fog/openstack/monitoring.rb

@@ -12,7 +12,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_identity_prefix, :openstack_temp_url_key, :openstack_cache_ttl
 
       model_path 'fog/openstack/models/monitoring'
       model       :metric
@@ -68,6 +68,10 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
+        def self.not_found_class
+          Fog::Monitoring::OpenStack::NotFound
+        end
+
         def initialize(options = {})
           initialize_identity options
 
@@ -80,36 +84,6 @@ module Fog
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
-
-        def request(params, parse_json = true)
-          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
-            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::Monitoring::OpenStack::NotFound.slurp(error)
-                  else
-                    error
-                  end
-          end
-          if !response.body.empty? && parse_json && response.get_header('Content-Type') =~ %r{application/json}
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
-        end
       end
     end
   end

data/lib/fog/openstack/network.rb

@@ -287,6 +287,10 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
+        def self.not_found_class
+          Fog::Network::OpenStack::NotFound
+        end
+
         def initialize(options = {})
           initialize_identity options
 
@@ -302,41 +306,8 @@ module Fog
           @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]}" # ,
-            ))
-          rescue Excon::Errors::Unauthorized => error
-            if error.response.body != 'Bad username or password' # token expiration
-              @openstack_must_reauthenticate = true
-              authenticate
-              set_api_path
-              retry
-            else # bad credentials
-              raise error
-            end
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-                  when Excon::Errors::NotFound
-                    Fog::Network::OpenStack::NotFound.slurp(error)
-                  else
-                    error
-                  end
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
-        end
-
         def set_api_path
-          @path.sub!(%r{\/$}, '')
+          @path.sub!(%r{/$}, '')
           unless @path.match(SUPPORTED_VERSIONS)
             @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
                                                               @openstack_management_uri,

data/lib/fog/openstack/nfv.rb

@@ -98,6 +98,10 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
+        def self.not_found_class
+          Fog::NFV::OpenStack::NotFound
+        end
+
         def initialize(options = {})
           initialize_identity options
 
@@ -107,7 +111,13 @@ 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(
               SUPPORTED_VERSIONS,
@@ -116,41 +126,6 @@ module Fog
               @connection_options
             )
           end
-
-          @persistent = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
-
-        def request(params)
-          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::NFV::OpenStack::NotFound.slurp(error)
-                else
-                  error
-                end
-        else
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
         end
       end
     end

data/lib/fog/openstack/orchestration.rb

@@ -131,6 +131,11 @@ module Fog
       class Real
         include Fog::OpenStack::Core
 
+        # NOTE: uncommenting this should be treated as api-change!
+        # def self.not_found_class
+        #   Fog::Orchestration::OpenStack::NotFound
+        # end
+
         def initialize(options={})
           initialize_identity options
 
@@ -146,46 +151,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,
-                'X-Auth-User'  => @openstack_username,
-                'X-Auth-Key'   => @openstack_api_key
-              }.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? and response.get_header('Content-Type') =~ /application\/json/ then
-            response.body = Fog::JSON.decode(response.body)
-          end
-
-          response
-        end
-
-        private
-
       end
     end
   end

data/lib/fog/openstack/planning.rb

@@ -97,7 +97,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::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
@@ -107,51 +112,21 @@ module Fog
           @connection_options               = options[:connection_options] || {}
 
           authenticate
-
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/v2"
-          end
+          set_api_path
 
           @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)
+        def set_api_path
+          unless @path.match(SUPPORTED_VERSIONS)
+            @path = "/v2"
           end
-          response
         end
-
-        private
-
       end
     end
 
+    # TODO: get rid of inconform self.[] & self.new & self.services
     def self.[](service)
       new(:service => service)
     end