fog-openstack 0.1.31 → 0.2.0

data/playbooks/fog-openstack-unittest-test/run.yaml

@@ -24,7 +24,8 @@
               rvm use ${version} > /dev/null 2>&1
               echo "Running tests based on Ruby ${version}..."
               ruby --version
-              gem install bundler --version '~> 1'
+              gem install bundler
+              gem update bundler
               bundle install --jobs=3 --retry=3
               bundle exec rake test TESTOPTS="--verbose"
           done

data/unit/auth/catalog_test.rb

@@ -0,0 +1,252 @@
+require 'test_helper'
+
+describe Fog::OpenStack::Auth::Catalog::V3 do
+  CATALOGV3 = [
+    {
+      "endpoints" => [
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost:9696",
+          "region"    => "regionOne",
+          "interface" => "internal",
+          "id"        => "id_endpoint1_internal"
+        },
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost:9696",
+          "region"    => "regionOne",
+          "interface" => "public",
+          "id"        => "id_endpoint1_public"
+        },
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost:9696",
+          "region"    => "regionOne",
+          "interface" => "admin",
+          "id"        => "id_endpoint1_admin"
+        }
+      ],
+      "type"      => "network",
+      "id"        => "id1",
+      "name"      => "neutron"
+    },
+    {
+      "endpoints" => [
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost:9292",
+          "region"    => "regionOne",
+          "interface" => "internal",
+          "id"        => "id_endpoint1_internal"
+        },
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost:9292",
+          "region"    => "regionOne",
+          "interface" => "public",
+          "id"        => "id_endpoint1_public"
+        },
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost:9292",
+          "region"    => "regionOne",
+          "interface" => "admin",
+          "id"        => "id_endpoint1_admin"
+        }
+      ],
+      "type"      => "image",
+      "id"        => "id2",
+      "name"      => "glance"
+    },
+    {
+      "endpoints" => [
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost:5000",
+          "region"    => "regionOne",
+          "interface" => "internal",
+          "id"        => "id_endpoint1_internal"
+        },
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost:5000",
+          "region"    => "regionOne",
+          "interface" => "public",
+          "id"        => "id_endpoint1_public"
+        },
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost:35357",
+          "region"    => "regionOne",
+          "interface" => "admin",
+          "id"        => "id_endpoint1_admin"
+        }
+      ],
+      "type"      => "identity",
+      "id"        => "id3",
+      "name"      => "keystone"
+    },
+    {
+      "endpoints" => [
+        {
+          "region_id" => "regionOne",
+          "url"       => "http://localhost2:5000",
+          "region"    => "regionTwo",
+          "interface" => "internal",
+          "id"        => "id_endpoint1_internal"
+        },
+        {
+          "region_id" => "regionTwo",
+          "url"       => "http://localhost2:5000",
+          "region"    => "regionTwo",
+          "interface" => "public",
+          "id"        => "id_endpoint1_public"
+        },
+        {
+          "region_id" => "regionTwo",
+          "url"       => "http://localhost2:35357",
+          "region"    => "regionTwo",
+          "interface" => "admin",
+          "id"        => "id_endpoint1_admin"
+        }
+      ],
+      "type"      => "identity",
+      "id"        => "id3",
+      "name"      => "keystone"
+    }
+  ].freeze
+
+  let(:payload) do
+    CATALOGV3
+  end
+
+  describe '#get_endpoint_url' do
+    it 'with matching name, interface and region' do
+      catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload)
+      catalog.get_endpoint_url('identity', 'admin', 'regionTwo').must_equal 'http://localhost2:35357'
+    end
+
+    it 'with matching name and interface using avail region' do
+      catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload)
+      catalog.get_endpoint_url('network', %w[dummy admin]).must_equal 'http://localhost:9696'
+    end
+
+    it 'with matching name and interface list' do
+      catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload)
+      catalog.get_endpoint_url('network', %w[dummy admin]).must_equal 'http://localhost:9696'
+    end
+
+    it 'with matching name and interface and several regions available' do
+      catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload)
+      proc do
+        catalog.get_endpoint_url('identity', 'admin')
+      end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError
+    end
+
+    it 'with unmatched name for service type' do
+      catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload)
+      proc do
+        catalog.get_endpoint_url('service', 'public')
+      end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError
+    end
+
+    it 'with unmatched region' do
+      catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload)
+      proc do
+        catalog.get_endpoint_url('identity', 'admin', 'regionOther')
+      end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError
+    end
+
+    it 'with unmatched interface' do
+      catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload)
+      proc do
+        catalog.get_endpoint_url('identity', 'private')
+      end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError
+    end
+  end
+end
+
+describe Fog::OpenStack::Auth::Catalog::V2 do
+  CATALOGV2 = [
+    {
+      'endpoints'       => [{
+        'adminURL'    => 'http://localhost',
+        'region'      => 'regionOne',
+        'internalURL' => 'http://localhost:8888/v2.0',
+        'id'          => 'id_endpoints',
+        'publicURL'   => 'http://localhost'
+      }],
+      'endpoints_links' => [],
+      'type'            => 'identity',
+      'name'            => 'keystone'
+    },
+    {
+      'endpoints'       => [{
+        'adminURL'    => 'http://localhost',
+        'region'      => 'regionTwo',
+        'internalURL' => 'http://localhost:9999/v2.0',
+        'id'          => 'id_endpoints',
+        'publicURL'   => 'http://localhost'
+      }],
+      'endpoints_links' => [],
+      'type'            => 'identity',
+      'name'            => 'keystone'
+    },
+    {
+      'endpoints'       => [{
+        'adminURL'    => 'http://localhost',
+        'region'      => 'regionOne',
+        'internalURL' => 'http://localhost:7777/v1.0',
+        'id'          => 'id_endpoints',
+        'publicURL'   => 'http://localhost'
+      }],
+      'endpoints_links' => [],
+      'type'            => 'compute',
+      'name'            => 'nova'
+    }
+  ].freeze
+
+  let(:payload) do
+    CATALOGV2
+  end
+
+  describe '#get_endpoint_url' do
+    it 'match name, interface and region' do
+      catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload)
+      catalog.get_endpoint_url('identity', 'internal', 'regionTwo').must_equal 'http://localhost:9999/v2.0'
+    end
+
+    it 'match name, interface and unique region available' do
+      catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload)
+      catalog.get_endpoint_url('compute', 'internal').must_equal 'http://localhost:7777/v1.0'
+    end
+
+    it 'fails when multiple region match' do
+      catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload)
+      proc do
+        catalog.get_endpoint_url('identity', 'admin')
+      end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError
+    end
+
+    it 'with unmatched arguments' do
+      catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload)
+      proc do
+        catalog.get_endpoint_url('test', 'unknown', 'regionOther')
+      end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError
+    end
+
+    it 'with unmatched region' do
+      catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload)
+      proc do
+        catalog.get_endpoint_url('identity', 'admin', 'regionOther')
+      end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError
+    end
+
+    it 'with unmatched interface' do
+      catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload)
+      proc do
+        catalog.get_endpoint_url('identity', 'private', 'regionTwo')
+      end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError
+    end
+  end
+end

data/unit/auth/name_test.rb

@@ -0,0 +1,115 @@
+require 'test_helper'
+require 'fog/openstack/auth/name'
+
+describe Fog::OpenStack::Auth::Name do
+  describe 'creates' do
+    it 'when id and name are provided' do
+      name = Fog::OpenStack::Auth::Name.new('default', 'Default')
+      name.id.must_equal 'default'
+      name.name.must_equal 'Default'
+    end
+
+    it 'when id is null' do
+      name = Fog::OpenStack::Auth::Name.new(nil, 'Default')
+      name.id.must_be_nil
+      name.name.must_equal 'Default'
+    end
+
+    it 'when name is null' do
+      name = Fog::OpenStack::Auth::Name.new('default', nil)
+      name.id.must_equal 'default'
+      name.name.must_be_nil
+    end
+
+    it 'when both id and name is null' do
+      name = Fog::OpenStack::Auth::Name.new(nil, nil)
+      name.name.must_be_nil
+    end
+  end
+
+  describe '#to_h' do
+    it 'returns the hash of provided attribute' do
+      name = Fog::OpenStack::Auth::Name.new('default', 'Default')
+      name.to_h(:id).must_equal(:id => 'default')
+      name.to_h(:name).must_equal(:name => 'Default')
+    end
+  end
+end
+
+describe Fog::OpenStack::Auth::User do
+  describe '#password' do
+    it 'set/get password' do
+      user = Fog::OpenStack::Auth::User.new('user_id', 'User')
+      user.password = 'secret'
+      user.identity.must_equal(:user => {:id => 'user_id', :password => 'secret'})
+    end
+  end
+
+  describe '#identity' do
+    describe 'succesful' do
+      it "with user id and user name" do
+        user = Fog::OpenStack::Auth::User.new('user_id', 'User')
+        user.password = 'secret'
+        user.identity.must_equal(:user => {:id => 'user_id', :password => 'secret'})
+      end
+
+      it 'with user name and user domain name' do
+        user = Fog::OpenStack::Auth::User.new(nil, 'User')
+        user.password = 'secret'
+        user.domain = Fog::OpenStack::Auth::Name.new('default', nil)
+        user.identity.must_equal(:user => {:name => 'User', :domain => {:id => 'default'}, :password => 'secret'})
+      end
+
+      it 'with user name and domain name' do
+        user = Fog::OpenStack::Auth::User.new(nil, 'User')
+        user.password = 'secret'
+        user.domain = Fog::OpenStack::Auth::Name.new(nil, 'Default')
+        user.identity.must_equal(:user => {:name => 'User', :domain => {:name => 'Default'}, :password => 'secret'})
+      end
+    end
+
+    describe 'raises an error' do
+      it 'raises an error when password is missing' do
+        proc do
+          user = Fog::OpenStack::Auth::User.new('user_id', 'User')
+          user.identity
+        end.must_raise Fog::OpenStack::Auth::CredentialsError
+      end
+
+      it 'with only user name and no domain' do
+        proc do
+          user = Fog::OpenStack::Auth::User.new(nil, 'User')
+          user.identity
+        end.must_raise Fog::OpenStack::Auth::CredentialsError
+      end
+    end
+  end
+end
+
+describe Fog::OpenStack::Auth::ProjectScope do
+  describe '#identity' do
+    it "when id is provided it doesn't require domain" do
+      project = Fog::OpenStack::Auth::ProjectScope.new('project_id', 'Project')
+      project.identity.must_equal(:project => {:id => 'project_id'})
+    end
+
+    it 'when id is nul and name is provided it uses domain id' do
+      project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project')
+      project.domain = Fog::OpenStack::Auth::Name.new('default', nil)
+      project.identity.must_equal(:project => {:name => 'Project', :domain => {:id => 'default'}})
+    end
+
+    it 'when id is nul and name is provided it uses domain name' do
+      project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project')
+      project.domain = Fog::OpenStack::Auth::Name.new(nil, 'Default')
+      project.identity.must_equal(:project => {:name => 'Project', :domain => {:name => 'Default'}})
+    end
+
+    it 'raises an error with no project id and no domain are provided' do
+      proc do
+        project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project')
+        project.identity
+      end.must_raise Fog::OpenStack::Auth::CredentialsError
+    end
+  end
+end

data/unit/auth/token_test.rb

@@ -0,0 +1,478 @@
+require 'test_helper'
+require 'auth_helper'
+
+describe Fog::OpenStack::Auth::Token do
+  describe 'V3' do
+    describe '#new' do
+      it 'fails when missing credentials' do
+        stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+          to_return(
+            :status  => 200,
+            :body    => "{\"token\":{\"catalog\":[]}}",
+            :headers => {'x-subject-token'=>'token_data'}
+          )
+
+        proc do
+          Fog::OpenStack::Auth::Token.build({})
+        end.must_raise Fog::OpenStack::Auth::Token::URLError
+      end
+
+      describe 'using the password method' do
+        describe 'with a project scope' do
+          it 'authenticates using a project id' do
+            auth = {
+              :openstack_auth_url   => 'http://localhost/identity',
+              :openstack_userid     => 'user_id',
+              :openstack_api_key    => 'secret',
+              :openstack_project_id => 'project_id'
+            }
+
+            stub_request(:post, 'http://localhost/identity/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_v3'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data_v3'
+          end
+
+          it 'authenticates using a project name and a project domain id' do
+            auth = {
+              :openstack_auth_url          => 'http://localhost/identity',
+              :openstack_userid            => 'user_id',
+              :openstack_api_key           => 'secret',
+              :openstack_project_name      => 'project',
+              :openstack_project_domain_id => 'project_domain_id'
+            }
+
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\
+\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\
+\"project_domain_id\"}}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+
+          it 'authenticates using a project name and a project domain name' do
+            auth = {
+              :openstack_auth_url            => 'http://localhost/identity',
+              :openstack_username            => 'user',
+              :openstack_user_domain_name    => 'user_domain',
+              :openstack_api_key             => 'secret',
+              :openstack_project_name        => 'project',
+              :openstack_project_domain_name => 'project_domain'
+            }
+
+            stub_request(:post, "http://localhost/identity/v3/auth/tokens").
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\
+\"user\",\"domain\":{\"name\":\"user_domain\"},\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\"\
+,\"domain\":{\"name\":\"project_domain\"}}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+        end
+
+        describe 'with a domain scope' do
+          it 'authenticates using a domain id' do
+            auth = {
+              :openstack_auth_url  => 'http://localhost/identity',
+              :openstack_userid    => 'user_id',
+              :openstack_api_key   => 'secret',
+              :openstack_domain_id => 'domain_id'
+            }
+
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\
+\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+
+          it 'authenticates using a domain name' do
+            auth = {
+              :openstack_auth_url    => 'http://localhost/identity',
+              :openstack_userid      => 'user_id',
+              :openstack_api_key     => 'secret',
+              :openstack_domain_name => 'domain'
+            }
+
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\
+\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+        end
+
+        describe 'unscoped' do
+          it 'authenticates' do
+            auth = {
+              :openstack_auth_url => 'http://localhost/identity',
+              :openstack_userid   => 'user_id',
+              :openstack_api_key  => 'secret',
+            }
+
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\
+\"user_id\",\"password\":\"secret\"}}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+        end
+      end
+
+      describe 'using the token method' do
+        describe 'unscoped' do
+          it 'authenticates using a project id' do
+            auth = {
+              :openstack_auth_url   => 'http://localhost/identity',
+              :openstack_auth_token => 'token',
+            }
+
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+        end
+
+        describe 'with a project scope' do
+          it 'authenticates using a project id' do
+            auth = {
+              :openstack_auth_url   => 'http://localhost/identity',
+              :openstack_auth_token => 'token',
+              :openstack_project_id => 'project_id'
+            }
+
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\
+\"scope\":{\"project\":{\"id\":\"project_id\"}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+
+          it 'authenticates using a project name and a project domain id' do
+            auth = {
+              :openstack_auth_url          => 'http://localhost/identity',
+              :openstack_auth_token        => 'token',
+              :openstack_project_name      => 'project',
+              :openstack_project_domain_id => 'domain_id'
+            }
+
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\
+\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+        end
+
+        describe 'with a domain scope' do
+          it 'authenticates using a domain id' do
+            auth = {
+              :openstack_auth_url   => 'http://localhost/identity',
+              :openstack_auth_token => 'token',
+              :openstack_domain_id  => 'domain_id'
+            }
+
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\
+\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+
+          it 'authenticates using a domain name' do
+            auth = {
+              :openstack_auth_url    => 'http://localhost/identity',
+              :openstack_auth_token  => 'token',
+              :openstack_domain_name => 'domain'
+            }
+
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+              with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\
+\"scope\":{\"domain\":{\"name\":\"domain\"}}}}").
+              to_return(
+                :status  => 200,
+                :body    => JSON.dump(auth_response_v3('identity', 'keystone')),
+                :headers => {'x-subject-token'=>'token_data'}
+              )
+
+            token = Fog::OpenStack::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
+          end
+        end
+      end
+    end
+
+    describe 'when authenticated' do
+      let(:authv3_creds) do
+        {
+          :openstack_auth_url          => 'http://localhost/identity',
+          :openstack_username          => 'admin',
+          :openstack_api_key           => 'secret',
+          :openstack_project_name      => 'admin',
+          :openstack_project_domain_id => 'default'
+        }
+      end
+
+      describe '#get' do
+        it 'when token has not expired' do
+          stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+            to_return(
+              :status  => 200,
+              :body    => "{\"token\":{\"catalog\":[\"catalog_data\"]}}",
+              :headers => {'x-subject-token'=>'token_data'}
+            )
+
+          token = Fog::OpenStack::Auth::Token.build(authv3_creds)
+          token.stub :expired?, false do
+            token.get.must_equal 'token_data'
+          end
+        end
+
+        it 'when token has expired' do
+          stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+            to_return(
+              :status  => 200,
+              :body    => "{\"token\":{\"catalog\":[\"catalog_data\"]}}",
+              :headers => {'x-subject-token'=>'token_data'}
+            )
+
+          token = Fog::OpenStack::Auth::Token.build(authv3_creds)
+          token.stub :expired?, true do
+            token.get.must_equal 'token_data'
+          end
+        end
+      end
+
+      it '#catalog' do
+        stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+          to_return(
+            :status  => 200,
+            :body    => "{\"token\":{\"catalog\":[\"catalog_data\"]}}",
+            :headers => {'x-subject-token'=>'token_data'}
+          )
+
+        token = Fog::OpenStack::Auth::Token.build(authv3_creds)
+        token.catalog.payload.must_equal ['catalog_data']
+      end
+
+      it '#get_endpoint_url' do
+        stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
+          to_return(
+            :status  => 200,
+            :body    => JSON.dump(auth_response_v3("identity", "keystone")),
+            :headers => {'x-subject-token'=>'token_data'}
+          )
+
+        token = Fog::OpenStack::Auth::Token.build(authv3_creds)
+        token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost'
+      end
+    end
+  end
+
+  describe 'V2' do
+    describe '#new' do
+      it 'fails when missing credentials' do
+        stub_request(:post, 'http://localhost/identity/v2.0/tokens').
+          to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {})
+
+        proc do
+          Fog::OpenStack::Auth::Token.build({})
+        end.must_raise Fog::OpenStack::Auth::Token::URLError
+      end
+
+      describe 'using the password method' do
+        it 'authenticates using the tenant name' do
+          auth = {
+            :openstack_auth_url => 'http://localhost/identity',
+            :openstack_username => 'user',
+            :openstack_api_key  => 'secret',
+            :openstack_tenant   => 'tenant',
+          }
+
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
+            with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\
+\"tenantName\":\"tenant\"}}").
+            to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
+
+          token = Fog::OpenStack::Auth::Token.build(auth)
+          token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
+        end
+
+        it 'authenticates using the tenant id' do
+          auth = {
+            :openstack_auth_url  => 'http://localhost/identity',
+            :openstack_username  => 'user',
+            :openstack_api_key   => 'secret',
+            :openstack_tenant_id => 'tenant_id',
+          }
+
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
+            with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\
+\"tenantId\":\"tenant_id\"}}").
+            to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
+
+          token = Fog::OpenStack::Auth::Token.build(auth)
+          token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
+        end
+      end
+
+      describe 'using the token method' do
+        it 'authenticates using the tenant name' do
+          auth = {
+            :openstack_auth_url   => 'http://localhost/identity',
+            :openstack_auth_token => 'token_id',
+            :openstack_tenant     => 'tenant',
+          }
+
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
+            with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}").
+            to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
+
+          token = Fog::OpenStack::Auth::Token.build(auth)
+          token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
+        end
+
+        it 'authenticates using the tenant id' do
+          auth = {
+            :openstack_auth_url   => 'http://localhost/identity',
+            :openstack_auth_token => 'token_id',
+            :openstack_tenant_id  => 'tenant_id',
+          }
+
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
+            with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}").
+            to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
+
+          Fog::OpenStack::Auth::Token.build(auth)
+        end
+      end
+    end
+
+    describe 'when authenticated' do
+      let(:authv2_creds) do
+        {
+          :openstack_auth_url => 'http://localhost/identity',
+          :openstack_username => 'admin',
+          :openstack_api_key  => 'secret',
+          :openstack_tenant   => 'admin'
+        }
+      end
+
+      describe '#get' do
+        it 'when token has not expired' do
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
+            to_return(
+              :status  => 200,
+              :body    => "{\"access\":{\"token\":{\"id\":\"token_not_expired\"},\"serviceCatalog\":\
+[\"catalog_data\"]}}",
+              :headers => {}
+            )
+
+          token = Fog::OpenStack::Auth::Token.build(authv2_creds)
+          token.stub :expired?, false do
+            token.get.must_equal 'token_not_expired'
+          end
+        end
+
+        it 'when token has expired' do
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
+            to_return(
+              :status  => 200,
+              :body    => "{\"access\":{\"token\":{\"id\":\"token_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}",
+              :headers => {}
+            )
+
+          token = Fog::OpenStack::Auth::Token.build(authv2_creds)
+          token.stub :expired?, true do
+            token.get.must_equal 'token_expired'
+          end
+        end
+      end
+
+      it '#catalog' do
+        stub_request(:post, 'http://localhost/identity/v2.0/tokens').
+          to_return(
+            :status  => 200,
+            :body    => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}",
+            :headers => {}
+          )
+
+        token = Fog::OpenStack::Auth::Token.build(authv2_creds)
+        token.catalog.payload.must_equal ['catalog_data']
+      end
+
+      it '#get_endpoint_url' do
+        stub_request(:post, 'http://localhost/identity/v2.0/tokens').
+          to_return(
+            :status  => 200,
+            :body    => JSON.dump(auth_response_v2('identity', 'keystone')),
+            :headers => {'x-subject-token'=>'token_data'}
+          )
+
+        token = Fog::OpenStack::Auth::Token.build(authv2_creds)
+        token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost'
+      end
+    end
+  end
+end