This is an automated email from the git hooks/post-receive script.
spichugi pushed a commit to branch master
in repository lib389.
commit 8f61549d02d7eb37c3215d3b1124d681a7caf410
Author: Simon Pichugin <spichugi(a)redhat.com>
Date: Tue Apr 11 22:47:14 2017 +0200
Issue 22 - Specify a basedn parameter for IDM modules
Description: We need a way to create our IDM users and groups in a
custom suffix. Now it is hard coded to 'ou=people' for users,
'ou=groups' for groups, etc.
Also, it is important to do not break current functionality.
CLI IDM depends on it. The parameter should remain optional,
with a default set to 'ou=people' for users, 'ou=groups' for groups,
etc.
Also, fix test module names, so they can be successfully
discovered by pytest.
https://pagure.io/lib389/issue/22
Reviewed by: wibrown (Thanks!)
---
lib389/idm/group.py | 8 ++++----
lib389/idm/posixgroup.py | 4 ++--
lib389/idm/services.py | 4 ++--
lib389/idm/user.py | 4 ++--
lib389/tests/cli/{adm_instance.py => adm_instance_test.py} | 0
lib389/tests/cli/{conf_backend.py => conf_backend_test.py} | 0
lib389/tests/cli/{conf_plugin.py => conf_plugin_test.py} | 0
lib389/tests/idm/{services.py => services_test.py} | 0
lib389/tests/idm/{users_and_groups.py => user_and_group_test.py} | 0
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib389/idm/group.py b/lib389/idm/group.py
index e4c102b..eabebfb 100644
--- a/lib389/idm/group.py
+++ b/lib389/idm/group.py
@@ -36,14 +36,14 @@ class Group(DSLdapObject):
self.remove('member', dn)
class Groups(DSLdapObjects):
- def __init__(self, instance, basedn, batch=False):
+ def __init__(self, instance, basedn, batch=False, rdn='ou=Groups'):
super(Groups, self).__init__(instance, batch)
self._objectclasses = [
'groupOfNames',
]
self._filterattrs = [RDN]
self._childobject = Group
- self._basedn = 'ou=Groups,%s' % basedn
+ self._basedn = '{},{}'.format(rdn, basedn)
class UniqueGroup(DSLdapObject):
# WARNING!!!
@@ -71,14 +71,14 @@ class UniqueGroup(DSLdapObject):
class UniqueGroups(DSLdapObjects):
# WARNING!!!
# Use group, not unique group!!!
- def __init__(self, instance, basedn, batch=False):
+ def __init__(self, instance, basedn, batch=False, rdn='ou=Groups'):
super(UniqueGroups, self).__init__(instance, batch)
self._objectclasses = [
'groupOfUniqueNames',
]
self._filterattrs = [RDN]
self._childobject = UniqueGroup
- self._basedn = 'ou=Groups,%s' % basedn
+ self._basedn = '{},{}'.format(rdn, basedn)
diff --git a/lib389/idm/posixgroup.py b/lib389/idm/posixgroup.py
index aebfb5f..c3ad1c2 100644
--- a/lib389/idm/posixgroup.py
+++ b/lib389/idm/posixgroup.py
@@ -36,7 +36,7 @@ class PosixGroup(DSLdapObject):
class PosixGroups(DSLdapObjects):
- def __init__(self, instance, basedn, batch=False):
+ def __init__(self, instance, basedn, batch=False, rdn='ou=Groups'):
super(PosixGroups, self).__init__(instance, batch)
self._objectclasses = [
'groupOfNames',
@@ -44,6 +44,6 @@ class PosixGroups(DSLdapObjects):
]
self._filterattrs = [RDN]
self._childobject = PosixGroup
- self._basedn = 'ou=Groups,%s' % basedn
+ self._basedn = '{},{}'.format(rdn, basedn)
diff --git a/lib389/idm/services.py b/lib389/idm/services.py
index b59e345..129dad2 100644
--- a/lib389/idm/services.py
+++ b/lib389/idm/services.py
@@ -25,12 +25,12 @@ class ServiceAccount(DSLdapObject):
self._protected = False
class ServiceAccounts(DSLdapObjects):
- def __init__(self, instance, basedn, batch=False):
+ def __init__(self, instance, basedn, batch=False, rdn='ou=Services'):
super(ServiceAccounts, self).__init__(instance, batch)
self._objectclasses = [
'netscapeServer',
]
self._filterattrs = [RDN]
self._childobject = ServiceAccount
- self._basedn = 'ou=Services,%s' % basedn
+ self._basedn = '{},{}'.format(rdn, basedn)
diff --git a/lib389/idm/user.py b/lib389/idm/user.py
index 5b7e4be..d422ed9 100644
--- a/lib389/idm/user.py
+++ b/lib389/idm/user.py
@@ -48,7 +48,7 @@ class UserAccount(DSLdapObject):
# Can't I actually just set, and it will hash?
class UserAccounts(DSLdapObjects):
- def __init__(self, instance, basedn, batch=False):
+ def __init__(self, instance, basedn, batch=False, rdn='ou=People'):
super(UserAccounts, self).__init__(instance, batch)
self._objectclasses = [
'account',
@@ -59,5 +59,5 @@ class UserAccounts(DSLdapObjects):
]
self._filterattrs = [RDN]
self._childobject = UserAccount
- self._basedn = 'ou=People,%s' % basedn
+ self._basedn = '{},{}'.format(rdn, basedn)
diff --git a/lib389/tests/cli/adm_instance.py b/lib389/tests/cli/adm_instance_test.py
similarity index 100%
rename from lib389/tests/cli/adm_instance.py
rename to lib389/tests/cli/adm_instance_test.py
diff --git a/lib389/tests/cli/conf_backend.py b/lib389/tests/cli/conf_backend_test.py
similarity index 100%
rename from lib389/tests/cli/conf_backend.py
rename to lib389/tests/cli/conf_backend_test.py
diff --git a/lib389/tests/cli/conf_plugin.py b/lib389/tests/cli/conf_plugin_test.py
similarity index 100%
rename from lib389/tests/cli/conf_plugin.py
rename to lib389/tests/cli/conf_plugin_test.py
diff --git a/lib389/tests/idm/services.py b/lib389/tests/idm/services_test.py
similarity index 100%
rename from lib389/tests/idm/services.py
rename to lib389/tests/idm/services_test.py
diff --git a/lib389/tests/idm/users_and_groups.py
b/lib389/tests/idm/user_and_group_test.py
similarity index 100%
rename from lib389/tests/idm/users_and_groups.py
rename to lib389/tests/idm/user_and_group_test.py
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.