Implementation of LDAP functions

implementations of delete_tenant, delete_user,
  remove_role_from_user_and_tenant, get_tenant_users
  role.delete_user and remove_role_from_user_and_tenant
  remove_user_from_tenant, change_ role

clean up LDAP sample data for live LDAP

properly check for existance of tenant_id in user.

Some tests expected the functions to be unimplemented.  Those hid the
failuers on the LDAP Identity provider and have been removed.

Make live tests extend the standard LDAP tests, so they test the same features.

Bug 1021315

Change-Id: I2866ff40fdc13040ba10d189ea2d95440eb4395c

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/_ldap_livetest.py b/tests/_ldap_livetest.py
index 1a7e3276..73a9bad0 100644
--- a/tests/_ldap_livetest.py
+++ b/tests/_ldap_livetest.py
@@ -22,6 +22,7 @@ from keystone import test
 
 import default_fixtures
 import test_backend
+import test_backend_ldap
 
 
 CONF = config.CONF
@@ -40,10 +41,9 @@ def delete_object(name):
 
 
 def clear_live_database():
-    roles = ['keystone_admin']
+    roles = ['keystone_admin', 'fake1', 'fake2', 'useless']
     groups = ['baz', 'bar', 'tenent4add', 'fake1', 'fake2']
     users = ['foo', 'two', 'fake1', 'fake2', 'no_meta']
-    roles = ['keystone_admin', 'useless']
 
     for group in groups:
         for role in roles:
@@ -57,9 +57,9 @@ def clear_live_database():
         delete_object('cn=%s,ou=Roles' % role)
 
 
-class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
+class LiveLDAPIdentity(test_backend_ldap.LDAPIdentity):
     def setUp(self):
-        super(LDAPIdentity, self).setUp()
+        super(LiveLDAPIdentity, self).setUp()
         self.config([test.etcdir('keystone.conf.sample'),
                      test.testsdir('test_overrides.conf'),
                      test.testsdir('backend_liveldap.conf')])