misty 1.4.0 → 1.5.1

data/test/unit/openstack/APIs_test.rb

@@ -21,8 +21,8 @@ end
 
 def api_validate(project, version)
   it "#{project} #{version} loads a valid api structure" do
-    require "misty/openstack/#{project}/#{project}_#{Misty::Cloud.dot_to_underscore(version)}"
-    klass = Object.const_get("Misty::Openstack::#{project.capitalize}#{Misty::Cloud.dot_to_underscore(version).capitalize}")
+    require "misty/openstack/api/#{project}/#{project}_#{Misty::Cloud.dot_to_underscore(version)}"
+    klass = Object.const_get("Misty::Openstack::API::#{project.capitalize}#{Misty::Cloud.dot_to_underscore(version).capitalize}")
     client = Object.new
     client.extend(klass)
     client.tag.must_match /API/
@@ -30,15 +30,11 @@ def api_validate(project, version)
   end
 end
 
-# Assert each version of OpenStack project loads a valid api structure
+#  Assert each version of OpenStack project loads a valid api structure
 describe 'Openstack API' do
   Misty.services.each do |service|
-    if service.versions
-      service.versions.each do |version|
-        api_validate(service.project, version)
-      end
-    elsif service.microversion && !service.microversion.empty?
-      api_validate(service.project, service.microversion)
+    service.versions.each do |version|
+      api_validate(service.project, version)
     end
   end
 end

data/test/unit/openstack/extension_test.rb

@@ -38,22 +38,22 @@ describe Misty::Openstack::Extension do
     v1
   end
 
-  describe "Succesful" do
-    it "Adds methods to existing Verb" do
+  describe "succesful" do
+    it "adds methods to existing Verb" do
       v1.api["/v1/resource1"][:POST].must_include :method11
     end
 
-    it "Adds Verb" do
+    it "adds Verb" do
       v1.api["/v1/resource1"].must_include :PUT
     end
 
-    it "Adds Resource" do
+    it "adds Resource" do
       v1.api.must_include "/v1/resource3"
     end
   end
 
-  describe "Fails" do
-    it "Raise RuntimeError when a resource already exist" do
+  describe "fails" do
+    it "raise error when a resource already exists" do
       class << v1
         def api_ext
           { "/v1/resource1" => { :POST => [:method1] } }

data/test/unit/openstack/service_test.rb

@@ -15,10 +15,8 @@ describe Misty::Openstack::Service do
     end
 
     it "returns String when defined in API's module" do
-      class << service
-        def prefix_path_to_ignore
-          '/v3/{tenant_id}'
-        end
+      def service.prefix_path_to_ignore
+        '/v3/{tenant_id}'
       end
 
       service.prefix_path_to_ignore.must_equal '/v3/{tenant_id}'
@@ -33,12 +31,6 @@ describe Misty::Openstack::Service do
     end
   end
 
-  describe '#baseclass' do
-    it 'returns base class name' do
-      service.send(:baseclass).must_equal 'V2_0'
-    end
-  end
-
   describe 'headers' do
     it 'returns default global along with token' do
       service.headers.get.must_equal ({"Accept"=>"application/json; q=1.0"})

data/test/unit/service_helper.rb

@@ -1,4 +1,4 @@
-require 'misty/client_pack'
+require 'misty/openstack/service_pack'
 require 'auth_helper'
 
 def request_header
@@ -21,14 +21,9 @@ def service(param_content_type = :hash, params = {})
   stub_request(:post, "http://localhost:5000/v3/auth/tokens").
     with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}",
        :headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
-    to_return(:status => 200, :body =>  JSON.dump(auth_response_v3('networking', 'neutron')), :headers => {'x-subject-token'=>'token_data'})
+    to_return(:status => 200, :body =>  JSON.dump(auth_response_v3('network', 'neutron')), :headers => {'x-subject-token'=>'token_data'})
 
   config = Misty::Config.new(arg)
 
-# TODO: remove
-#  stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
-#    with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}").
-#    to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
-
-  Misty::Openstack::Neutron::V2_0.new(config.get_service(:networking))
+  Misty::Openstack::API::Neutron::V2_0.new(config.get_service(:network))
 end

data/test/unit/services_test.rb

@@ -4,17 +4,17 @@ describe 'Services' do
   describe '#add' do
     it 'Adds a service' do
       services = Misty::Services.new
-      services.add(name: :service_name, project: :project_name, versions: ['v1', 'v2.0'], microversion: 'v3')
+      services.add(type: :service_type, project: :project_name, versions: ['v1', 'v2.0'], microversion: 'v2.12')
       service = services.services[0]
 
       services.services.size.must_equal 1
       service.must_be_kind_of Misty::Service
-      service.name.must_equal :service_name
+      service.type.must_equal :service_type
       service.project.must_equal :project_name
       service.versions.must_include 'v1'
-      service.microversion.must_equal 'v3'
-      service.default_version.must_equal 'v3'
-      services.to_s.must_equal %Q{service_name: project_name, versions: ["v1", "v2.0"], microversion: v3\n}
+      service.microversion.must_equal 'v2.12'
+      service.default_version.must_equal 'v2.0'
+      services.to_s.must_equal %Q(service_type: project_name, versions: ["v1", "v2.0"], microversion: v2.12\n)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: misty
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Gilles Dubreuil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -140,15 +140,17 @@ files:
 - LICENSE.md
 - README.md
 - lib/misty.rb
-- lib/misty/auth.rb
-- lib/misty/auth/auth_v2.rb
-- lib/misty/auth/auth_v3.rb
+- lib/misty/auth/catalog.rb
+- lib/misty/auth/catalog/v2.rb
+- lib/misty/auth/catalog/v3.rb
 - lib/misty/auth/name.rb
-- lib/misty/autoload.rb
-- lib/misty/client_pack.rb
+- lib/misty/auth/token.rb
+- lib/misty/auth/token/v2.rb
+- lib/misty/auth/token/v3.rb
 - lib/misty/cloud.rb
 - lib/misty/config.rb
 - lib/misty/errors.rb
+- lib/misty/helper.rb
 - lib/misty/http/direct.rb
 - lib/misty/http/header.rb
 - lib/misty/http/method_builder.rb
@@ -156,77 +158,100 @@ files:
 - 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
-- lib/misty/openstack/ceilometer/ceilometer_v2.rb
-- lib/misty/openstack/ceilometer/v2.rb
-- lib/misty/openstack/cinder/cinder_v1.rb
-- lib/misty/openstack/cinder/cinder_v2.rb
-- lib/misty/openstack/cinder/cinder_v3.rb
-- lib/misty/openstack/cinder/v1.rb
-- lib/misty/openstack/cinder/v2.rb
-- lib/misty/openstack/cinder/v3.rb
-- lib/misty/openstack/designate/designate_v2.rb
-- lib/misty/openstack/designate/v2.rb
+- lib/misty/openstack.rb
+- lib/misty/openstack/api/aodh/aodh_v2.rb
+- lib/misty/openstack/api/aodh/v2.rb
+- lib/misty/openstack/api/barbican/barbican_v1.rb
+- lib/misty/openstack/api/barbican/v1.rb
+- lib/misty/openstack/api/blazar/blazar_v1.rb
+- lib/misty/openstack/api/blazar/v1.rb
+- lib/misty/openstack/api/ceilometer/ceilometer_v2.rb
+- lib/misty/openstack/api/ceilometer/v2.rb
+- lib/misty/openstack/api/cinder/cinder_v1.rb
+- lib/misty/openstack/api/cinder/cinder_v2.rb
+- lib/misty/openstack/api/cinder/cinder_v3.rb
+- lib/misty/openstack/api/cinder/v1.rb
+- lib/misty/openstack/api/cinder/v2.rb
+- lib/misty/openstack/api/cinder/v3.rb
+- lib/misty/openstack/api/designate/designate_v2.rb
+- lib/misty/openstack/api/designate/v2.rb
+- lib/misty/openstack/api/freezer/freezer_v1.rb
+- lib/misty/openstack/api/freezer/v1.rb
+- lib/misty/openstack/api/glance/glance_v1.rb
+- lib/misty/openstack/api/glance/glance_v2.rb
+- lib/misty/openstack/api/glance/v1.rb
+- lib/misty/openstack/api/glance/v2.rb
+- lib/misty/openstack/api/gnocchi/gnocchi_v1.rb
+- lib/misty/openstack/api/gnocchi/v1.rb
+- lib/misty/openstack/api/heat/heat_v1.rb
+- lib/misty/openstack/api/heat/v1.rb
+- lib/misty/openstack/api/ironic/ironic_v1.rb
+- lib/misty/openstack/api/ironic/v1.rb
+- lib/misty/openstack/api/karbor/karbor_v1.rb
+- lib/misty/openstack/api/karbor/v1.rb
+- lib/misty/openstack/api/keystone/keystone_v2_0.rb
+- lib/misty/openstack/api/keystone/keystone_v2_0_ext.rb
+- lib/misty/openstack/api/keystone/keystone_v3.rb
+- lib/misty/openstack/api/keystone/keystone_v3_ext.rb
+- lib/misty/openstack/api/keystone/v2_0.rb
+- lib/misty/openstack/api/keystone/v3.rb
+- lib/misty/openstack/api/magnum/magnum_v1.rb
+- lib/misty/openstack/api/magnum/v1.rb
+- lib/misty/openstack/api/manila/manila_v2.rb
+- lib/misty/openstack/api/manila/v2.rb
+- lib/misty/openstack/api/masakari/masakari_v1_0.rb
+- lib/misty/openstack/api/masakari/v1_0.rb
+- lib/misty/openstack/api/mistral/mistral_v2.rb
+- lib/misty/openstack/api/mistral/v2.rb
+- lib/misty/openstack/api/monasca/monasca_v2_0.rb
+- lib/misty/openstack/api/monasca/v2_0.rb
+- lib/misty/openstack/api/murano/murano_v1.rb
+- lib/misty/openstack/api/murano/v1.rb
+- lib/misty/openstack/api/neutron/neutron_v2_0.rb
+- lib/misty/openstack/api/neutron/v2_0.rb
+- lib/misty/openstack/api/nova/nova_v2_1.rb
+- lib/misty/openstack/api/nova/v2_1.rb
+- lib/misty/openstack/api/octavia/octavia_v2_0.rb
+- lib/misty/openstack/api/octavia/v2_0.rb
+- lib/misty/openstack/api/panko/panko_v2.rb
+- lib/misty/openstack/api/panko/v2.rb
+- lib/misty/openstack/api/placement/placement_v2_1.rb
+- lib/misty/openstack/api/placement/v2_1.rb
+- lib/misty/openstack/api/sahara/sahara_v1_1.rb
+- lib/misty/openstack/api/sahara/v1_1.rb
+- lib/misty/openstack/api/searchlight/searchlight_v1.rb
+- lib/misty/openstack/api/searchlight/v1.rb
+- lib/misty/openstack/api/senlin/senlin_v1.rb
+- lib/misty/openstack/api/senlin/v1.rb
+- lib/misty/openstack/api/swift/swift_v1.rb
+- lib/misty/openstack/api/swift/v1.rb
+- lib/misty/openstack/api/tacker/tacker_v1_0.rb
+- lib/misty/openstack/api/tacker/v1_0.rb
+- lib/misty/openstack/api/trove/trove_v1_0.rb
+- lib/misty/openstack/api/trove/v1_0.rb
+- lib/misty/openstack/api/watcher/v1.rb
+- lib/misty/openstack/api/watcher/watcher_v1.rb
+- lib/misty/openstack/api/zaqar/v2.rb
+- lib/misty/openstack/api/zaqar/zaqar_v2.rb
+- lib/misty/openstack/api/zun/v1.rb
+- lib/misty/openstack/api/zun/zun_v1.rb
 - lib/misty/openstack/extension.rb
-- lib/misty/openstack/freezer/freezer_v1.rb
-- lib/misty/openstack/freezer/v1.rb
-- lib/misty/openstack/glance/glance_v1.rb
-- lib/misty/openstack/glance/glance_v2.rb
-- lib/misty/openstack/glance/v1.rb
-- lib/misty/openstack/glance/v2.rb
-- lib/misty/openstack/heat/heat_v1.rb
-- lib/misty/openstack/heat/v1.rb
-- lib/misty/openstack/ironic/ironic_v1.rb
-- lib/misty/openstack/ironic/v1.rb
-- lib/misty/openstack/karbor/karbor_v1.rb
-- lib/misty/openstack/karbor/v1.rb
-- lib/misty/openstack/keystone/keystone_v2_0.rb
-- lib/misty/openstack/keystone/keystone_v2_0_ext.rb
-- lib/misty/openstack/keystone/keystone_v3.rb
-- lib/misty/openstack/keystone/keystone_v3_ext.rb
-- lib/misty/openstack/keystone/v2_0.rb
-- lib/misty/openstack/keystone/v3.rb
-- lib/misty/openstack/magnum/magnum_v1.rb
-- lib/misty/openstack/magnum/v1.rb
-- lib/misty/openstack/manila/manila_v2.rb
-- lib/misty/openstack/manila/v2.rb
-- lib/misty/openstack/murano/murano_v1.rb
-- lib/misty/openstack/murano/v1.rb
-- lib/misty/openstack/neutron/neutron_v2_0.rb
-- lib/misty/openstack/neutron/v2_0.rb
-- lib/misty/openstack/nova/nova_v2_1.rb
-- lib/misty/openstack/nova/v2_1.rb
-- lib/misty/openstack/octavia/octavia_v2_0.rb
-- lib/misty/openstack/octavia/v2_0.rb
-- lib/misty/openstack/sahara/sahara_v1_1.rb
-- lib/misty/openstack/sahara/v1_1.rb
-- lib/misty/openstack/searchlight/searchlight_v1.rb
-- lib/misty/openstack/searchlight/v1.rb
-- lib/misty/openstack/senlin/senlin_v1.rb
-- lib/misty/openstack/senlin/v1.rb
 - lib/misty/openstack/service.rb
-- lib/misty/openstack/swift/swift_v1.rb
-- lib/misty/openstack/swift/v1.rb
-- lib/misty/openstack/tacker/tacker_v1_0.rb
-- lib/misty/openstack/tacker/v1_0.rb
-- lib/misty/openstack/trove/trove_v1_0.rb
-- lib/misty/openstack/trove/v1_0.rb
-- lib/misty/openstack/zaqar/v2.rb
-- lib/misty/openstack/zaqar/zaqar_v2.rb
+- lib/misty/openstack/service_pack.rb
 - lib/misty/service.rb
 - lib/misty/services.rb
 - lib/misty/version.rb
 - test/integration/compute_test.rb
-- test/integration/networking_test.rb
+- test/integration/network_test.rb
 - test/integration/orchestration_test.rb
 - test/integration/test_helper.rb
 - test/integration/vcr/compute_using_nova_v2_1.yml
-- test/integration/vcr/networking_using_neutron_v2_0.yml
+- test/integration/vcr/network_using_neutron_v2_0.yml
 - test/integration/vcr/orchestration_using_heat_v1.yml
+- test/unit/auth/catalog_test.rb
 - test/unit/auth/name_test.rb
+- test/unit/auth/token_test.rb
 - test/unit/auth_helper.rb
-- test/unit/auth_test.rb
 - test/unit/cloud/config_test.rb
 - test/unit/cloud/requests_test.rb
 - test/unit/cloud/services_test.rb

data/lib/misty/auth.rb

@@ -1,91 +0,0 @@
-require 'logger'
-require 'misty/auth/name'
-require 'misty/http/net_http'
-require 'misty/config'
-
-module Misty
-
-  # The credentials are a combination of "id" and "name" used to uniquely identify the context.
-  # +Misty::Auth+ is mixing the common interface between +Misty::AuthV3+ and +Misty::AuthV2+
-  #
-  module Auth
-    include Misty::HTTP::NetHTTP
-
-    attr_reader :catalog, :token
-
-    def self.build(auth)
-      version = auth[:tenant_id] || auth[:tenant] ? 'V2' : 'V3'
-      klass = Object.const_get("Misty::Auth#{version}")
-      klass.new(auth)
-    end
-
-    # ==== Attributes
-    #
-    # * +auth+ - Hash of credentials parameters for authentication
-    #
-    def initialize(auth)
-      if auth[:context]
-        # bypass the authentication by given token catalog and expire date
-        @token   = auth[:context][:token]
-        @catalog = auth[:context][:catalog]
-        @expires = auth[:context][:expires]
-      else
-        raise URLError, 'No URL provided' if auth[:url].nil? || auth[:url].empty?
-        @uri = URI.parse(auth[:url])
-        @ssl_verify_mode = auth[:ssl_verify_mode] ? auth[:ssl_verify_mode] : Misty::Config::SSL_VERIFY_MODE
-        @credentials = set_credentials(auth)
-        @token, @catalog, @expires = set(authenticate)
-        # TODO: Pass main log object
-        @log = Logger.new('/dev/null')
-      end
-    end
-
-    def authenticate
-      Misty::HTTP::NetHTTP.http_request(
-        @uri, ssl_verify_mode: @ssl_verify_mode, log: @log
-      ) do |connection|
-        response = connection.post(path, @credentials.to_json,
-          { 'Content-Type' => 'application/json', 'Accept' => 'application/json' })
-        unless response.code =~ /200|201/
-          raise AuthenticationError, "Response code=#{response.code}, Msg=#{response.msg}"
-        end
-        response
-      end
-    end
-
-    def expired?
-      if @expires.nil? || @expires.empty?
-        raise ExpiryError, 'Missing token expiration data'
-      end
-      Time.parse(@expires) < Time.now.utc
-    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 '#{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 = endpoint_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

@@ -1,65 +0,0 @@
-require 'misty/auth'
-
-module Misty
-  #
-  # Openstack Identity service Keystone version 2.0, which is deprecated, uses a tenant name or id to authenticates
-  # +Misty::AuthV2+ is used if the authentication credentials contains a tenant name or id.
-  class AuthV2
-    include Misty::Auth
-
-    def credentials
-      if @token
-        identity = { 'token': { 'id': @token } }
-      else
-        raise CredentialsError, "#{self.class}: User name is required" if @user.name.nil?
-        raise CredentialsError, "#{self.class}: User password is required" if @user.password.nil?
-        identity = { 'passwordCredentials': user_credentials }
-      end
-
-      if @tenant.id
-        identity.merge!('tenantId': @tenant.id)
-      elsif @tenant.name
-        identity.merge!('tenantName': @tenant.name)
-      else
-        raise CredentialsError, "#{self.class}: No tenant available"
-      end
-
-      { 'auth': identity }
-    end
-
-    def endpoint_url(endpoint, region_id, interface)
-      return endpoint["#{interface}URL"] if endpoint['region'] == region_id && endpoint["#{interface}URL"]
-    end
-
-    def path
-      '/v2.0/tokens'
-    end
-
-    def user_credentials
-      {
-        'username': @user.name,
-        'password': @user.password
-      }
-    end
-
-    def set(response)
-      payload = JSON.load(response.body)
-      token   = payload['access']['token']['id']
-      catalog = payload['access']['serviceCatalog']
-      expires = payload['access']['token']['expires']
-      [token, catalog, expires]
-    end
-
-    def set_credentials(auth)
-      if auth[:token]
-        @token = auth[:token]
-      else
-        @user = Misty::Auth::User.new(auth[:user_id], auth[:user])
-        @user.password = auth[:password]
-      end
-
-      @tenant = Misty::Auth::Name.new(auth[:tenant_id], auth[:tenant])
-      credentials
-    end
-  end
-end