misty 1.3.3 → 1.4.0

data/test/unit/cloud/config_test.rb

@@ -0,0 +1,165 @@
+require 'test_helper'
+require 'auth_helper'
+require 'misty/config'
+
+describe Misty::Config do
+  describe 'without auth' do
+    it 'fails' do
+      proc do
+        Misty::Config.new({})
+      end.must_raise Misty::Config::CredentialsError
+    end
+  end
+
+  describe 'with auth' do
+    let(:auth) do
+      {
+        :url             => 'http://localhost:5000',
+        :user_id         => 'user_id',
+        :password        => 'secret',
+        :project_id      => 'project_id',
+        :ssl_verify_mode => false
+      }
+    end
+
+    let(:auth_request) do
+      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'})
+    end
+
+    describe 'fails' do
+      it 'with wrong header type' do
+        auth_request
+        proc do
+          Misty::Config.new(:auth => auth, :headers => :blah)
+        end.must_raise Misty::HTTP::Header::TypeError
+      end
+
+      it 'with interface wrong type' do
+        auth_request
+        proc do
+          Misty::Config.new(:auth => auth, :interface => 'something')
+        end.must_raise Misty::Config::InvalidDataError
+      end
+
+      it 'with region_id wrong type' do
+        auth_request
+        proc do
+          Misty::Config.new(:auth => auth, :region_id => true)
+        end.must_raise Misty::Config::InvalidDataError
+      end
+
+      it 'with ssl_verify_mode wrong type' do
+        auth_request
+        proc do
+          Misty::Config.new(:auth => auth, :ssl_verify_mode => 'something')
+        end.must_raise Misty::Config::InvalidDataError
+      end
+    end
+
+    describe "success" do
+      it 'using Cloud level defaults' do
+        auth_request
+        config = Misty::Config.new(:auth => auth)
+        def config.globals
+          @globals
+        end
+
+        config.log.must_be_kind_of Logger
+        config.auth.must_be_kind_of Misty::AuthV3
+        config.globals[:content_type].must_equal Misty::Config::CONTENT_TYPE
+        config.globals[:headers].must_be_kind_of Misty::HTTP::Header
+        config.globals[:headers].get.must_equal("Accept"=>"application/json; q=1.0")
+        config.globals[:interface].must_equal Misty::Config::INTERFACE
+        config.globals[:region_id].must_equal Misty::Config::REGION_ID
+        config.globals[:ssl_verify_mode].must_equal Misty::Config::SSL_VERIFY_MODE
+      end
+
+      it 'with Cloud level parameters' do
+        auth_request
+
+        LOG_FILE_NAME = "./misty-unit_test-#{Process.pid}"
+        config = Misty::Config.new(
+          :auth            => auth,
+          :content_type    => :json,
+          :headers         => {'var' => 'value'},
+          :interface       => 'admin',
+          :region_id       => 'regionTest',
+          :ssl_verify_mode => false,
+          :log_file        => LOG_FILE_NAME
+        )
+        def config.globals
+          @globals
+        end
+
+        config.globals[:content_type].must_equal :json
+        config.globals[:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'var' => 'value')
+        config.globals[:interface].must_equal 'admin'
+        config.globals[:region_id].must_equal 'regionTest'
+        config.globals[:ssl_verify_mode].must_equal false
+        File.exist?(LOG_FILE_NAME).must_equal true
+        File.delete(LOG_FILE_NAME) if File.exist?(LOG_FILE_NAME)
+      end
+
+      describe 'service level configurations' do
+        it 'with globals defaults' do
+          auth_request
+          config = Misty::Config.new(
+            :auth       => auth,
+            :compute    => {
+              :content_type    => :json,
+              :headers         => {'Service Key' => 'Service Value'},
+              :interface       => 'internal',
+              :region_id       => 'region local',
+              :ssl_verify_mode => false,
+
+              :base_path       => 'base_path_test',
+              :base_url        => '/base.url.com',
+              :version         => 'vtest'
+            }
+          )
+
+          service_config = config.get_service(:compute)
+          service_config[:config][:content_type].must_equal :json
+          service_config[:config][:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'Service Key' => 'Service Value')
+          service_config[:config][:interface].must_equal 'internal'
+          service_config[:config][:region_id].must_equal 'region local'
+          service_config[:config][:ssl_verify_mode].must_equal false
+          service_config[:config][:base_path].must_equal 'base_path_test'
+          service_config[:config][:base_url].must_equal '/base.url.com'
+          service_config[:config][:version].must_equal 'vtest'
+        end
+
+        it 'with Cloud level parameters' do
+          auth_request
+          config = Misty::Config.new(
+            :auth            => auth,
+            :content_type    => :json,
+            :headers         => {'Global Key' => 'Global Value'},
+            :interface       => 'internal',
+            :region_id       => 'region_global',
+            :ssl_verify_mode => false,
+              :networking => {
+                :content_type    => :hash,
+                :headers         => {'Local Key' => 'Local Value'},
+                :interface       => 'admin',
+                :region_id       => 'region_local',
+                :ssl_verify_mode => true
+              }
+          )
+          def config.globals
+            @globals
+          end
+
+          service_config = config.get_service(:networking)
+          service_config[:config][:content_type].must_equal :hash
+          service_config[:config][:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'Global Key' => 'Global Value', 'Local Key' => 'Local Value')
+          service_config[:config][:interface].must_equal 'admin'
+          service_config[:config][:region_id].must_equal 'region_local'
+          service_config[:config][:ssl_verify_mode].must_equal true
+        end
+      end
+    end
+  end
+end

data/test/unit/cloud/requests_test.rb

@@ -46,18 +46,6 @@ describe Misty::Cloud do
       cloud.image.show_image_member_details('id1', 'id2').response.must_be_kind_of Net::HTTPOK
     end
 
-    it 'successful with an extra header parameter' do
-      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
-        to_return(:status => 200, :body => JSON.dump(auth_response_v3('network', 'neutron')), :headers => {'x-subject-token'=>'token_data'})
-
-      stub_request(:get, "http://localhost/v2.0/networks?name=value").
-        with(:headers => {'Test-Header'=>'test header value'}).
-        to_return(:status => 200, :body => "", :headers => {})
-
-      header = Misty::HTTP::Header.new('Test-Header' => 'test header value')
-      cloud.network.list_networks('name=value', header).response.must_be_kind_of Net::HTTPOK
-    end
-
     it 'fails when not enough arguments' do
       proc do
         # '/v2/images/{image_id}/members/{member_id}'

data/test/unit/cloud/services_test.rb

@@ -2,15 +2,17 @@ require 'test_helper'
 require 'auth_helper'
 
 describe 'Misty::Cloud' do
-  let(:cloud) do
-    auth = {
+  let(:auth) do
+    {
       :url               => 'http://localhost:5000',
       :user              => 'admin',
       :password          => 'secret',
       :project           => 'admin',
       :project_domain_id => 'default'
     }
+  end
 
+  let(:cloud) do
     Misty::Cloud.new(:auth => auth)
   end
 
@@ -100,16 +102,42 @@ describe 'Misty::Cloud' do
     cloud.block_storage.must_be_kind_of Misty::Openstack::Cinder::V3
   end
 
-  it '#compute' do
-    stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
-      with(:body => JSON.dump(auth_body), :headers => auth_headers).
-      to_return(:status => 200, :body => JSON.dump(auth_response_v3('compute', 'nova')), :headers => token_header)
+  describe '#compute' do
+    it 'without microversion provided' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        with(:body => JSON.dump(auth_body), :headers => auth_headers).
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('compute', 'nova')), :headers => token_header)
 
-    stub_request(:get, 'http://localhost/').
-      with(:headers => auth_headers).
-      to_return(:status => 200, :body => JSON.dump(versions), :headers => {})
+      stub_request(:get, 'http://localhost/').
+        with(:headers => auth_headers).
+        to_return(:status => 200, :body => JSON.dump(versions), :headers => {})
+
+      cloud.compute.must_be_kind_of Misty::Openstack::Nova::V2_1
+    end
 
-    cloud.compute.must_be_kind_of Misty::Openstack::Nova::V2_1
+    it 'with microversion provided' do
+      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        with(:body => JSON.dump(auth_body), :headers => auth_headers).
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('compute', 'nova')), :headers => token_header)
+
+      stub_request(:get, 'http://localhost/').
+        with(:headers => auth_headers).
+        to_return(:status => 200, :body => JSON.dump(versions), :headers => {})
+
+      compute_cloud = Misty::Cloud.new(:auth => auth, :compute => {:version => '2.17'})
+
+      compute_cloud.compute.must_be_kind_of Misty::Openstack::Nova::V2_1
+
+      stub_request(:get, "http://localhost/servers").
+        with(:headers => {'Accept'=>'application/json; q=1.0', 'X-Auth-Token'=>'token_data', 'X-Openstack-Nova-Api-Version'=>'2.17'})
+
+      compute_cloud.compute.list_servers
+
+      stub_request(:get, "http://localhost/servers").
+        with(:headers => {'Accept'=>'application/json; q=1.0', 'X-Auth-Token'=>'token_data', 'X-Openstack-Nova-Api-Version'=>'2.19'})
+
+      compute_cloud.compute(:version => '2.19').list_servers
+    end
   end
 
   it '#dataProcessing' do
@@ -175,7 +203,7 @@ describe 'Misty::Cloud' do
         to_return(:status => 200, :body => JSON.dump(auth_response_v3('object-store', 'swift')), :headers => token_header)
 
       stub_request(:post, "http://localhost/?bulk-delete=1").
-        with(:headers => {'Accept'=>'application/json; q=1.0', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'text/plain', 'User-Agent'=>'Ruby', 'X-Auth-Token'=>'token_data'}).
+        with(:headers => {'Accept'=>'application/json; q=1.0', 'Content-Type'=>'text/plain', 'User-Agent'=>'Ruby', 'X-Auth-Token'=>'token_data'}).
         to_return(:status => 200, :body => "", :headers => {})
 
       cloud.object_storage.requests.must_include :bulk_delete
@@ -222,7 +250,8 @@ describe 'Misty::Cloud' do
 
     it '#data is ambiguous' do
       stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
-        with(:body => JSON.dump(auth_body), :headers => auth_headers)
+        with(:body => JSON.dump(auth_body), :headers => auth_headers).
+        to_return(:status => 200, :body => JSON.dump(auth_response_v3('Identity', 'keystone')), :headers => token_header)
 
       proc do
         cloud.data

data/test/unit/cloud_test.rb

@@ -1,43 +1,51 @@
 require 'test_helper'
-require 'service_helper'
 require 'auth_helper'
 
-describe '#dot_to_underscore' do
-  it 'returns a valid name' do
-    name = Misty::Cloud.dot_to_underscore('v20.90.01')
-    name.must_equal 'v20_90_01'
+describe Misty::Cloud do
+  describe '#dot_to_underscore' do
+    it 'returns a valid name' do
+      name = Misty::Cloud.dot_to_underscore('v20.90.01')
+      name.must_equal 'v20_90_01'
+    end
   end
-end
 
-describe Misty::Cloud do
-  describe 'A service' do
-    let(:auth) do
-      stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
-        with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\"admin\",\"domain\":{\"id\":\"default\"},\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"admin\",\"domain\":{\"id\":\"default\"}}}}}",
-        :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
-        to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
-
-      auth = {
-        :url                => 'http://localhost:5000',
-        :user               => 'admin',
-        :password           => 'secret',
-        :project            => 'admin',
-        :project_domain_id  => 'default'
+  describe 'identity' do
+    let(:arg) do
+      arg = {
+        :auth => {
+          :url             => 'http://localhost:5000',
+          :user_id         => 'user_id',
+          :password        => 'secret',
+          :project_id      => 'project_id',
+          :ssl_verify_mode => false
+        },
       }
     end
 
+    let(:auth_request) do
+      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('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
+    end
+
     it 'uses default version' do
-      cloud = Misty::Cloud.new(:auth => auth)
+      auth_request
+      cloud = Misty::Cloud.new(arg)
       cloud.identity.must_be_kind_of Misty::Openstack::Keystone::V3
     end
 
     it 'uses default version when provided version is out of range' do
-      cloud = Misty::Cloud.new(:auth => auth, :identity => {:api_version => 'v1'})
+      auth_request
+      arg.merge!(:identity => {:api_version => 'v1'})
+      cloud = Misty::Cloud.new(arg)
       cloud.identity.must_be_kind_of Misty::Openstack::Keystone::V3
     end
 
     it 'uses provided version' do
-      cloud = Misty::Cloud.new(:auth => auth, :identity => {:api_version => 'v2.0'})
+      auth_request
+      arg.merge!(:identity => {:api_version => 'v2.0'})
+      cloud = Misty::Cloud.new(arg)
       cloud.identity.must_be_kind_of Misty::Openstack::Keystone::V2_0
     end
   end
@@ -51,23 +59,6 @@ describe Misty::Cloud do
     end
   end
 
-  describe '#config' do
-    it 'sets up default values' do
-      Misty::Auth.stub :factory, nil do
-        config = Misty::Cloud.set_configuration({})
-        config.must_be_kind_of Misty::Cloud::Config
-
-        config.content_type.must_equal Misty::CONTENT_TYPE
-        config.headers.must_be_kind_of Misty::HTTP::Header
-        config.headers.get.must_equal({"Accept"=>"application/json; q=1.0"})
-        config.interface.must_equal Misty::INTERFACE
-        config.log.must_be_kind_of Logger
-        config.region_id.must_equal Misty::REGION_ID
-        config.ssl_verify_mode.must_equal Misty::SSL_VERIFY_MODE
-      end
-    end
-  end
-
   describe '#new' do
     describe 'fails' do
       it 'when no parameters' do
@@ -79,13 +70,13 @@ describe Misty::Cloud do
       it 'with empty credentials' do
         proc do
           Misty::Cloud.new(:auth => {})
-        end.must_raise Misty::Auth::URLError
+        end.must_raise Misty::Config::CredentialsError
       end
 
       it 'with incomplete credentials' do
         proc do
           Misty::Cloud.new(:auth => {:user => 'user', :url => 'http://localhost' })
-        end.must_raise Misty::Auth::CredentialsError
+        end.must_raise Misty::Config::CredentialsError
       end
 
       it 'without url' do
@@ -130,7 +121,7 @@ describe Misty::Cloud do
 
           Misty::AuthV2.stub :new, authv2 do
             cloud = Misty::Cloud.new(:auth => authv2_data)
-            authv2.verify
+            assert_mock authv2
           end
         end
       end
@@ -150,7 +141,7 @@ describe Misty::Cloud do
 
           Misty::AuthV3.stub :new, authv3 do
             cloud = Misty::Cloud.new(:auth => authv3_data)
-            authv3.verify
+            assert_mock authv3
           end
         end
       end

data/test/unit/http/request_test.rb

@@ -126,7 +126,7 @@ describe Misty::HTTP::Request do
     end
 
     it '#http_to_s' do
-      service.http_to_s('/resource', 'headers',  'data'  => 'value').must_equal "base_url='localhost:80', path='/resource', header=headers, data='{\"data\"=>\"value\"}'"
+      service.http_to_s('VERB', '/resource', 'headers',  'data'  => 'value').must_equal "HTTP VERB base_url='localhost:80', path='/resource', header=headers, data='{\"data\"=>\"value\"}'"
     end
   end
 end

data/test/unit/microversion_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'auth_helper'
-require 'misty/client'
 require 'misty/microversion'
+require 'misty/http/request'
 
 describe Misty::Microversion do
   let(:versions_data) do
@@ -16,60 +16,84 @@ describe Misty::Microversion do
           'updated' => '2013-07-23T11:33:21Z',
           'links' => [{ 'href' => 'http://localhost/v2.1/', 'rel' => 'self' }],
           'min_version' => '2.1',
-          'version' => '2.25',
+          'version' => '2.60',
           'id' => 'v2.1' }] }
   end
 
-  let(:microversion_service) do
-    auth = Minitest::Mock.new
+  describe '#set_version' do
+    let(:service) do
+      service = Object.new
+      service.extend(Misty::Microversion)
 
-    def auth.get_url(*args)
-      'http://localhost'
+      def service.headers
+        @headers = Misty::HTTP::Header.new
+      end
+      service.headers
+      service
     end
 
-    def auth.get_token
-      'token_id'
-    end
+    describe 'fetch versions' do
+      before do
+        service.extend(Misty::HTTP::Request)
 
-    setup = Misty::Cloud::Config.new
-    setup.content_type = :ruby
-    setup.log = Logger.new('/dev/null')
-    setup.interface = Misty::INTERFACE
-    setup.region_id = Misty::REGION_ID
-    setup.ssl_verify_mode = Misty::SSL_VERIFY_MODE
-    setup.headers = Misty::HTTP::Header.new('Accept' => 'application/json; q=1.0')
+        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'})
 
-    stub_request(:get, 'http://localhost/').
-      with(:headers => {'Accept'=>'application/json'}).
-      to_return(:status => 200, :body => JSON.dump(versions_data), :headers => {})
+        def service.setup
+          @uri = URI.parse('http://localhost/')
+          @log = Logger.new('/dev/null')
+          @auth = Misty::AuthV3.new(
+            :url             => 'http://localhost:5000',
+            :user_id         => 'user_id',
+            :password        => 'secret',
+            :project_id      => 'project_id'
+          )
+        end
+        service.setup
+      end
 
-    Misty::Openstack::Nova::V2_1.new(auth, setup, {})
-  end
+      let(:fetch_request) do
+        stub_request(:get, "http://localhost/").
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby', 'X-Auth-Token'=>'token_data'}).
+        to_return(:status => 200, :body => JSON.dump(versions_data), :headers => {})
+      end
 
-  describe '#version_get' do
-    it 'returns the version number' do
-      microversion_service.version_get('2.12').must_equal '2.12'
-    end
+      it 'set microversion when number within min/max range' do
+        fetch_request
+
+        def service.service_names
+          %w{service_name1}
+        end
 
-    it 'returns the version number' do
-      microversion_service.version_get('CURRENT').must_equal '2.25'
+        service.microversion_header('2.60').must_equal({"X-Openstack-API-Version" => "service_name1 2.60"})
+      end
+
+      it 'fails when asked version is not within min-max range' do
+        fetch_request
+
+        proc do
+          service.set_version('3.20')
+        end.must_raise Misty::Microversion::VersionError
+      end
     end
 
-    it 'fails when version is not within supporterd interval' do
-      proc do
-        microversion_service.version_get('2.0')
-      end.must_raise Misty::Microversion::VersionError
+    it "set microversion to 'latest'" do
+      def service.service_names
+        %w{service_name2}
+      end
+      service.microversion_header('latest').must_equal({"X-Openstack-API-Version" => "service_name2 latest"})
     end
 
-    it 'fails when LATEST version is not available' do
+    it 'fails when version is a wrong word' do
       proc do
-        microversion_service.version_get('LATEST')
+        service.set_version('testing')
       end.must_raise Misty::Microversion::VersionError
     end
 
-    it 'fails when using an invalid version State' do
+    it "fails when version does't match <number.number>" do
       proc do
-        microversion_service.version_get('OTHER')
+        service.set_version('1.2.3')
       end.must_raise Misty::Microversion::VersionError
     end
   end