fog 1.30.0 → 1.31.0

data/spec/fog/openstack/identity_v3/idv3_users.yml

@@ -0,0 +1,393 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:35357/v3/users?page=1&per_page=30
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog/1.28.0 fog-core/1.29.0
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - d8291e2a2a2046259316f7c2d4253e92
+  response:
+    status:
+      code: 401
+      message: ''
+    headers:
+      Www-Authenticate:
+      - Keystone uri="http://devstack.openstack.stack:35357"
+      Vary:
+      - X-Auth-Token
+      X-Distribution:
+      - Ubuntu
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '114'
+      Date:
+      - Mon, 23 Mar 2015 09:25:21 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"error": {"message": "The request you have made requires authentication.",
+        "code": 401, "title": "Unauthorized"}}'
+    http_version: 
+  recorded_at: Mon, 23 Mar 2015 09:25:21 GMT
+- request:
+    method: post
+    uri: http://devstack.openstack.stack:5000/v3/auth/tokens
+    body:
+      encoding: UTF-8
+      string: ! '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"openstack","id":"8d5732a0ebd9485396351d74e24c9647"}}},"scope":{"project":{"name":"admin","domain":{"id":"default"}}}}}'
+    headers:
+      User-Agent:
+      - fog/1.28.0 fog-core/1.29.0
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 201
+      message: ''
+    headers:
+      X-Subject-Token:
+      - d448367868f7446696b876c5fb251fa4
+      Vary:
+      - X-Auth-Token
+      X-Distribution:
+      - Ubuntu
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '2254'
+      Date:
+      - Mon, 23 Mar 2015 09:25:21 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"token": {"methods": ["password"], "roles": [{"id": "7ebef8a2837246eda8f83f96ffb82b2f",
+        "name": "admin"}], "expires_at": "2015-03-23T10:25:21.353957Z", "project":
+        {"domain": {"id": "default", "name": "Default"}, "id": "c7767afa57b74f33863a420daba5f57f",
+        "name": "admin"}, "catalog": [{"endpoints": [{"url": "http://devstack.openstack.stack:35357/v2.0",
+        "region": "europe", "interface": "public", "id": "0b4b1e907e184880a1c3f32f00cd676f"},
+        {"url": "http://devstack.openstack.stack:35357/v2.0", "region": "europe",
+        "interface": "admin", "id": "53d872f1c5d04f35ac69509e41600c0b"}, {"url": "http://devstack.openstack.stack:35357/v2.0",
+        "region": "europe", "interface": "internal", "id": "67aa3eedc510444faadb9ef3c7e8b2e4"}],
+        "type": "identity", "id": "8e53f1d389df4059aeab1acfece2fc66", "name": "keystone"},
+        {"endpoints": [{"url": "http://devstack.openstack.stack:35357/v3", "region":
+        "europe", "interface": "internal", "id": "7002cfd6dbe74512b0b817d3b7380abb"},
+        {"url": "http://devstack.openstack.stack:35357/v3", "region": "europe", "interface":
+        "public", "id": "a7c634aa7f034284b62ddf974ddc04eb"}, {"url": "http://devstack.openstack.stack:35357/v3",
+        "region": "europe", "interface": "admin", "id": "cba56e3e7a9c4ddfb39e1e4053bd04ab"}],
+        "type": "identity_v3", "id": "a47e0f0014fa409993cef0bd984a5ac6", "name": "identity_v3"},
+        {"endpoints": [{"url": "http://localhost/testurl/c7767afa57b74f33863a420daba5f57f",
+        "region": "europe", "interface": "public", "id": "3387dfbf7bc440728e7aa1488f6ca96e"}],
+        "type": "test_stefan", "id": "d36a1f72832b428688b7dae7d0ab8a39", "name": "test_stefan"},
+        {"endpoints": [{"url": "http://devstack.openstack.stack:9292", "region": "europe",
+        "interface": "public", "id": "0dabc688a031422381d3c92b7dfdfe4c"}, {"url":
+        "http://devstack.openstack.stack:9292", "region": "europe", "interface": "admin",
+        "id": "768f3eb8b29d49a19c4d50a85541d42e"}, {"url": "http://devstack.openstack.stack:9292",
+        "region": "europe", "interface": "internal", "id": "a0c5556c80e448aca907a3ee785bd602"}],
+        "type": "image", "id": "ee073ec39e804cca96d2440d8f109932", "name": "glance"}],
+        "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id":
+        "8d5732a0ebd9485396351d74e24c9647", "name": "admin"}, "issued_at": "2015-03-23T09:25:21.354000Z"}}'
+    http_version: 
+  recorded_at: Mon, 23 Mar 2015 09:25:21 GMT
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:35357/v3/users?page=1&per_page=30
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog/1.28.0 fog-core/1.29.0
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - d448367868f7446696b876c5fb251fa4
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Vary:
+      - X-Auth-Token
+      X-Distribution:
+      - Ubuntu
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '1094'
+      Date:
+      - Mon, 23 Mar 2015 09:25:21 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"users": [{"name": "glance", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/3c5a9e9790614a60b5c19712d8e97c6d"},
+        "domain_id": "default", "enabled": true, "email": null, "id": "3c5a9e9790614a60b5c19712d8e97c6d"},
+        {"name": "u-foobar", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/660d8086a1db41078c0d64fa568db135"},
+        "domain_id": "default", "enabled": true, "email": "foobar@example.com", "id":
+        "660d8086a1db41078c0d64fa568db135"}, {"name": "admin", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/8d5732a0ebd9485396351d74e24c9647"},
+        "domain_id": "default", "enabled": true, "email": "andrew@batty.com", "id":
+        "8d5732a0ebd9485396351d74e24c9647"}, {"domain_id": "default", "name": "demo",
+        "links": {"self": "http://devstack.openstack.stack:35357/v3/users/ac33746004f1470b904e364d408cf42e"},
+        "id": "ac33746004f1470b904e364d408cf42e", "enabled": true, "email": "andrew@battye.com",
+        "default_project_id": "c9f75b1200f64bf09ed079206a1a1b75"}], "links": {"self":
+        "http://devstack.openstack.stack:35357/v3/users", "previous": null, "next":
+        null}}'
+    http_version: 
+  recorded_at: Mon, 23 Mar 2015 09:25:21 GMT
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:35357/v3/users?page=1&per_page=30
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog/1.28.0 fog-core/1.29.0
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - d448367868f7446696b876c5fb251fa4
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Vary:
+      - X-Auth-Token
+      X-Distribution:
+      - Ubuntu
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '1094'
+      Date:
+      - Mon, 23 Mar 2015 09:25:21 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"users": [{"name": "glance", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/3c5a9e9790614a60b5c19712d8e97c6d"},
+        "domain_id": "default", "enabled": true, "email": null, "id": "3c5a9e9790614a60b5c19712d8e97c6d"},
+        {"name": "u-foobar", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/660d8086a1db41078c0d64fa568db135"},
+        "domain_id": "default", "enabled": true, "email": "foobar@example.com", "id":
+        "660d8086a1db41078c0d64fa568db135"}, {"name": "admin", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/8d5732a0ebd9485396351d74e24c9647"},
+        "domain_id": "default", "enabled": true, "email": "andrew@batty.com", "id":
+        "8d5732a0ebd9485396351d74e24c9647"}, {"domain_id": "default", "name": "demo",
+        "links": {"self": "http://devstack.openstack.stack:35357/v3/users/ac33746004f1470b904e364d408cf42e"},
+        "id": "ac33746004f1470b904e364d408cf42e", "enabled": true, "email": "andrew@battye.com",
+        "default_project_id": "c9f75b1200f64bf09ed079206a1a1b75"}], "links": {"self":
+        "http://devstack.openstack.stack:35357/v3/users", "previous": null, "next":
+        null}}'
+    http_version: 
+  recorded_at: Mon, 23 Mar 2015 09:25:21 GMT
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:35357/v3/users/u-random-blah
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog/1.28.0 fog-core/1.29.0
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - d448367868f7446696b876c5fb251fa4
+  response:
+    status:
+      code: 404
+      message: ''
+    headers:
+      Vary:
+      - X-Auth-Token
+      X-Distribution:
+      - Ubuntu
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '96'
+      Date:
+      - Mon, 23 Mar 2015 09:25:21 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"error": {"message": "Could not find user, u-random-blah.", "code":
+        404, "title": "Not Found"}}'
+    http_version: 
+  recorded_at: Mon, 23 Mar 2015 09:25:21 GMT
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:35357/v3/users?page=1&per_page=30
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog/1.28.0 fog-core/1.29.0
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - d448367868f7446696b876c5fb251fa4
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Vary:
+      - X-Auth-Token
+      X-Distribution:
+      - Ubuntu
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '1094'
+      Date:
+      - Mon, 23 Mar 2015 09:25:22 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"users": [{"name": "glance", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/3c5a9e9790614a60b5c19712d8e97c6d"},
+        "domain_id": "default", "enabled": true, "email": null, "id": "3c5a9e9790614a60b5c19712d8e97c6d"},
+        {"name": "u-foobar", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/660d8086a1db41078c0d64fa568db135"},
+        "domain_id": "default", "enabled": true, "email": "foobar@example.com", "id":
+        "660d8086a1db41078c0d64fa568db135"}, {"name": "admin", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/8d5732a0ebd9485396351d74e24c9647"},
+        "domain_id": "default", "enabled": true, "email": "andrew@batty.com", "id":
+        "8d5732a0ebd9485396351d74e24c9647"}, {"domain_id": "default", "name": "demo",
+        "links": {"self": "http://devstack.openstack.stack:35357/v3/users/ac33746004f1470b904e364d408cf42e"},
+        "id": "ac33746004f1470b904e364d408cf42e", "enabled": true, "email": "andrew@battye.com",
+        "default_project_id": "c9f75b1200f64bf09ed079206a1a1b75"}], "links": {"self":
+        "http://devstack.openstack.stack:35357/v3/users", "previous": null, "next":
+        null}}'
+    http_version: 
+  recorded_at: Mon, 23 Mar 2015 09:25:22 GMT
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:35357/v3/users?page=1&per_page=30
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog/1.28.0 fog-core/1.29.0
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - d448367868f7446696b876c5fb251fa4
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Vary:
+      - X-Auth-Token
+      X-Distribution:
+      - Ubuntu
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '1094'
+      Date:
+      - Mon, 23 Mar 2015 09:25:22 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"users": [{"name": "glance", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/3c5a9e9790614a60b5c19712d8e97c6d"},
+        "domain_id": "default", "enabled": true, "email": null, "id": "3c5a9e9790614a60b5c19712d8e97c6d"},
+        {"name": "u-foobar", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/660d8086a1db41078c0d64fa568db135"},
+        "domain_id": "default", "enabled": true, "email": "foobar@example.com", "id":
+        "660d8086a1db41078c0d64fa568db135"}, {"name": "admin", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/8d5732a0ebd9485396351d74e24c9647"},
+        "domain_id": "default", "enabled": true, "email": "andrew@batty.com", "id":
+        "8d5732a0ebd9485396351d74e24c9647"}, {"domain_id": "default", "name": "demo",
+        "links": {"self": "http://devstack.openstack.stack:35357/v3/users/ac33746004f1470b904e364d408cf42e"},
+        "id": "ac33746004f1470b904e364d408cf42e", "enabled": true, "email": "andrew@battye.com",
+        "default_project_id": "c9f75b1200f64bf09ed079206a1a1b75"}], "links": {"self":
+        "http://devstack.openstack.stack:35357/v3/users", "previous": null, "next":
+        null}}'
+    http_version: 
+  recorded_at: Mon, 23 Mar 2015 09:25:22 GMT
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:35357/v3/users?name=admin&page=1&per_page=30
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog/1.28.0 fog-core/1.29.0
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - d448367868f7446696b876c5fb251fa4
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Vary:
+      - X-Auth-Token
+      X-Distribution:
+      - Ubuntu
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '345'
+      Date:
+      - Mon, 23 Mar 2015 09:25:22 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"users": [{"name": "admin", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/8d5732a0ebd9485396351d74e24c9647"},
+        "domain_id": "default", "enabled": true, "email": "andrew@batty.com", "id":
+        "8d5732a0ebd9485396351d74e24c9647"}], "links": {"self": "http://devstack.openstack.stack:35357/v3/users",
+        "previous": null, "next": null}}'
+    http_version: 
+  recorded_at: Mon, 23 Mar 2015 09:25:22 GMT
+- request:
+    method: get
+    uri: http://devstack.openstack.stack:35357/v3/users?name=pimpernel&page=1&per_page=30
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog/1.28.0 fog-core/1.29.0
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Auth-Token:
+      - d448367868f7446696b876c5fb251fa4
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Vary:
+      - X-Auth-Token
+      X-Distribution:
+      - Ubuntu
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '114'
+      Date:
+      - Mon, 23 Mar 2015 09:25:22 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"users": [], "links": {"self": "http://devstack.openstack.stack:35357/v3/users",
+        "previous": null, "next": null}}'
+    http_version: 
+  recorded_at: Mon, 23 Mar 2015 09:25:22 GMT
+recorded_with: VCR 2.9.3

data/spec/fog/openstack/identity_v3_spec.rb

@@ -0,0 +1,929 @@
+require 'fog/openstack/identity'
+require 'fog/openstack/identity_v3'
+require 'rspec/core'
+require 'vcr'
+
+RSpec.describe Fog::Identity::OpenStack::V3 do
+
+  before :each do |example|
+    @os_auth_url = ENV['OS_AUTH_URL']
+
+    # if OS_AUTH_URL is set but FOG_MOCK is not, don't record anything and just pass through the requests
+    VCR.configure do |c|
+      c.ignore_request do |request|
+        ENV['FOG_MOCK']!='true' && !ENV['OS_AUTH_URL'].nil?
+      end
+    end if @os_auth_url
+
+    # Fail-safe URL which matches the VCR recordings
+    @os_auth_url ||= 'http://devstack.openstack.stack:5000/v3'
+
+    VCR.configure do |config|
+      config.allow_http_connections_when_no_cassette = true
+      config.hook_into :webmock
+      config.cassette_library_dir = "spec/fog/openstack/identity_v3"
+      config.default_cassette_options = {:record => :none}
+    end
+
+    unless example.metadata[:skip_preauthentication]
+      VCR.use_cassette('idv3') do
+        @id_v3 = Fog::Identity::OpenStack::V3.new(
+            :openstack_project_name => ENV['OS_TENANT_NAME'] || 'admin',
+            :openstack_domain_name => 'Default',
+            :openstack_api_key => ENV['OS_PASSWORD'] || 'openstack',
+            :openstack_username => ENV['OS_USERNAME'] || 'admin',
+            :openstack_auth_url => "#{@os_auth_url}/auth/tokens") unless @id_v3
+      end
+    end
+  end
+
+  it 'authenticates with password, userid and domain_id', :skip_preauthentication do
+    VCR.use_cassette('authv3_a') do
+      Fog::Identity::OpenStack::V3.new(
+          :openstack_project_name => ENV['OS_TENANT_NAME'] || 'admin',
+          :openstack_domain_name => 'Default',
+          :openstack_api_key => ENV['OS_PASSWORD'] || 'openstack',
+          :openstack_username => ENV['OS_USERNAME'] || 'admin',
+          :openstack_auth_url => "#{@os_auth_url}/auth/tokens")
+    end
+  end
+
+  it 'authenticates with password, username and domain_id', :skip_preauthentication do
+    VCR.use_cassette('authv3_b') do
+      Fog::Identity::OpenStack::V3.new(
+          :openstack_project_name => ENV['OS_TENANT_NAME'] || 'admin',
+          :openstack_domain_name => 'Default',
+          :openstack_api_key => ENV['OS_PASSWORD'] || 'openstack',
+          :openstack_username => ENV['OS_USERNAME'] || 'admin',
+          :openstack_auth_url => "#{@os_auth_url}/auth/tokens")
+    end
+  end
+
+  it 'authenticates with password, username and domain_name', :skip_preauthentication do
+    VCR.use_cassette('authv3_c') do
+      Fog::Identity::OpenStack::V3.new(
+          :openstack_project_name => ENV['OS_TENANT_NAME'] || 'admin',
+          :openstack_domain_name => 'Default',
+          :openstack_api_key => ENV['OS_PASSWORD'] || 'openstack',
+          :openstack_username => ENV['OS_USERNAME'] || 'admin',
+          :openstack_auth_url => "#{@os_auth_url}/auth/tokens")
+    end
+  end
+
+  it 'authenticates with project scope', :skip_preauthentication do
+    VCR.use_cassette('authv3_project') do
+      Fog::Identity::OpenStack::V3.new(
+          :openstack_project_name => ENV['OS_TENANT_NAME'] || 'admin',
+          :openstack_domain_name => 'Default',
+          :openstack_api_key => ENV['OS_PASSWORD'] || 'openstack',
+          :openstack_username => ENV['OS_USERNAME'] || 'admin',
+          :openstack_auth_url => "#{@os_auth_url}/auth/tokens")
+    end
+  end
+
+  it "get an unscoped token using v2, then use it to get a scoped token in v3", :skip_preauthentication do
+    VCR.use_cassette('idv2_unscoped_token_v3') do
+
+      # Juno Keystone
+      # Get an initial unscoped token by authenticating with username & password
+      openstack_auth_url = @os_auth_url.gsub(/v3/, 'v2.0')
+      @id_v2 = Fog::Identity::OpenStack.new(
+          :openstack_api_key => ENV['OS_PASSWORD'] || 'openstack',
+          :openstack_username => ENV['OS_USERNAME'] || 'admin',
+          :openstack_auth_url => "#{openstack_auth_url}/tokens")
+
+      # Exchange it for a project-scoped token
+      auth = Fog::Identity::OpenStack::V3.new(
+          :openstack_project_name => ENV['OS_USERNAME'] || 'admin',
+          :openstack_domain_name => 'Default',
+          :openstack_tenant => ENV['OS_USERNAME'] || 'admin',
+          :openstack_auth_token => @id_v2.credentials[:openstack_auth_token],
+          :openstack_auth_url => "#{@os_auth_url}/auth/tokens")
+
+      token = auth.credentials[:openstack_auth_token]
+
+      # We can use the scoped token to validate the scoped token
+      validated_token = @id_v2.validate_token(token)
+      expect(validated_token).to_not be_nil
+
+      @id_v2.check_token(token)
+      expect { @id_v2.check_token(token, 'random-tenant-id') }.to raise_error(Excon::Errors::Unauthorized)
+    end
+  end
+
+  it 'get an unscoped token, then use it to get a scoped token', :skip_preauthentication do
+    VCR.use_cassette('authv3_unscoped') do
+
+      # Juno Keystone
+      @id_v3 = Fog::Identity::OpenStack::V3.new(
+          :openstack_api_key => ENV['OS_PASSWORD'] || 'openstack',
+          :openstack_userid => '8d5732a0ebd9485396351d74e24c9647',
+          :openstack_auth_url => "#{@os_auth_url}/auth/tokens")
+
+      # Exchange it for a project-scoped token
+      auth = Fog::Identity::OpenStack::V3.new(
+          :openstack_project_name => ENV['OS_USERNAME'] || 'admin',
+          :openstack_domain_name => 'Default',
+          :openstack_tenant => ENV['OS_USERNAME'] || 'admin',
+          :openstack_auth_token => @id_v3.credentials[:openstack_auth_token],
+          :openstack_auth_url => "#{@os_auth_url}/auth/tokens")
+
+      token = auth.credentials[:openstack_auth_token]
+
+      # We can use the unscoped token to validate the scoped token
+      validated_token = @id_v3.tokens.validate(token)
+      expect(validated_token).to_not be_nil
+
+      @id_v3.tokens.check(token)
+      expect { @id_v3.tokens.check('random-token') }.to raise_error(Fog::Identity::OpenStack::NotFound)
+    end
+  end
+
+  it "find specific user, lists users" do
+    VCR.use_cassette('idv3_users') do
+
+      other_user = @id_v3.users.find_by_id '8d5732a0ebd9485396351d74e24c9647'
+
+      expect(other_user).to_not be_nil
+      expect { nonexistent_user = @id_v3.users.find_by_id 'u-random-blah' }.to raise_error(Fog::Identity::OpenStack::NotFound)
+
+      users = @id_v3.users
+      expect(users).to_not be_nil
+      expect(users.length).to_not be 0
+
+      users_all = @id_v3.users.all
+      expect(users_all).to_not be_nil
+      expect(users_all.length).to_not be 0
+
+      admin_user = @id_v3.users.find_by_name 'admin'
+      expect(admin_user.length).to be 1
+
+      expect(@id_v3.users.find_by_name('pimpernel').length).to be 0
+    end
+  end
+
+  it 'CRUD users' do
+    VCR.use_cassette('idv3_user_crud') do
+
+      # Make sure there are no existing users called foobar or baz
+      ['foobar', 'baz'].each do |username|
+        user = @id_v3.users.find_by_name(username).first
+        user.update(:enabled => false) if user
+        user.destroy if user
+      end
+      expect(@id_v3.users.find_by_name('foobar').length).to be 0
+      expect(@id_v3.users.find_by_name('baz').length).to be 0
+
+      # Create a user called foobar
+      foobar_user = @id_v3.users.create(:name => 'foobar',
+                                        :email => 'foobar@example.com',
+                                        :password => 's3cret!')
+      foobar_id = foobar_user.id
+      expect(@id_v3.users.find_by_name('foobar').length).to be 1
+
+      # Rename it to baz and disable it (required so we can delete it)
+      foobar_user.update(:name => 'baz', :enabled => false)
+      expect(foobar_user.name).to eq 'baz'
+
+      # Read the user freshly and check the name & enabled state
+      expect(@id_v3.users.find_by_name('baz').length).to be 1
+      baz_user = @id_v3.users.find_by_id foobar_id
+      expect(baz_user).to_not be_nil
+      expect(baz_user.name).to eq 'baz'
+      expect(baz_user.email).to eq 'foobar@example.com'
+      expect(baz_user.enabled).to be false
+
+      # Delete the user
+      baz_user.destroy
+      # Check that the deletion worked
+      expect { @id_v3.users.find_by_id foobar_id }.to raise_error(Fog::Identity::OpenStack::NotFound)
+      expect(@id_v3.users.all.select { |user| ['foobar', 'baz'].include? user.name }.length).to be 0
+      expect(@id_v3.users.find_by_name('foobar').length).to be 0
+      expect(@id_v3.users.find_by_name('baz').length).to be 0
+    end
+  end
+
+  it "CRUD & manipulate groups" do
+    VCR.use_cassette('idv3_group_crud_mutation') do
+
+      # Make sure there are no existing groups called foobar or baz
+      @id_v3.groups.all.select { |group| ['foobar', 'baz'].include? group.name }.each do |group|
+        group.destroy
+      end
+      expect(@id_v3.groups.all.select { |group| ['foobar', 'baz'].include? group.name }.length).to be 0
+
+      # Create a group called foobar
+      foobar_group = @id_v3.groups.create(:name => 'foobar', :description => "Group of Foobar users")
+      foobar_id = foobar_group.id
+      expect(@id_v3.groups.all.select { |group| group.name == 'foobar' }.length).to be 1
+
+      # Rename it to baz
+      foobar_group.update(:name => 'baz', :description => "Group of Baz users")
+      expect(foobar_group.name).to eq 'baz'
+
+      # Read the group freshly and check the name
+      expect(@id_v3.groups.all.select { |group| group.name == 'baz' }.length).to be 1
+      baz_group = @id_v3.groups.find_by_id foobar_id
+      expect(baz_group).to_not be_nil
+      expect(baz_group.name).to eq 'baz'
+
+      # Add users to the group
+      foobar_user1 = @id_v3.users.create(:name => 'foobar1',
+                                         :email => 'foobar1@example.com',
+                                         :password => 's3cret!1')
+      foobar_user2 = @id_v3.users.create(:name => 'foobar2',
+                                         :email => 'foobar2@example.com',
+                                         :password => 's3cret!2')
+
+      expect(foobar_user1.groups.length).to be 0
+      expect(baz_group.users.length).to be 0
+
+      baz_group.add_user(foobar_user1.id)
+
+      # Check that a user is in the group
+      expect(foobar_user1.groups.length).to be 1
+      expect(baz_group.contains_user? foobar_user1.id).to be true
+
+      baz_group.add_user(foobar_user2.id)
+
+      # List users in the group
+      expect(baz_group.users.length).to be 2
+
+
+      # Remove a user from the group
+      baz_group.remove_user(foobar_user1.id)
+      expect(baz_group.contains_user? foobar_user1.id).to be false
+      expect(baz_group.users.length).to be 1
+
+      # Delete the users and make sure they are no longer in the group
+      foobar_user1.destroy
+      foobar_user2.destroy
+      expect(baz_group.contains_user? foobar_user2.id).to be false
+      expect(baz_group.users.length).to be 0
+
+      # Delete the group
+      baz_group.destroy
+      expect { @id_v3.groups.find_by_id foobar_id }.to raise_error(Fog::Identity::OpenStack::NotFound)
+      expect(@id_v3.groups.all.select { |group| ['foobar', 'baz'].include? group.name }.length).to be 0
+    end
+  end
+
+  it "gets a token, checks it and then revokes it" do
+    VCR.use_cassette('idv3_token') do
+      auth = {:auth => {:identity => {:methods => %w{password},
+                                      :password => {:user => {:id => '8d5732a0ebd9485396351d74e24c9647', :password => 'openstack'}}},
+                        :scope => {:project => {:domain => {:id => 'default'}, :name => 'admin'}}}}
+
+      token = @id_v3.tokens.authenticate(auth)
+      expect(token).to_not be_nil
+
+      validated_token = @id_v3.tokens.validate token.value
+      expect(validated_token).to_not be_nil
+
+      @id_v3.tokens.check(token.value)
+      @id_v3.tokens.revoke(token.value)
+
+      expect { @id_v3.tokens.check(token.value) }.to raise_error(Fog::Identity::OpenStack::NotFound)
+    end
+  end
+
+  it 'authenticates with a token' do
+    VCR.use_cassette('authv3_token') do
+      # Setup - get a non-admin token to check by using username/password authentication to start with
+      auth_url = "#{@os_auth_url}/auth/tokens"
+      nonadmin_v3 = Fog::Identity::OpenStack::V3.new(
+          :openstack_project_name => 'demo',
+          :openstack_domain_id => 'default',
+          :openstack_api_key => 'openstack',
+          :openstack_username => 'demo',
+          :openstack_region => 'europe',
+          :openstack_auth_url => auth_url)
+
+      # Test - check the token validity by using it to create a new Fog::Identity::OpenStack::V3 instance
+      token_check = Fog::Identity::OpenStack::V3.new(
+          :openstack_auth_token => nonadmin_v3.auth_token,
+          :openstack_region => 'europe',
+          :openstack_auth_url => auth_url)
+
+      expect(token_check).to_not be_nil
+
+      expect { Fog::Identity::OpenStack::V3.new(
+          :openstack_auth_token => 'blahblahblah',
+          :openstack_region => 'europe',
+          :openstack_auth_url => auth_url) }.to raise_error(Excon::Errors::NotFound)
+    end
+  end
+
+  it "lists domains" do
+    VCR.use_cassette('idv3_domain') do
+
+      domains = @id_v3.domains
+      expect(domains).to_not be_nil
+      expect(domains.length).to_not be 0
+
+      domains_all = @id_v3.domains.all
+      expect(domains_all).to_not be_nil
+      expect(domains_all.length).to_not be 0
+
+      default_domain = @id_v3.domains.find_by_id 'default'
+      expect(default_domain).to_not be_nil
+
+      expect { @id_v3.domains.find_by_id 'atlantis' }.to raise_error(Fog::Identity::OpenStack::NotFound)
+    end
+  end
+
+  it "CRUD domains" do
+    VCR.use_cassette('idv3_domain_crud') do
+
+      # Make sure there are no existing domains called foobar or baz
+      ['foobar', 'baz'].each do |domain_name|
+        @id_v3.domains.all(:name => domain_name).each do |domain|
+          domain.update(:enabled => false) if domain
+          domain.destroy if domain
+        end
+        expect(@id_v3.domains.all(:name => domain_name).length).to be 0
+      end
+
+      # Create a domain called foobar
+      foobar_domain = @id_v3.domains.create(:name => 'foobar')
+      foobar_id = foobar_domain.id
+      expect(@id_v3.domains.all(:name => 'foobar').length).to be 1
+
+      # Rename it to baz and disable it (required so we can delete it)
+      foobar_domain.update(:name => 'baz', :enabled => false)
+      expect(foobar_domain.name).to eq 'baz'
+
+      # Read the domain freshly and check the name & enabled state
+      expect(@id_v3.domains.all(:name => 'baz').length).to be 1
+      baz_domain = @id_v3.domains.find_by_id foobar_id
+      expect(baz_domain).to_not be_nil
+      expect(baz_domain.name).to eq 'baz'
+      expect(baz_domain.enabled).to be false
+
+      # Delete the domain
+      baz_domain.destroy
+      # Check that the deletion worked
+      expect { @id_v3.domains.find_by_id foobar_id }.to raise_error(Fog::Identity::OpenStack::NotFound)
+      ['foobar', 'baz'].each do |domain_name|
+        expect(@id_v3.domains.all(:name => domain_name).length).to be 0
+      end
+    end
+  end
+
+  it "Manipulates roles on domains" do
+    # Note that the domain is implicit in the user operations here
+
+    VCR.use_cassette('idv3_domain_roles_mutation') do
+
+      foobar_user = @id_v3.users.find_by_name('foobar').first
+      foobar_user.destroy if foobar_user
+      foobar_user = @id_v3.users.create(:name => 'foobar',
+                                        :email => 'foobar@example.com',
+                                        :password => 's3cret!')
+
+      # User has no roles initially
+      expect(foobar_user.roles.length).to be 0
+
+      # Create a role and add it to the user in the user's domain
+      foobar_role = @id_v3.roles.all.select { |role| role.name == 'foobar_role' }.first
+      foobar_role.destroy if foobar_role
+      foobar_role = @id_v3.roles.create(:name => 'foobar_role')
+      foobar_user.grant_role(foobar_role.id)
+      expect(foobar_user.roles.length).to be 1
+      assignments = @id_v3.role_assignments.filter_by(:user_id => foobar_user.id)
+      expect(assignments.length).to be 1
+      expect(assignments.first.role['id']).to eq foobar_role.id
+      expect(assignments.first.user['id']).to eq foobar_user.id
+      expect(assignments.first.scope['domain']['id']).to eq foobar_user.domain_id
+      expect(assignments.first.links['assignment'].end_with? "/v3/domains/#{foobar_user.domain_id}/users/#{foobar_user.id}/roles/#{foobar_role.id}").to be true
+
+      # Quick test of @id_v3.role_assignments.all while we're at it
+      all_assignments = @id_v3.role_assignments.all
+      expect(assignments.length).to be >= 1
+
+      # Check that the user has the role
+      expect(foobar_user.check_role(foobar_role.id)).to be true
+
+      # Revoke the role from the user
+      foobar_user.revoke_role(foobar_role.id)
+      expect(foobar_user.check_role(foobar_role.id)).to be false
+
+      foobar_user.destroy
+      foobar_role.destroy
+    end
+  end
+
+  it "Manipulates roles on domain groups" do
+    VCR.use_cassette('idv3_domain_group_roles_mutation') do
+
+      # Make sure there is no existing domain called foobar
+      @id_v3.domains.all.select { |domain| ['d-foobar'].include? domain.name }.each do |domain|
+        domain.update(:enabled => false)
+        domain.destroy
+      end
+      expect(@id_v3.domains.all.select { |domain| domain.name == 'd-foobar' }.length).to be 0
+
+      # Create a domain called foobar
+      foobar_domain = @id_v3.domains.create(:name => 'd-foobar')
+
+      # Create a group in this domain
+      @id_v3.groups.all.select { |group| ['g-foobar'].include? group.name }.each do |group|
+        group.destroy
+      end
+      foobar_group = @id_v3.groups.create(:name => 'g-foobar',
+                                          :description => "Group of Foobar users",
+                                          :domain_id => foobar_domain.id)
+
+      # Create a user in the domain
+      foobar_user = @id_v3.users.find_by_name('u-foobar').first
+      foobar_user.destroy if foobar_user
+      foobar_user = @id_v3.users.create(:name => 'u-foobar',
+                                        :email => 'foobar@example.com',
+                                        :password => 's3cret!',
+                                        :domain_id => foobar_domain.id)
+
+      # User has no roles initially
+      expect(foobar_user.roles.length).to be 0
+
+      # Create a role and add it to the domain group
+      foobar_role = @id_v3.roles.all.select { |role| role.name == 'foobar_role' }.first
+      foobar_role.destroy if foobar_role
+      foobar_role = @id_v3.roles.create(:name => 'foobar_role')
+
+      foobar_group.grant_role foobar_role.id
+      expect(foobar_group.roles.length).to be 1
+
+      # Add user to the group and check that it inherits the role
+      expect(foobar_user.check_role foobar_role.id).to be false
+      expect(@id_v3.role_assignments.filter_by(:user_id => foobar_user.id, :effective => true).length).to be 0
+      foobar_group.add_user foobar_user.id
+      expect(foobar_user.check_role foobar_role.id).to be false # Still false in absolute assignment terms
+      assignments = @id_v3.role_assignments.filter_by(:user_id => foobar_user.id, :effective => true)
+      expect(assignments.length).to be 1
+      expect(assignments.first.role['id']).to eq foobar_role.id
+      expect(assignments.first.user['id']).to eq foobar_user.id
+      expect(assignments.first.scope['domain']['id']).to eq foobar_user.domain_id
+      expect(assignments.first.links['assignment'].end_with? "/v3/domains/#{foobar_domain.id}/groups/#{foobar_group.id}/roles/#{foobar_role.id}").to be true
+      expect(assignments.first.links['membership'].end_with? "/v3/groups/#{foobar_group.id}/users/#{foobar_user.id}").to be true
+
+      group_assignments = @id_v3.role_assignments.filter_by(:group_id => foobar_group.id)
+      expect(group_assignments.length).to be 1
+      expect(group_assignments.first.role['id']).to eq foobar_role.id
+      expect(group_assignments.first.group['id']).to eq foobar_group.id
+      expect(group_assignments.first.scope['domain']['id']).to eq foobar_user.domain_id
+      expect(group_assignments.first.links['assignment'].end_with? "/v3/domains/#{foobar_domain.id}/groups/#{foobar_group.id}/roles/#{foobar_role.id}").to be true
+
+      # Revoke the role from the group and check the user no longer has it
+      foobar_group.revoke_role foobar_role.id
+      expect(@id_v3.role_assignments.filter_by(:user_id => foobar_user.id, :effective => true).length).to be 0
+
+      # Clean up
+      foobar_user.destroy
+      foobar_group.destroy
+      foobar_role.destroy
+      foobar_domain.update(:enabled => false)
+      foobar_domain.destroy
+    end
+  end
+
+  it "lists roles and assignments" do
+    VCR.use_cassette('idv3_role') do
+
+      roles = @id_v3.roles
+      expect(roles).to_not be_nil
+      expect(roles.length).to_not be 0
+
+      roles_all = @id_v3.roles.all
+      expect(roles_all).to_not be_nil
+      expect(roles_all.length).to_not be 0
+
+      default_role = @id_v3.roles.find_by_id '9fe2ff9ee4384b1894a90878d3e92bab'
+      expect(default_role).to_not be_nil
+
+      expect { @id_v3.roles.find_by_id 'atlantis' }.to raise_error(Fog::Identity::OpenStack::NotFound)
+    end
+  end
+
+  it "CRUD roles" do
+    VCR.use_cassette('idv3_role_crud') do
+
+      # Make sure there are no existing roles called foobar or baz
+      ['foobar', 'baz'].each do |role_name|
+        @id_v3.roles.all(:name => role_name).each do |role|
+          role.update(:enabled => false)
+          role.destroy
+        end
+        expect(@id_v3.roles.all(:name => role_name).length).to be 0
+      end
+
+      # Create a role called foobar
+      foobar_role = @id_v3.roles.create(:name => 'foobar')
+      foobar_id = foobar_role.id
+      expect(@id_v3.roles.all(:name => 'foobar').length).to be 1
+
+      # Rename it to baz
+      foobar_role.update(:name => 'baz')
+      expect(foobar_role.name).to eq 'baz'
+
+      # Read the role freshly and check the name & enabled state
+      expect(@id_v3.roles.all(:name => 'baz').length).to be 1
+      baz_role = @id_v3.roles.find_by_id foobar_id
+      expect(baz_role).to_not be_nil
+      expect(baz_role.name).to eq 'baz'
+
+      # Delete the role
+      baz_role.destroy
+      # Check that the deletion worked
+      expect { @id_v3.roles.find_by_id foobar_id }.to raise_error(Fog::Identity::OpenStack::NotFound)
+      ['foobar', 'baz'].each do |role_name|
+        expect(@id_v3.roles.all(:name => role_name).length).to be 0
+      end
+    end
+  end
+
+  it "lists projects" do
+    VCR.use_cassette('idv3_project') do
+
+      projects = @id_v3.projects
+      expect(projects).to_not be_nil
+      expect(projects.length).to_not be 0
+
+      projects_all = @id_v3.projects.all
+      expect(projects_all).to_not be_nil
+      expect(projects_all.length).to_not be 0
+
+      default_project = @id_v3.projects.find_by_id 'c9f75b1200f64bf09ed079206a1a1b75'
+      expect(default_project).to_not be_nil
+
+      expect { @id_v3.projects.find_by_id 'atlantis' }.to raise_error(Fog::Identity::OpenStack::NotFound)
+    end
+  end
+
+  it "CRUD projects" do
+    VCR.use_cassette('idv3_project_crud') do
+
+      default_domain = @id_v3.domains.find_by_id 'default'
+
+      # Make sure there are no existing projects called foobar or baz
+      ['p-foobar', 'p-baz'].each do |project_name|
+        @id_v3.projects.all(:name => project_name).each do |project|
+          project.update(:enabled => false) if project
+          project.destroy if project
+        end
+        expect(@id_v3.projects.all(:name => project_name).length).to be 0
+      end
+
+      # Create a project called foobar - should not work without domain id?
+      foobar_project = @id_v3.projects.create(:name => 'p-foobar')
+      foobar_id = foobar_project.id
+      expect(@id_v3.projects.all(:name => 'p-foobar').length).to be 1
+      expect(foobar_project.domain_id).to eq default_domain.id
+
+      # Rename it to baz and disable it (required so we can delete it)
+      foobar_project.update(:name => 'p-baz', :enabled => false)
+      expect(foobar_project.name).to eq 'p-baz'
+
+      # Read the project freshly and check the name & enabled state
+      expect(@id_v3.projects.all(:name => 'p-baz').length).to be 1
+      baz_project = @id_v3.projects.find_by_id foobar_id
+      expect(baz_project).to_not be_nil
+      expect(baz_project.name).to eq 'p-baz'
+      expect(baz_project.enabled).to be false
+
+      # Delete the project
+      baz_project.destroy
+
+      # Check that the deletion worked
+      expect { @id_v3.projects.find_by_id foobar_id }.to raise_error(Fog::Identity::OpenStack::NotFound)
+      ['p-foobar', 'p-baz'].each do |project_name|
+        expect(@id_v3.projects.all(:name => project_name).length).to be 0
+      end
+    end
+  end
+
+  it "Manipulates projects - add/remove users/groups via role assignment/revocation" do
+    VCR.use_cassette('idv3_project_group_user_roles_mutation') do
+
+      # Make sure there is no existing project called foobar
+      @id_v3.projects.all(:name => 'p-foobar').each do |project|
+        project.update(:enabled => false)
+        project.destroy
+      end
+      expect(@id_v3.projects.all(:name => 'p-foobar').length).to be 0
+
+      # Create a project called foobar
+      foobar_project = @id_v3.projects.create(:name => 'p-foobar')
+
+      # Create a role called baz
+      @id_v3.roles.all(:name => 'baz').each do |role|
+        role.update(:enabled => false)
+        role.destroy
+      end
+      baz_role = @id_v3.roles.create(:name => 'baz')
+
+      # Create a user
+      foobar_user = @id_v3.users.find_by_name('u-foobar').first
+      foobar_user.destroy if foobar_user
+      foobar_user = @id_v3.users.create(:name => 'u-foobar',
+                                        :email => 'foobar@example.com',
+                                        :password => 's3cret!')
+
+      # Create a group and add the user to it
+      @id_v3.groups.all.select { |group| ['g-foobar'].include? group.name }.each do |group|
+        group.destroy
+      end
+      foobar_group = @id_v3.groups.create(:name => 'g-foobar',
+                                          :description => "Group of Foobar users")
+      foobar_group.add_user foobar_user.id
+
+      # User has no projects initially
+      expect(foobar_user.projects.length).to be 0
+      expect(@id_v3.role_assignments.filter_by(:user_id => foobar_user.id,
+                                               :project_id => foobar_project.id,
+                                               :effective => true).length).to be 0
+      expect(foobar_project.user_roles(foobar_user.id).length).to be 0
+
+      # Grant role to the user in the new project - this assigns the project to the user
+      foobar_project.grant_role_to_user(baz_role.id, foobar_user.id)
+      expect(foobar_user.projects.length).to be 1
+      expect(foobar_project.check_user_role(foobar_user.id, baz_role.id)).to be true
+      expect(foobar_project.user_roles(foobar_user.id).length).to be 1
+
+      # Revoke role from the user in the new project - this removes the user from the project
+      foobar_project.revoke_role_from_user(baz_role.id, foobar_user.id)
+      expect(foobar_user.projects.length).to be 0
+      expect(foobar_project.check_user_role(foobar_user.id, baz_role.id)).to be false
+
+      # Group initially has no roles in project
+      expect(foobar_project.group_roles(foobar_group.id).length).to be 0
+
+      expect(@id_v3.role_assignments.filter_by(:user_id => foobar_user.id,
+                                               :project_id => foobar_project.id,
+                                               :effective => true).length).to be 0
+
+      # Grant role to the group in the new project - this assigns the project to the group
+      foobar_project.grant_role_to_group(baz_role.id, foobar_group.id)
+      expect(foobar_project.check_group_role(foobar_group.id, baz_role.id)).to be true
+      expect(foobar_project.group_roles(foobar_group.id).length).to be 1
+
+      # Now we check that a user has the role in that project
+      assignments = @id_v3.role_assignments.filter_by(:user_id => foobar_user.id,
+                                                      :project_id => foobar_project.id,
+                                                      :effective => true)
+      expect(assignments.length).to be 1
+      expect(assignments.first.role['id']).to eq baz_role.id
+      expect(assignments.first.user['id']).to eq foobar_user.id
+      expect(assignments.first.scope['project']['id']).to eq foobar_project.id
+      expect(assignments.first.links['assignment'].end_with? "/v3/projects/#{foobar_project.id}/groups/#{foobar_group.id}/roles/#{baz_role.id}").to be true
+      expect(assignments.first.links['membership'].end_with? "/v3/groups/#{foobar_group.id}/users/#{foobar_user.id}").to be true
+
+      # and we check that the user is in the project because of group membership
+      expect(foobar_user.projects.length).to be 1
+
+      # Revoke role from the group in the new project - this removes the group from the project
+      foobar_project.revoke_role_from_group(baz_role.id, foobar_group.id)
+      expect(foobar_user.projects.length).to be 0
+      expect(foobar_project.check_group_role(foobar_group.id, baz_role.id)).to be false
+
+      # Clean up
+      foobar_user.destroy
+      foobar_group.destroy
+      baz_role.destroy
+      foobar_project.update(:enabled => false)
+      foobar_project.destroy
+    end
+  end
+
+  it "lists services" do
+    VCR.use_cassette('idv3_service') do
+
+      services = @id_v3.services
+      expect(services).to_not be_nil
+      expect(services.length).to_not be 0
+
+      services_all = @id_v3.services.all
+      expect(services_all).to_not be_nil
+      expect(services_all.length).to_not be 0
+
+      some_service = @id_v3.services.find_by_id services_all.first.id
+      expect(some_service).to_not be_nil
+
+      expect { @id_v3.services.find_by_id 'atlantis' }.to raise_error(Fog::Identity::OpenStack::NotFound)
+    end
+  end
+
+  it "CRUD services" do
+    VCR.use_cassette('idv3_services_crud') do
+
+      all_services = @id_v3.services.all
+
+      # Make sure there are no existing services called foobar or baz
+      @id_v3.services.all.select { |service| ['foobar', 'baz'].include? service.name }.each do |service|
+        service.destroy
+      end
+      expect(all_services.select { |service| ['foobar', 'baz'].include? service.name }.length).to be 0
+
+      # Create a service called foobar
+      foobar_service = @id_v3.services.create(:type => 'volume', :name => 'foobar')
+      foobar_id = foobar_service.id
+      expect(@id_v3.services.all(:type => 'volume').select { |service| service.name == 'foobar' }.length).to be 1
+
+      # Rename it to baz
+      foobar_service.update(:name => 'baz')
+      expect(foobar_service.name).to eq 'baz'
+
+      # Read the service freshly and check the name
+      expect(@id_v3.services.all.select { |service| service.name == 'baz' }.length).to be 1
+      baz_service = @id_v3.services.find_by_id foobar_id
+      expect(baz_service).to_not be_nil
+      expect(baz_service.name).to eq 'baz'
+      expect(baz_service.type).to eq 'volume'
+
+      # Delete the service
+      baz_service.destroy
+
+      # Check that the deletion worked
+      expect { @id_v3.services.find_by_id foobar_id }.to raise_error(Fog::Identity::OpenStack::NotFound)
+      expect(@id_v3.services.all.select { |service| ['foobar', 'baz'].include? service.name }.length).to be 0
+    end
+  end
+
+  it "lists endpoints" do
+    VCR.use_cassette('idv3_endpoint') do
+
+      endpoints = @id_v3.endpoints
+      expect(endpoints).to_not be_nil
+      expect(endpoints.length).to_not be 0
+
+      endpoints_all = @id_v3.endpoints.all
+      expect(endpoints_all).to_not be_nil
+      expect(endpoints_all.length).to_not be 0
+
+      some_endpoint = @id_v3.endpoints.find_by_id endpoints_all.first.id
+      expect(some_endpoint).to_not be_nil
+
+      expect { @id_v3.endpoints.find_by_id 'atlantis' }.to raise_error(Fog::Identity::OpenStack::NotFound)
+    end
+  end
+
+  it "CRUD endpoints" do
+    VCR.use_cassette('idv3_endpoints_crud') do
+
+      service = @id_v3.services.all.first
+      all_endpoints = @id_v3.endpoints.all
+
+      # Make sure there are no existing endpoints called foobar or baz
+      @id_v3.endpoints.all.select { |endpoint| ['foobar', 'baz'].include? endpoint.name }.each do |endpoint|
+        endpoint.destroy
+      end
+      expect(all_endpoints.select { |endpoint| ['foobar', 'baz'].include? endpoint.name }.length).to be 0
+
+      # Create a endpoint called foobar
+      foobar_endpoint = @id_v3.endpoints.create(:service_id => service.id,
+                                                :interface => 'internal',
+                                                :name => 'foobar',
+                                                :url => 'http://example.com/foobar',
+                                                :enabled => false)
+      foobar_id = foobar_endpoint.id
+      expect(@id_v3.endpoints.all(:interface => 'internal').select { |endpoint| endpoint.name == 'foobar' }.length).to be 1
+
+      # Rename it to baz
+      foobar_endpoint.update(:name => 'baz', :url => 'http://example.com/baz')
+      expect(foobar_endpoint.name).to eq 'baz'
+      expect(foobar_endpoint.url).to eq 'http://example.com/baz'
+
+      # Read the endpoint freshly and check the name
+      expect(@id_v3.endpoints.all(:interface => 'internal').select { |endpoint| endpoint.name == 'baz' }.length).to be 1
+      baz_endpoint = @id_v3.endpoints.find_by_id foobar_id
+      expect(baz_endpoint).to_not be_nil
+      expect(baz_endpoint.name).to eq 'baz'
+      expect(baz_endpoint.url).to eq 'http://example.com/baz'
+      expect(baz_endpoint.interface).to eq 'internal'
+
+      # Delete the endpoint
+      baz_endpoint.destroy
+
+      # Check that the deletion worked
+      expect { @id_v3.endpoints.find_by_id foobar_id }.to raise_error(Fog::Identity::OpenStack::NotFound)
+      expect(@id_v3.endpoints.all.select { |endpoint| ['foobar', 'baz'].include? endpoint.name }.length).to be 0
+    end
+  end
+
+  it "lists OS credentials" do
+    VCR.use_cassette('idv3_credential') do
+      credentials = @id_v3.os_credentials
+      expect(credentials).to_not be_nil
+
+      credentials_all = @id_v3.os_credentials.all
+      expect(credentials_all).to_not be_nil
+
+      expect { @id_v3.os_credentials.find_by_id 'atlantis' }.to raise_error(Fog::Identity::OpenStack::NotFound)
+    end
+  end
+
+  it "CRUD OS credentials" do
+    VCR.use_cassette('idv3_credential_crud') do
+
+      # Create a user
+      foobar_user = @id_v3.users.find_by_name('u-foobar').first
+      foobar_user.destroy if foobar_user
+      foobar_user = @id_v3.users.create(:name => 'u-foobar',
+                                        :email => 'foobar@example.com',
+                                        :password => 's3cret!')
+
+      project = @id_v3.projects.all.first
+
+      access_key = '9c4e774a-f644-498f-90c4-970b3f817fc5'
+      secret_key = '7e084117-b13d-4656-9eca-85376b690897'
+
+      # OpenStack Keystone requires the blob to be a JSON string - i.e. not JSON, but a string containing JSON :-/
+      blob_json = {:access => access_key,
+                   :secret => secret_key}.to_json
+
+      # Make sure there are no existing ec2 credentials
+      @id_v3.os_credentials.all.select { |credential| credential.type == 'foo' || credential.type == 'ec2' }.each do |credential|
+        credential.destroy
+      end
+      expect(@id_v3.os_credentials.all.select { |credential| credential.type == 'ec2' }.length).to be 0
+
+      # Create a credential
+      foo_credential = @id_v3.os_credentials.create(:type => 'ec2',
+                                                    :project_id => project.id,
+                                                    :user_id => foobar_user.id,
+                                                    :blob => blob_json)
+      credential_id = foo_credential.id
+      expect(@id_v3.os_credentials.all.select { |credential| credential.type == 'ec2' }.length).to be 1
+
+      # Update secret key
+      new_secret_key = '62307bcd-ca3c-47ae-a114-27a6cadb5bc9'
+      new_blob_json = {:access => access_key,
+                       :secret => new_secret_key}.to_json
+      foo_credential.update(:blob => new_blob_json)
+      expect(JSON.parse(foo_credential.blob)['secret']).to eq new_secret_key
+
+      # Read the credential freshly and check the secret key
+      expect(@id_v3.os_credentials.all.select { |credential| credential.type == 'ec2' }.length).to be 1
+      updated_credential = @id_v3.os_credentials.find_by_id credential_id
+      expect(updated_credential).to_not be_nil
+      expect(updated_credential.type).to eq 'ec2'
+      expect(JSON.parse(updated_credential.blob)['secret']).to eq new_secret_key
+
+      # Delete the credential
+      updated_credential.destroy
+
+      # Check that the deletion worked
+      expect { @id_v3.os_credentials.find_by_id credential_id }.to raise_error(Fog::Identity::OpenStack::NotFound)
+      expect(@id_v3.os_credentials.all.select { |credential| credential.type == 'ec2' }.length).to be 0
+    end
+  end
+
+  it "lists policies" do
+    VCR.use_cassette('idv3_policy') do
+      policies = @id_v3.policies
+      expect(policies).to_not be_nil
+      expect(policies.length).to be 0
+
+      policies_all = @id_v3.policies.all
+      expect(policies_all).to_not be_nil
+      expect(policies_all.length).to be 0
+
+      expect { @id_v3.policies.find_by_id 'atlantis' }.to raise_error(Fog::Identity::OpenStack::NotFound)
+    end
+  end
+
+  it "CRUD policies" do
+    VCR.use_cassette('idv3_policy_crud') do
+
+      blob = {'foobar_user' => ['role:compute-user']}.to_json
+
+      # Make sure there are no existing policies
+      expect(@id_v3.policies.all.select { |policy| policy.type == 'application/json' }.length).to be 0
+
+      # Create a policy
+      foo_policy = @id_v3.policies.create(:type => 'application/json',
+                                          :blob => blob)
+      policy_id = foo_policy.id
+      expect(@id_v3.policies.all.select { |policy| policy.type == 'application/json' }.length).to be 1
+
+      # Update policy blob
+      new_blob = {'baz_user' => ['role:compute-user']}.to_json
+      foo_policy.update(:blob => new_blob)
+      expect(foo_policy.blob).to eq new_blob
+
+      # Read the policy freshly and check the secret key
+      expect(@id_v3.policies.all.select { |policy| policy.type == 'application/json' }.length).to be 1
+      updated_policy = @id_v3.policies.find_by_id policy_id
+      expect(updated_policy).to_not be_nil
+      expect(updated_policy.type).to eq 'application/json'
+      expect(updated_policy.blob).to eq new_blob
+
+      # Delete the policy
+      updated_policy.destroy
+
+      # Check that the deletion worked
+      expect { @id_v3.policies.find_by_id policy_id }.to raise_error(Fog::Identity::OpenStack::NotFound)
+      expect(@id_v3.policies.all.select { |policy| policy.type == 'application/json' }.length).to be 0
+    end
+  end
+
+end