misty 0.7.2 → 0.8.0

data/lib/misty/http/client.rb

@@ -7,7 +7,8 @@ module Misty
   module HTTP
     class Client
       class Options
-        attr_accessor :base_path, :base_url, :interface, :region_id, :service_names, :ssl_verify_mode, :version
+        attr_accessor :base_path, :base_url, :interface, :region_id,
+                      :service_names, :ssl_verify_mode, :version, :headers
       end
 
       class InvalidDataError < StandardError; end
@@ -53,8 +54,7 @@ module Misty
         @options = setup(options)
         @uri = URI.parse(@auth.get_endpoint(@options.service_names, @options.region_id, @options.interface))
         @base_path = @options.base_path ? @options.base_path : @uri.path
-        @base_path = @base_path.chomp("/")
-        @http = Misty::HTTP::NetHTTP.net_http(@uri, @options.ssl_verify_mode, @config.log)
+        @base_path = @base_path.chomp('/')
         @version = nil
         @microversion = false
       end
@@ -63,11 +63,11 @@ module Misty
       # When a catalog provides a base path and the Service API definition containts the generic equivalent as prefix
       # then the preifx is redundant and must be removed from the path.
       # For example:
-      # Catalog provides "http://192.0.2.21:8004/v1/48985e6b8da145699d411f12a3459fca"
-      # and Service API has "/v1/{tenant_id}/stacks"
-      # then the path prefix is ignored and path is only "/stacks"
+      # Catalog provides 'http://192.0.2.21:8004/v1/48985e6b8da145699d411f12a3459fca'
+      # and Service API has '/v1/{tenant_id}/stacks'
+      # then the path prefix is ignored and path is only '/stacks'
       def self.prefix_path_to_ignore
-        ""
+        ''
       end
 
       def headers_default
@@ -75,8 +75,9 @@ module Misty
       end
 
       def headers
-        h = headers_default.merge("X-Auth-Token" => "#{@auth.get_token}")
+        h = headers_default.merge('X-Auth-Token' => @auth.get_token.to_s)
         h.merge!(microversion_header) if microversion
+        h.merge!(@options.headers) if @options.headers
         h
       end
 
@@ -88,13 +89,14 @@ module Misty
 
       def setup(params)
         options = Options.new()
-        options.base_path       = params[:base_path]       ? params[:base_path] : nil
-        options.base_url        = params[:base_url]        ? params[:base_url] : nil
-        options.interface       = params[:interface]       ? params[:interface] : @config.interface
-        options.region_id       = params[:region_id]       ? params[:region_id] : @config.region_id
-        options.service_names   = params[:service_name]    ? self.class.service_names << params[:service_name] : self.class.service_names
-        options.ssl_verify_mode = params[:ssl_verify_mode] ? params[:ssl_verify_mode] : @config.ssl_verify_mode
-        options.version         = params[:version]         ? params[:version] : "CURRENT"
+        options.base_path           = params[:base_path]       ? params[:base_path] : nil
+        options.base_url            = params[:base_url]        ? params[:base_url] : nil
+        options.interface           = params[:interface]       ? params[:interface] : @config.interface
+        options.region_id           = params[:region_id]       ? params[:region_id] : @config.region_id
+        options.service_names       = params[:service_name]    ? self.class.service_names << params[:service_name] : self.class.service_names
+        options.ssl_verify_mode     = params[:ssl_verify_mode] ? params[:ssl_verify_mode] : @config.ssl_verify_mode
+        options.headers             = params[:headers] ? params[:headers] : @config.headers
+        options.version             = params[:version]         ? params[:version] : 'CURRENT'
 
         unless INTERFACES.include?(options.interface)
           raise InvalidDataError, "Options ':interface' must be one of #{INTERFACES}"

data/lib/misty/http/method_builder.rb

@@ -69,7 +69,7 @@ module Misty
         subpath = /(.*)(\{.*\})(.*)/.match(str)
         return str unless subpath
         arg = args.pop
-        raise ArgumentError, "Not enough arguments" unless arg
+        raise ArgumentError, 'Not enough arguments' unless arg
         return inject_elements(subpath[1], args) + arg + subpath[3]
       end
 

data/lib/misty/http/net_http.rb

@@ -1,14 +1,19 @@
 module Misty
   module HTTP
+    # This class implements the http request routine.
     module NetHTTP
-      def self.net_http(endpoint, ssl_verify_mode, log)
-        http = Net::HTTP.new(endpoint.host, endpoint.port)
-        http.set_debug_output(log) if log.level == Logger::DEBUG
-        if endpoint.scheme == "https"
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless ssl_verify_mode
+      def self.http_request(uri, options = {})
+        http_options = {}
+        if uri.scheme == 'https'
+          http_options[:use_ssl] = true
+          if options[:ssl_verify_mode] && options[:ssl_verify_mode] == false
+            http_options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
+          end
+        end
+
+        Net::HTTP.start(uri.host, uri.port, http_options) do |connection|
+          yield(connection)
         end
-        http
       end
     end
   end

data/lib/misty/http/request.rb

@@ -2,17 +2,23 @@ module Misty
   module HTTP
     module Request
       def decode?(response)
-        if @config.content_type != :json && response.code =~ /2??/  && !response.is_a?(Net::HTTPNoContent) \
-          && !response.is_a?(Net::HTTPResetContent) && response.header["content-type"] \
-          && response.header["content-type"].include?("application/json")
-          true
+        return false if response.body.nil? || response.body.empty?
+        if @config.content_type != :json && response.code =~ /2??/ && !response.is_a?(Net::HTTPNoContent) \
+          && !response.is_a?(Net::HTTPResetContent) && response.header['content-type'] \
+          && response.header['content-type'].include?('application/json')
+          return true
         end
+        false
       end
 
       def http(request)
-        response = @http.request(request)
-        response.body = JSON.load(response.body) if decode?(response)
-        response
+        Misty::HTTP::NetHTTP.http_request(
+          @uri, ssl_verify_mode: @options.ssl_verify_mode, log: @config.log
+        ) do |connection|
+          response = connection.request(request)
+          response.body = JSON.parse(response.body) if decode?(response)
+          response
+        end
       end
 
       def http_delete(path, headers)

data/lib/misty/misty.rb

@@ -2,12 +2,12 @@ require 'misty/services'
 
 module Misty
   HEADER_JSON = {
-    "Content-Type" => "application/json",
-    "Accept"       => "application/json"
+    'Content-Type' => 'application/json',
+    'Accept'       => 'application/json'
   }
 
   # Default log file. Use :log_file option to override
-  LOG_FILE = "misty.log"
+  LOG_FILE = 'misty.log'
   # Default log level. Use :log_level option to override
   LOG_LEVEL = Logger::INFO
 
@@ -17,42 +17,42 @@ module Misty
   CONTENT_TYPE = :ruby
 
   # Defaults Domain ID
-  DOMAIN_ID = "default"
+  DOMAIN_ID = 'default'
 
   # Default Interface
-  INTERFACE = "public"
+  INTERFACE = 'public'
 
   # Default Region ID
-  REGION_ID = "regionOne"
+  REGION_ID = 'regionOne'
 
-  # Default mode when SSL is used (uri.scheme == "https")
+  # Default mode when SSL is used (uri.scheme == 'https')
   SSL_VERIFY_MODE = true
 
   def self.services
     services = Misty::Services.new
-    services.add(:application_catalog, :murano,       ["v1"])
-    services.add(:alarming,            :aodh,         ["v2"])
-    services.add(:backup,              :freezer,      ["v1"])
-    services.add(:baremetal,           :ironic,       ["v1"])
-    services.add(:block_storage,       :cinder,       ["v3", "v2", "v1"])
-    services.add(:clustering,          :senlin,       ["v1"])
-    services.add(:compute,             :nova,         ["v2.1"])
-    services.add(:container,           :magnum,       ["v1"])
-    services.add(:data_processing,     :sahara,       ["v1.1"])
-    services.add(:data_protection,     :karbor,       ["v1"])
-    services.add(:database,            :trove,        ["v1.0"])
-    services.add(:dns,                 :designate,    ["v2"])
-    services.add(:identity,            :keystone,     ["v3", "v2.0"])
-    services.add(:image,               :glance,       ["v2", "v1"])
-    services.add(:load_balancer,       :octavia,      ["v2.0"])
-    services.add(:messaging,           :zaqar,        ["v2"])
-    services.add(:metering,            :ceilometer,   ["v2"])
-    services.add(:networking,          :neutron,      ["v2.0"])
-    services.add(:nfv_orchestration,   :tacker,       ["v1.0"])
-    services.add(:object_storage,      :swift,        ["v1"])
-    services.add(:orchestration,       :heat,         ["v1"])
-    services.add(:search,              :searchlight,  ["v1"])
-    services.add(:shared_file_systems, :manila,       ["v2"])
+    services.add(:application_catalog, :murano,       ['v1'])
+    services.add(:alarming,            :aodh,         ['v2'])
+    services.add(:backup,              :freezer,      ['v1'])
+    services.add(:baremetal,           :ironic,       ['v1'])
+    services.add(:block_storage,       :cinder,       ['v3', 'v2', 'v1'])
+    services.add(:clustering,          :senlin,       ['v1'])
+    services.add(:compute,             :nova,         ['v2.1'])
+    services.add(:container,           :magnum,       ['v1'])
+    services.add(:data_processing,     :sahara,       ['v1.1'])
+    services.add(:data_protection,     :karbor,       ['v1'])
+    services.add(:database,            :trove,        ['v1.0'])
+    services.add(:dns,                 :designate,    ['v2'])
+    services.add(:identity,            :keystone,     ['v3', 'v2.0'])
+    services.add(:image,               :glance,       ['v2', 'v1'])
+    services.add(:load_balancer,       :octavia,      ['v2.0'])
+    services.add(:messaging,           :zaqar,        ['v2'])
+    services.add(:metering,            :ceilometer,   ['v2'])
+    services.add(:networking,          :neutron,      ['v2.0'])
+    services.add(:nfv_orchestration,   :tacker,       ['v1.0'])
+    services.add(:object_storage,      :swift,        ['v1'])
+    services.add(:orchestration,       :heat,         ['v1'])
+    services.add(:search,              :searchlight,  ['v1'])
+    services.add(:shared_file_systems, :manila,       ['v2'])
     services
   end
 

data/lib/misty/openstack/aodh/v2.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/aodh/aodh_v2"
+require 'misty/openstack/aodh/aodh_v2'
 
 module Misty
   module Openstack

data/lib/misty/openstack/ceilometer/v2.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/ceilometer/ceilometer_v2"
+require 'misty/openstack/ceilometer/ceilometer_v2'
 
 module Misty
   module Openstack

data/lib/misty/openstack/cinder/v1.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/cinder/cinder_v1"
+require 'misty/openstack/cinder/cinder_v1'
 
 module Misty
   module Openstack
@@ -12,7 +12,7 @@ module Misty
         end
 
         def self.prefix_path_to_ignore
-          "/v1/{admin_tenant_id}/"
+          '/v1/{admin_tenant_id}/'
         end
 
         def self.service_names

data/lib/misty/openstack/cinder/v2.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/cinder/cinder_v2"
+require 'misty/openstack/cinder/cinder_v2'
 
 module Misty
   module Openstack
@@ -12,7 +12,7 @@ module Misty
         end
 
         def self.prefix_path_to_ignore
-          "/v2/{tenant_id}"
+          '/v2/{tenant_id}'
         end
 
         def self.service_names

data/lib/misty/openstack/cinder/v3.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/cinder/cinder_v3"
+require 'misty/openstack/cinder/cinder_v3'
 
 module Misty
   module Openstack
@@ -12,7 +12,7 @@ module Misty
         end
 
         def self.prefix_path_to_ignore
-          "/v3/{tenant_id}"
+          '/v3/{tenant_id}'
         end
 
         def self.service_names

data/lib/misty/openstack/designate/v2.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/designate/designate_v2"
+require 'misty/openstack/designate/designate_v2'
 
 module Misty
   module Openstack

data/lib/misty/openstack/freezer/v1.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/freezer/freezer_v1"
+require 'misty/openstack/freezer/freezer_v1'
 
 module Misty
   module Openstack

data/lib/misty/openstack/glance/v1.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/glance/glance_v1"
+require 'misty/openstack/glance/glance_v1'
 
 module Misty
   module Openstack

data/lib/misty/openstack/glance/v2.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/glance/glance_v2"
+require 'misty/openstack/glance/glance_v2'
 
 module Misty
   module Openstack

data/lib/misty/openstack/heat/v1.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/heat/heat_v1"
+require 'misty/openstack/heat/heat_v1'
 
 module Misty
   module Openstack
@@ -12,7 +12,7 @@ module Misty
         end
 
         def self.prefix_path_to_ignore
-          "/v1/{tenant_id}"
+          '/v1/{tenant_id}'
         end
 
         def self.service_names

data/lib/misty/openstack/ironic/v1.rb

@@ -1,6 +1,6 @@
 require 'misty/http/client'
 require 'misty/openstack/microversion'
-require "misty/openstack/ironic/ironic_v1"
+require 'misty/openstack/ironic/ironic_v1'
 
 module Misty
   module Openstack
@@ -18,7 +18,7 @@ module Misty
         end
 
         def microversion_header
-          { "X-Openstack-Ironic-API-Version" => "#{@version}" }
+          { 'X-Openstack-Ironic-API-Version' => "#{@version}" }
         end
       end
     end

data/lib/misty/openstack/karbor/v1.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require "misty/openstack/karbor/karbor_v1"
+require 'misty/openstack/karbor/karbor_v1'
 
 module Misty
   module Openstack

data/lib/misty/openstack/keystone/v2_0.rb

@@ -1,6 +1,6 @@
 require 'misty/http/client'
-require "misty/openstack/keystone/keystone_v2_0"
-require "misty/openstack/keystone/keystone_v2_0_ext"
+require 'misty/openstack/keystone/keystone_v2_0'
+require 'misty/openstack/keystone/keystone_v2_0_ext'
 
 module Misty
   module Openstack

data/lib/misty/openstack/keystone/v3.rb

@@ -1,6 +1,6 @@
 require 'misty/http/client'
-require "misty/openstack/keystone/keystone_v3"
-require "misty/openstack/keystone/keystone_v3_ext"
+require 'misty/openstack/keystone/keystone_v3'
+require 'misty/openstack/keystone/keystone_v3_ext'
 
 module Misty
   module Openstack

data/lib/misty/openstack/magnum/v1.rb

@@ -1,6 +1,6 @@
 require 'misty/http/client'
 require 'misty/openstack/microversion'
-require "misty/openstack/magnum/magnum_v1"
+require 'misty/openstack/magnum/magnum_v1'
 
 module Misty
   module Openstack
@@ -18,7 +18,7 @@ module Misty
         end
 
         def microversion_header
-          { "X-Openstack-API-Version" => "#{baseclass.downcase} #{@version}" }
+          {'X-Openstack-API-Version' => "#{baseclass.downcase} #{@version}" }
         end
       end
     end

data/lib/misty/openstack/manila/v2.rb

@@ -1,6 +1,6 @@
 require 'misty/http/client'
 require 'misty/openstack/microversion'
-require "misty/openstack/manila/manila_v2"
+require 'misty/openstack/manila/manila_v2'
 
 module Misty
   module Openstack
@@ -18,7 +18,7 @@ module Misty
         end
 
         def microversion_header
-          { "X-Openstack-Manila-API-Version" => "#{@version}" }
+          { 'X-Openstack-Manila-API-Version' => "#{@version}" }
         end
       end
     end

data/lib/misty/openstack/microversion.rb

@@ -28,7 +28,7 @@ module Misty
 
       def version_by_number(number)
         versions.each do |version|
-          return number if version["min_version"] <= number && version["version"] >= number
+          return number if version['min_version'] <= number && version['version'] >= number
         end
         raise VersionError, "Version #{number} is out of range of available versions #{versions}"
       end
@@ -36,25 +36,25 @@ module Misty
       def version_by_state(state)
         version_details = nil
         versions.each do |version|
-          if version["status"] == state
+          if version['status'] == state
             version_details = version
             break
           end
         end
         raise VersionError, "Version #{state} is not available among #{versions}" if version_details.nil?
-        if version_details["version"].empty?
+        if version_details['version'].empty?
           @microversion = false
-          return ""
+          return ''
         end
-        version_details["version"]
+        version_details['version']
       end
 
       def versions_fetch
-        request = Net::HTTP::Get.new("/", headers_default)
-        response = @http.request request
+        response = http_get('/', headers_default)
         raise VersionError, "Code: #{response.code}, Message: #{response.msg}" unless response.code =~ /2??/
-        list = JSON.load(response.body)["versions"]
-        raise VersionError, "Missing version data" unless list
+        data = response.body.is_a?(Hash) ? response.body : JSON.parse(response.body)
+        list = data['versions']
+        raise VersionError, 'Missing version data' unless list
         list
       end
     end