misty 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf1c5c6f54a2f26de7e2a55a2d5f4bd169e68431
-  data.tar.gz: 1e471a166e49dd7c4d10441593a39976f2662c8f
+  metadata.gz: 6a18dd08ce931589520a2cffc3a0680fc43e97d1
+  data.tar.gz: cc92b5a1fa75a36b6702094f2fdaf88aa5153879
 SHA512:
-  metadata.gz: bbbd202a09f147d4cd8e5a100efc2028b32e76cac9bacd44cc6d0a5a8979b940d2f69000f808e8c4c868d860ef771731b39002f759a167e79c11658fc0f400c6
-  data.tar.gz: 03aab150f96558bf2a3428a4c31447248cade4790f2462ee1edc28e0b65a12f4dfbc49041b8ce1c992927648b916df50b7dc0782e2b219a2ce80dcf6bbad4bd6
+  metadata.gz: b4e83f60c35a1a28fd96a9b3066d90d2fab52b5bad92ececbe35c690add1cc2c07118b5f6c50b789d43a136a28860a7fe1ce4602aabe58095414cd18978465cb
+  data.tar.gz: 51295685e0f48004e97216b5423b6f32c8ac2ac3861c226efe4c6af834567b50fafb2dd559493e78cd505da9fcb7da0af49038345e200d7778a1983be7569c76

data/README.md

@@ -264,7 +264,7 @@ The following options are applied to each service unless specifically provided f
   Default: `:ruby`
 
 ### Services Options
-Each service can get parameters to be specified.
+Each service can have specific parameters.
 
 ```ruby
 openstack = Misty::Cloud.new(:auth => auth, :identity => {}, :compute => {})
@@ -279,7 +279,10 @@ The following options are available:
   Type: String  
 * :base_url  
   Allows to force the base URL for every requests.  
-  Type: String  
+  Type: String        
+* :headers
+  Optional headers
+  Type: Hash
 * :interface  
   Allows to provide an alternate interface. Allowed values are "public", "internal" or "admin"  
   Type: String  

data/lib/misty/auth.rb

@@ -32,11 +32,9 @@ module Misty
         raise URLError, 'No URL provided' if auth[:url].nil? || auth[:url].empty?
         @uri = URI.parse(auth[:url])
         @config = config
-        # autheticate
         @credentials = set_credentials(auth)
         @token, @catalog, @expires = set(authenticate)
       end
-      #byebug unless config.is_a?(Misty::Cloud::Config)
     end
 
     def authenticate
@@ -44,10 +42,9 @@ module Misty
         @uri, ssl_verify_mode: @config.ssl_verify_mode, log: @config.log
       ) do |connection|
         response = connection.post(self.class.path, @credentials.to_json,
-                                   Misty::HEADER_JSON)
+          { 'Content-Type' => 'application/json', 'Accept' => 'application/json' })
         unless response.code =~ /200|201/
-          raise AuthenticationError,
-                "Response code=#{response.code}, Msg=#{response.msg}"
+          raise AuthenticationError, "Response code=#{response.code}, Msg=#{response.msg}"
         end
         response
       end
@@ -60,18 +57,32 @@ module Misty
       Time.parse(@expires) < Time.now.utc
     end
 
-    def get_endpoint(service_names, region, interface)
-      @catalog.each do |catalog|
-        if service_names.include? catalog['type']
-          return catalog_endpoints(catalog['endpoints'], region, interface)
-        end
+    def get_url(service_names, region_id, interface)
+      find_url(get_service(service_names), region_id, interface)
+    end
+
+    def get_service(service_names)
+      @catalog.each do |service|
+        return service if service_names.include?(service['type'])
       end
-      raise CatalogError, "No service found with either #{service_names} name, region #{region}, interface #{interface}"
+      raise CatalogError, "No service '#{service_names}' found."
     end
 
     def get_token
       @token, @catalog, @expires = set(authenticate) if expired?
       @token
     end
+
+    def find_url(service, region_id, interface)
+      if service['endpoints']
+        service['endpoints'].each do |endpoint|
+          if (url = self.class.get_url(endpoint, region_id, interface))
+            return url
+          end
+        end
+      end
+      message = "No endpoint found: service '#{service['type']}', region '#{region_id}', interface '#{interface}'"
+      raise CatalogError, message
+    end
   end
 end

data/lib/misty/auth/auth_v2.rb

@@ -6,12 +6,8 @@ module Misty
       '/v2.0/tokens'
     end
 
-    def catalog_endpoints(endpoints, region, interface)
-      endpoints.each do |endpoint|
-        if endpoint['region'] == region && endpoint["#{interface}URL"]
-          return endpoint["#{interface}URL"]
-        end
-      end
+    def self.get_url(endpoint, region_id, interface)
+      return endpoint["#{interface}URL"] if endpoint['region'] == region_id && endpoint["#{interface}URL"]
     end
 
     def credentials
@@ -41,12 +37,6 @@ module Misty
       }
     end
 
-    def get_endpoint_url(endpoints, region, interface)
-      endpoint = endpoints.select { |ep| !ep[interface].empty? }
-      raise CatalogError, "No endpoint available for region '#{region}' and interface '#{interface}'" unless endpoint
-      endpoint[0][interface]
-    end
-
     def set(response)
       payload = JSON.load(response.body)
       token   = payload['access']['token']['id']

data/lib/misty/auth/auth_v3.rb

@@ -6,12 +6,8 @@ module Misty
       '/v3/auth/tokens'
     end
 
-    def catalog_endpoints(endpoints, region, interface)
-      endpoints.each do |endpoint|
-        if endpoint['region_id'] == region && endpoint['interface'] == interface
-          return endpoint['url']
-        end
-      end
+    def self.get_url(endpoint, region_id, interface)
+      return endpoint['url'] if endpoint['region_id'] == region_id && endpoint['interface'] == interface
     end
 
     def credentials
@@ -34,12 +30,6 @@ module Misty
       }
     end
 
-    def get_endpoint_url(endpoints, region, interface)
-      endpoint = endpoints.select { |ep| ep['region_id'] == region && ep['interface'] == interface }
-      raise CatalogError, "No endpoint available for region '#{region}' and interface '#{interface}'" unless endpoint
-      endpoint[0]['url']
-    end
-
     def scope
       return @project.identity if @project
       return @domain.identity if @domain

data/lib/misty/http/client.rb

@@ -37,22 +37,24 @@ module Misty
       #    :base_path => nil
       #   URL can be forced (Helps when setup is broken)
       #    :base_url => nil
+      #   Optional headers
+      #    :headers => {}
       #   Endpoint type (admin, public or internal)
-      #     :interface => "public"
+      #    :interface => "public"
       #   Region ID
       #    :region_id => "regionOne"
       #   Service name
       #    The Service names are pre defined but more can be added using this option.
       #    :service_name
       #   SSL Verify Mode
-      #     :ssl_verify_mode => true
+      #    :ssl_verify_mode => true
       #   (micro)version: Can be numbered (3.1) or by state (CURRENT, LATEST or SUPPORTED)
       #     :version => "CURRENT"
       def initialize(auth, config, options)
         @auth = auth
         @config = config
         @options = setup(options)
-        @uri = URI.parse(@auth.get_endpoint(@options.service_names, @options.region_id, @options.interface))
+        @uri = URI.parse(@auth.get_url(@options.service_names, @options.region_id, @options.interface))
         @base_path = @options.base_path ? @options.base_path : @uri.path
         @base_path = @base_path.chomp('/')
         @version = nil
@@ -70,15 +72,14 @@ module Misty
         ''
       end
 
-      def headers_default
-        Misty::HEADER_JSON
-      end
-
       def headers
-        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
+        header = {}
+        header.merge!({'Content-Type' => 'application/json', 'Accept' => 'application/json'})
+        header.merge!('X-Auth-Token' => @auth.get_token.to_s)
+        header.merge!(@config.headers) if @config.headers
+        header.merge!(@options.headers) if @options.headers
+        header.merge!(microversion_header) if microversion
+        header
       end
 
       private
@@ -95,7 +96,7 @@ module Misty
         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.headers             = params[:headers]         ? params[:headers] : {}
         options.version             = params[:version]         ? params[:version] : 'CURRENT'
 
         unless INTERFACES.include?(options.interface)

data/lib/misty/microversion.rb

@@ -0,0 +1,63 @@
+module Misty
+  module Microversion
+    class VersionError < RuntimeError; end
+
+    VERSION_STATES = %w{CURRENT LATEST SUPPORTED}
+
+    def initialize(auth, cloud, options)
+      super
+      @microversion = true
+      @version = version_get(@options.version)
+    end
+
+    def microversion_header
+      {'X-Openstack-API-Version' => "#{baseclass.downcase} #{@version}" }
+    end
+
+    def version_get(version_option)
+      if VERSION_STATES.include?(version_option)
+        return version_by_state(version_option)
+      else
+        return version_by_number(version_option)
+      end
+    end
+
+    def versions
+      @versions ||= versions_fetch
+    end
+
+    private
+
+    def version_by_number(number)
+      versions.each do |version|
+        return number if version['min_version'] <= number && version['version'] >= number
+      end
+      raise VersionError, "Version #{number} is out of range of available versions #{versions}"
+    end
+
+    def version_by_state(state)
+      version_details = nil
+      versions.each do |version|
+        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?
+        @microversion = false
+        return ''
+      end
+      version_details['version']
+    end
+
+    def versions_fetch
+      response = http_get('/', {'Accept'=> 'application/json'})
+      raise VersionError, "Code: #{response.code}, Message: #{response.msg}" unless response.code =~ /2??/
+      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
+end

data/lib/misty/misty.rb

@@ -5,11 +5,11 @@ module Misty
     { name: :application_catalog,                 project: :murano,      versions: ['v1']},
     { name: :alarming,                            project: :aodh,        versions: ['v2']},
     { name: :backup,                              project: :freezer,     versions: ['v1']},
-    { name: :baremetal,                           project: :ironic,      versions: nil,          microversion: 'v1'},
-    { name: :block_storage,                       project: :cinder,      versions: ['v2', 'v1'], microversion: 'v3'},
+    { name: :baremetal,                           project: :ironic,      microversion: 'v1'},
+    { name: :block_storage,                       project: :cinder,      microversion: 'v3', versions: ['v2', 'v1']},
     { name: :clustering,                          project: :senlin,      versions: ['v1']},
-    { name: :compute,                             project: :nova,        versions: nil,          microversion: 'v2.1'},
-    { name: :container_infrastructure_management, project: :magnum,      versions: nil,          microversion: 'v1'},
+    { name: :compute,                             project: :nova,        microversion: 'v2.1'},
+    { name: :container_infrastructure_management, project: :magnum,      microversion: 'v1'},
     { name: :data_processing,                     project: :sahara,      versions: ['v1.1']},
     { name: :data_protection_orchestration,       project: :karbor,      versions: ['v1']},
     { name: :database,                            project: :trove,       versions: ['v1.0']},
@@ -24,14 +24,9 @@ module Misty
     { name: :object_storage,                      project: :swift,       versions: ['v1']},
     { name: :orchestration,                       project: :heat,        versions: ['v1']},
     { name: :search,                              project: :searchlight, versions: ['v1']},
-    { name: :shared_file_systems,                 project: :manila,      versions: nil,          microversion: 'v2'}
+    { name: :shared_file_systems,                 project: :manila,      microversion: 'v2'}
   ]
 
-  HEADER_JSON = {
-    'Content-Type' => 'application/json',
-    'Accept'       => 'application/json'
-  }
-
   # Default REST content type. Use :json or :ruby
   CONTENT_TYPE = :ruby
 

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

@@ -1,4 +1,5 @@
 require 'misty/http/client'
+require 'misty/microversion'
 require 'misty/openstack/cinder/cinder_v3'
 
 module Misty
@@ -6,6 +7,7 @@ module Misty
     module Cinder
       class V3 < Misty::HTTP::Client
         extend Misty::Openstack::CinderV3
+        include Misty::Microversion
 
         def self.api
           v3

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

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require 'misty/openstack/microversion'
+require 'misty/microversion'
 require 'misty/openstack/ironic/ironic_v1'
 
 module Misty
@@ -7,7 +7,7 @@ module Misty
     module Ironic
       class V1 < Misty::HTTP::Client
         extend Misty::Openstack::IronicV1
-        include Misty::HTTP::Microversion
+        include Misty::Microversion
 
         def self.api
           v1
@@ -16,10 +16,6 @@ module Misty
         def self.service_names
           %w{baremetal}
         end
-
-        def microversion_header
-          { 'X-Openstack-Ironic-API-Version' => "#{@version}" }
-        end
       end
     end
   end

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

@@ -16,10 +16,6 @@ module Misty
         def self.service_names
           %w{container}
         end
-
-        def microversion_header
-          {'X-Openstack-API-Version' => "#{baseclass.downcase} #{@version}" }
-        end
       end
     end
   end

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

@@ -1,13 +1,13 @@
 require 'misty/http/client'
-require 'misty/openstack/microversion'
+require 'misty/microversion'
 require 'misty/openstack/manila/manila_v2'
 
 module Misty
   module Openstack
     module Manila
-        class V2 < Misty::HTTP::Client
-          extend Misty::Openstack::ManilaV2
-          include Misty::HTTP::Microversion
+      class V2 < Misty::HTTP::Client
+        extend Misty::Openstack::ManilaV2
+        include Misty::Microversion
 
         def self.api
           v2
@@ -16,10 +16,6 @@ module Misty
         def self.service_names
           %w{shared-file-systems shared}
         end
-
-        def microversion_header
-          { 'X-Openstack-Manila-API-Version' => "#{@version}" }
-        end
       end
     end
   end

data/lib/misty/openstack/nova/v2_1.rb

@@ -1,5 +1,5 @@
 require 'misty/http/client'
-require 'misty/openstack/microversion'
+require 'misty/microversion'
 require 'misty/openstack/nova/nova_v2_1'
 
 module Misty
@@ -7,7 +7,7 @@ module Misty
     module Nova
       class V2_1 < Misty::HTTP::Client
         extend Misty::Openstack::NovaV2_1
-        include Misty::HTTP::Microversion
+        include Misty::Microversion
 
         def self.api
           v2_1
@@ -27,12 +27,11 @@ module Misty
         end
 
         def microversion_header
-          {
-            # Remove once depcrecated
-            'X-Openstack-Nova-API-Version' => "#{@version}",
-            # From version 2.27 the OpenStack-API-Version is used
-            'X-Openstack-API-Version' => "#{baseclass.downcase} #{@version}"
-          }
+          # Versions 2.27+ use default OpenStack-API-Version
+          header = super
+          # For prior vesions then remove once depcrecated
+          header.merge!('X-Openstack-Nova-API-Version' => "#{@version}",)
+          header
         end
       end
     end

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

@@ -11,6 +11,10 @@ module Misty
           v1
         end
 
+        def self.prefix_path_to_ignore
+          '/v1/{account}'
+        end
+
         def self.service_names
           %w{object-storage object-store}
         end

data/lib/misty/service.rb

@@ -10,10 +10,10 @@ module Misty
     end
 
     def to_s
-      res = "#{name}: #{project}"
-      res << ", versions: #{@versions}" if @versions
-      res << ", microversion: #{@microversion}" if @microversion
-      res
+      str = "#{name}: #{project}"
+      str << ", versions: #{@versions}" if @versions
+      str << ", microversion: #{@microversion}" if @microversion
+      str
     end
 
     def version(api_version = nil)
@@ -23,18 +23,11 @@ module Misty
       default_version
     end
 
+    private
+
     def default_version
       return @microversion if @microversion
       return self.versions.sort[-1]
     end
-
-    def version=(val)
-      if @versions.include?(val)
-        @version = val
-      else
-        # Use highest version
-        @version = versions.sort[-1]
-      end
-    end
   end
 end

data/lib/misty/version.rb

@@ -1,3 +1,3 @@
 module Misty
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/test/integration/test_helper.rb

@@ -1,3 +1,5 @@
+$VERBOSE = nil
+
 require 'misty'
 require 'minitest/autorun'
 require 'vcr'

data/test/unit/auth_test.rb

@@ -177,12 +177,12 @@ describe Misty::Auth do
         auth.catalog.must_equal ['catalog_data']
       end
 
-      it '#get_endpoint' do
+      it '#get_url' do
         stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
         to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {'x-subject-token'=>'token_data'})
 
         auth = Misty::AuthV3.new(authv3_creds, config)
-        auth.get_endpoint(%w{identity}, 'regionOne', 'public').must_equal 'http://localhost'
+        auth.get_url(%w{identity}, 'regionOne', 'public').must_equal 'http://localhost'
       end
     end
   end
@@ -289,12 +289,12 @@ describe Misty::Auth do
         auth.catalog.must_equal ['catalog_data']
       end
 
-      it '#get_endpoint' do
+      it '#get_url' do
         stub_request(:post, 'http://localhost:5000/v2.0/tokens').
           to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
         auth = Misty::AuthV2.new(authv2_creds, config)
-        auth.get_endpoint(%w{identity}, 'regionOne', 'public').must_equal 'http://localhost'
+        auth.get_url(%w{identity}, 'regionOne', 'public').must_equal 'http://localhost'
       end
     end
   end

data/test/unit/cloud/services_test.rb

@@ -33,7 +33,6 @@ describe 'Misty::Cloud' do
   let(:auth_headers) do
     { 'Accept' => 'application/json',
       'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-      'Content-Type'    => 'application/json',
       'User-Agent'      => 'Ruby' }
   end
 
@@ -94,6 +93,10 @@ describe 'Misty::Cloud' do
       with(:body => JSON.dump(auth_body), :headers => auth_headers).
       to_return(:status => 200, :body => JSON.dump(auth_response_v3('volume', 'cinder')), :headers => token_header)
 
+    stub_request(:get, 'http://localhost/').
+      with(:headers => auth_headers).
+      to_return(:status => 200, :body => JSON.dump(versions), :headers => {})
+
     cloud.block_storage.must_be_kind_of Misty::Openstack::Cinder::V3
   end
 

data/test/unit/http/client_test.rb

@@ -21,12 +21,6 @@ describe Misty::HTTP::Client do
     end
   end
 
-  describe '#headers_default' do
-    it 'returns hash' do
-      service.headers_default.must_be_kind_of Hash
-    end
-  end
-
   describe '#headers' do
     it 'returns hash' do
       service.headers.must_be_kind_of Hash

data/test/unit/{openstack/microversion_test.rb → microversion_test.rb}

@@ -1,9 +1,9 @@
 require 'test_helper'
 require 'auth_helper'
 require 'misty/http/client'
-require 'misty/openstack/microversion'
+require 'misty/microversion'
 
-describe Misty::HTTP::Microversion do
+describe Misty::Microversion do
   let(:versions_data) do
     { 'versions' =>
       [{ 'status' => 'SUPPORTED',
@@ -23,7 +23,7 @@ describe Misty::HTTP::Microversion do
   let(:microversion_service) do
     auth = Minitest::Mock.new
 
-    def auth.get_endpoint(*args)
+    def auth.get_url(*args)
       'http://localhost'
     end
 
@@ -39,7 +39,7 @@ describe Misty::HTTP::Microversion do
     setup.ssl_verify_mode = Misty::SSL_VERIFY_MODE
 
     stub_request(:get, 'http://localhost/').
-      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json'}).
+      with(:headers => {'Accept'=>'application/json'}).
       to_return(:status => 200, :body => JSON.dump(versions_data), :headers => {})
 
     Misty::Openstack::Nova::V2_1.new(auth, setup, {})
@@ -57,19 +57,19 @@ describe Misty::HTTP::Microversion do
     it 'fails when version is not within supporterd interval' do
       proc do
         microversion_service.version_get('2.0')
-      end.must_raise Misty::HTTP::Microversion::VersionError
+      end.must_raise Misty::Microversion::VersionError
     end
 
     it 'fails when LATEST version is not available' do
       proc do
         microversion_service.version_get('LATEST')
-      end.must_raise Misty::HTTP::Microversion::VersionError
+      end.must_raise Misty::Microversion::VersionError
     end
 
     it 'fails when using an invalid version State' do
       proc do
         microversion_service.version_get('OTHER')
-      end.must_raise Misty::HTTP::Microversion::VersionError
+      end.must_raise Misty::Microversion::VersionError
     end
   end
 end

data/test/unit/service_helper.rb

@@ -1,13 +1,13 @@
 require 'misty/http/client'
 
 def request_header
-  {'Accept'=>'application/json', 'Content-Type'=>'application/json'}
+  {'Accept' => 'application/json'}
 end
 
 def service(content_type = :ruby)
   auth = Minitest::Mock.new
 
-  def auth.get_endpoint(*args)
+  def auth.get_url(*args)
     'http://localhost'
   end
 

data/test/unit/test_helper.rb

@@ -1,3 +1,5 @@
+$VERBOSE = nil
+
 require 'minitest/autorun'
 require 'webmock/minitest'
 require 'misty'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: misty
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Gilles Dubreuil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -138,6 +138,7 @@ files:
 - lib/misty/http/method_builder.rb
 - lib/misty/http/net_http.rb
 - lib/misty/http/request.rb
+- lib/misty/microversion.rb
 - lib/misty/misty.rb
 - lib/misty/openstack/aodh/aodh_v2.rb
 - lib/misty/openstack/aodh/v2.rb
@@ -173,7 +174,6 @@ files:
 - lib/misty/openstack/magnum/v1.rb
 - lib/misty/openstack/manila/manila_v2.rb
 - lib/misty/openstack/manila/v2.rb
-- lib/misty/openstack/microversion.rb
 - lib/misty/openstack/murano/murano_v1.rb
 - lib/misty/openstack/murano/v1.rb
 - lib/misty/openstack/neutron/neutron_v2_0.rb
@@ -216,9 +216,9 @@ files:
 - test/unit/http/direct_test.rb
 - test/unit/http/method_builder_test.rb
 - test/unit/http/request_test.rb
+- test/unit/microversion_test.rb
 - test/unit/misty_test.rb
 - test/unit/openstack/APIs_test.rb
-- test/unit/openstack/microversion_test.rb
 - test/unit/service_helper.rb
 - test/unit/services_test.rb
 - test/unit/test_helper.rb
@@ -235,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Misty is an OpenStack API client

data/lib/misty/openstack/microversion.rb

@@ -1,62 +0,0 @@
-module Misty
-  # TODO: move to Openstack module
-  module HTTP
-    module Microversion
-      class VersionError < RuntimeError; end
-
-      VERSION_STATES = %w{CURRENT LATEST SUPPORTED}
-
-      def initialize(auth, cloud, options)
-        super
-        @microversion = true
-        @version = version_get(@options.version)
-      end
-
-      def version_get(version_option)
-        if VERSION_STATES.include?(version_option)
-          return version_by_state(version_option)
-        else
-          return version_by_number(version_option)
-        end
-      end
-
-      def versions
-        @versions ||= versions_fetch
-      end
-
-      private
-
-      def version_by_number(number)
-        versions.each do |version|
-          return number if version['min_version'] <= number && version['version'] >= number
-        end
-        raise VersionError, "Version #{number} is out of range of available versions #{versions}"
-      end
-
-      def version_by_state(state)
-        version_details = nil
-        versions.each do |version|
-          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?
-          @microversion = false
-          return ''
-        end
-        version_details['version']
-      end
-
-      def versions_fetch
-        response = http_get('/', headers_default)
-        raise VersionError, "Code: #{response.code}, Message: #{response.msg}" unless response.code =~ /2??/
-        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
-  end
-end