[openstack|identity] Rough implementation of the Keystone API (untested)

Updated Openstack to handle other endpoints

lib/fog/openstack.rb

@@ -98,16 +98,10 @@ module Fog
       })
       body=Fog::JSON.decode(response.body)
      
-      if svc = body['access']['serviceCatalog'].detect{|x| x['name'] == @compute_service_name}
-        mgmt_url = svc['endpoints'].detect{|x| x['publicURL']}['publicURL']
-        token = body['access']['token']['id']
-        return {
-          :token => token,
-          :server_management_url => mgmt_url
-        } 
-      else
-        raise "Unable to parse service catalog."
-      end
+      return {
+        :token => body['access']['token']['id'],
+        :access => body['access']
+      } 
  
     end
 

lib/fog/openstack/compute.rb

@@ -206,8 +206,15 @@ module Fog
               credentials = Fog::OpenStack.authenticate_v1(options, @connection_options)
             end
             @auth_token = credentials[:token]
-            url = credentials[:server_management_url]
-            uri = URI.parse(url)
+            
+            if svc = credentials[:access]['serviceCatalog'].detect{|x| x['name'] == @openstack_compute_service_name}
+              mgmt_url = svc['endpoints'].detect{|x| x['publicURL']}['publicURL']
+
+              url = mgmt_url
+              uri = URI.parse(url)
+            else
+              raise "Unable to find Compute service in Catalog."
+            end
           else
             @auth_token = @openstack_auth_token
             uri = URI.parse(@openstack_management_url)

lib/fog/openstack/identity.rb

@@ -0,0 +1,126 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'openstack'))
+require 'fog/openstack'
+
+module Fog
+  module Identity
+    class OpenStack < Fog::Service
+
+      requires :openstack_api_key, :openstack_username, :openstack_auth_url
+      recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_compute_service_name, :openstack_tenant
+
+      # model_path 'fog/openstack/models/identity'
+      # model       :tenant
+      # collection  :tenants
+      # model       :user
+      # collection  :users
+      
+
+      
+
+      request_path 'fog/openstack/requests/identity'
+      request :check_token
+      request :get_tenants
+      request :get_tenants_by_id
+      request :get_tenants_by_name
+      request :get_user_by_id
+      request :get_user_by_name
+      request :list_endpoints_for_token
+      request :list_roles_for_user_on_tenant
+      request :list_user_global_roles
+      request :validate_tokens
+      
+      
+
+      class Mock
+
+
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          require 'multi_json'
+          @openstack_api_key = options[:openstack_api_key]
+          @openstack_username = options[:openstack_username]
+          @openstack_tenant = options[:openstack_tenant]
+          @openstack_compute_service_name = options[:openstack_compute_service_name] || 'nova'
+          @openstack_auth_url = options[:openstack_auth_url]
+          @openstack_auth_token = options[:openstack_auth_token]
+          @openstack_management_url = options[:openstack_management_url]
+          @openstack_must_reauthenticate = false
+          @connection_options = options[:connection_options] || {}
+          authenticate
+          @persistent = options[:persistent] || false
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params)
+          begin
+            response = @connection.request(params.merge({
+              :headers  => {
+                'Content-Type' => 'application/json',
+                'X-Auth-Token' => @auth_token
+              }.merge!(params[:headers] || {}),
+              :host     => @host,
+              :path     => "#{@path}/#{params[:path]}",
+              :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)
+            }))
+          rescue Excon::Errors::Unauthorized => error
+            if error.response.body != 'Bad username or password' # token expiration
+              @openstack_must_reauthenticate = true
+              authenticate
+              retry
+            else # bad credentials
+              raise error
+            end
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+            when Excon::Errors::NotFound
+              Fog::Compute::OpenStack::NotFound.slurp(error)
+            else
+              error
+            end
+          end
+          unless response.body.empty?
+            response.body = MultiJson.decode(response.body)
+          end
+          response
+        end
+
+        private
+
+        def authenticate
+          if @openstack_must_reauthenticate || @openstack_auth_token.nil?
+            options = {
+              :openstack_api_key  => @openstack_api_key,
+              :openstack_username => @openstack_username,
+              :openstack_auth_url => @openstack_auth_url,
+              :openstack_tenant => @openstack_tenant,
+            }
+            
+            credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            
+            @auth_token = credentials[:token]
+            
+            url = @openstack_auth_url
+            uri = URI.parse(url)
+          else
+            @auth_token = @openstack_auth_token
+            uri = URI.parse(@openstack_management_url)
+          end
+          @host   = uri.host
+          @path   = uri.path
+          @path.sub!(/\/$/, '')
+          @port   = uri.port
+          @scheme = uri.scheme
+        end
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/check_token.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def check_token(token_id, tenant_id)
+          
+          request(
+            :expects  => [200, 203],
+            :method   => 'HEAD',
+            :path     => "tokens/#{token_id}​?belongsTo=#{tenant_id}"
+          )
+
+          # TODO: Handle 404
+
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/get_tenants.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def get_tenants
+          
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "tenants"
+          )
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/get_tenants_by_id.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def get_tenants_by_id(tenant_id)
+          
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "tenants/#{tenant_id}"
+          )
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/get_tenants_by_name.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def get_tenants_by_name(name)
+          
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "tenants?name=#{name}"
+          )
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/get_user_by_id.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def get_user_by_id(user_id)
+          
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "users/#{user_id}"
+          )
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/get_user_by_name.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def get_user_by_name(name)
+          
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "users?name=#{name}"
+          )
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/list_endpoints_for_token.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def list_endpoints_for_token(token_id)
+          
+          request(
+            :expects  => [200, 203],
+            :method   => 'HEAD',
+            :path     => "tokens/#{token_id}​/endpoints"
+          )
+
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/list_roles_for_user_on_tenant.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def list_roles_for_user_on_tenant(tenant_id, user_id)
+          
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "tenants/#{tenant_id}/users/#{user_id}/roles"
+          )
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/list_user_global_roles.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def list_user_global_roles(user_id)
+          
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "users/#{user_id}/roles"
+          )
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end

lib/fog/openstack/requests/identity/validate_token.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Identity
+    class Openstack
+      class Real
+
+        def validate_token(token_id, tenant_id)
+          
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "tokens/#{token_id}​?belongsTo=#{tenant_id}"
+          )
+
+          # TODO: Handle 404
+          
+        end
+
+      end
+
+      class Mock
+
+
+
+      end
+    end
+  end
+end