Merge pull request #1366 from CobyR/master

fix for tenant.users returning all users

lib/fog/openstack/models/identity/tenant.rb

@@ -22,7 +22,7 @@ module Fog
 
         def users
           requires :id
-          connection.users(:tenant => self)
+          connection.users(:tenant_id => self.id)
         end
 
         def destroy

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

@@ -14,8 +14,17 @@ module Fog
 
       class Mock
         def list_users(tenant_id = nil)
+          users = self.data[:users].values
+
+          if tenant_id
+            users = users.select {
+              |user| user['tenantId'] == tenant_id
+            }
+          end
+                         
+          
           Excon::Response.new(
-            :body   => { 'users' => self.data[:users].values },
+            :body   => { 'users' => users },
             :status => 200
           )
         end

tests/openstack/models/identity/tenant_tests.rb

@@ -4,6 +4,12 @@ Shindo.tests("Fog::Identity[:openstack] | tenant", ['openstack']) do
       instance = Fog::Identity[:openstack].tenants.first
       instance.roles_for(0)
     end
+
+    tests('#users').succeeds do
+      instance = Fog::Identity[:openstack].tenants.first
+
+      instance.users.count != Fog::Identity[:openstack].users.count
+    end
   end
 
   tests('CRUD') do