mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Optionally wait for 389-ds postop plugins to complete
Add a new command that lets you wait for an attribute to appear in a value. Using this you can do things like wait for a managed entry to be created, adding a new objectclass to the parent entry. This is controlled by a new booleon option, wait_for_attr, defaulting to False. https://fedorahosted.org/freeipa/ticket/1144
This commit is contained in:
committed by
Martin Kosek
parent
c09f116f43
commit
1dd9e14073
@@ -21,7 +21,7 @@
|
||||
Defines the expected objectclass for various entries.
|
||||
"""
|
||||
|
||||
user = [
|
||||
user_base = [
|
||||
u'top',
|
||||
u'person',
|
||||
u'organizationalperson',
|
||||
@@ -33,6 +33,8 @@ user = [
|
||||
u'ipaobject',
|
||||
]
|
||||
|
||||
user = user_base + [u'mepOriginEntry']
|
||||
|
||||
group = [
|
||||
u'top',
|
||||
u'groupofnames',
|
||||
|
||||
@@ -61,6 +61,9 @@ class test_attr(Declarative):
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -590,6 +590,9 @@ class test_group(Declarative):
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user1, api.env.basedn),
|
||||
),
|
||||
),
|
||||
@@ -691,7 +694,7 @@ class test_group(Declarative):
|
||||
homedirectory=[u'/home/tuser1'],
|
||||
krbprincipalname=[u'tuser1@' + api.env.realm],
|
||||
loginshell=[u'/bin/sh'],
|
||||
objectclass=objectclasses.user,
|
||||
objectclass=objectclasses.user_base,
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
|
||||
@@ -23,6 +23,7 @@ Test the `ipalib.plugins.hostgroup` module.
|
||||
"""
|
||||
|
||||
from ipalib import api, errors
|
||||
from ipalib.dn import DN
|
||||
from tests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
|
||||
from tests.test_xmlrpc import objectclasses
|
||||
|
||||
@@ -79,6 +80,7 @@ class test_hostgroup(Declarative):
|
||||
objectclass=objectclasses.hostgroup,
|
||||
description=[u'Test hostgroup 1'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
mepmanagedentry=['cn=%s,cn=ng,cn=alt,%s' % (hostgroup1, api.env.basedn)],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -106,6 +106,9 @@ class test_krbtpolicy(Declarative):
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user1, api.env.basedn)
|
||||
),
|
||||
),
|
||||
|
||||
@@ -167,6 +167,9 @@ class test_nesting(Declarative):
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user1, api.env.basedn)
|
||||
),
|
||||
),
|
||||
@@ -196,6 +199,9 @@ class test_nesting(Declarative):
|
||||
cn=[u'Test User2'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user2, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user2, api.env.basedn)
|
||||
),
|
||||
),
|
||||
@@ -225,6 +231,9 @@ class test_nesting(Declarative):
|
||||
cn=[u'Test User3'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user3, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user3, api.env.basedn)
|
||||
),
|
||||
),
|
||||
@@ -254,6 +263,9 @@ class test_nesting(Declarative):
|
||||
cn=[u'Test User4'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user4, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user4, api.env.basedn)
|
||||
),
|
||||
),
|
||||
@@ -623,6 +635,7 @@ class test_nesting(Declarative):
|
||||
objectclass=objectclasses.hostgroup,
|
||||
description=[u'Test hostgroup 1'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
mepmanagedentry=[u'cn=%s,cn=ng,cn=alt,%s' % (hostgroup1, api.env.basedn)],
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -642,6 +655,7 @@ class test_nesting(Declarative):
|
||||
objectclass=objectclasses.hostgroup,
|
||||
description=[u'Test hostgroup 2'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
mepmanagedentry=[u'cn=%s,cn=ng,cn=alt,%s' % (hostgroup2, api.env.basedn)],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -183,6 +183,8 @@ class test_netgroup(Declarative):
|
||||
cn=[hostgroup1],
|
||||
objectclass=objectclasses.hostgroup,
|
||||
description=[u'Test hostgroup 1'],
|
||||
mepmanagedentry=['cn=%s,cn=ng,cn=alt,%s' % (hostgroup1, api
|
||||
.env.basedn)],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
),
|
||||
),
|
||||
@@ -212,6 +214,9 @@ class test_netgroup(Declarative):
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user1, api.env.basedn),
|
||||
),
|
||||
),
|
||||
@@ -240,6 +245,9 @@ class test_netgroup(Declarative):
|
||||
cn=[u'Test User2'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user2, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user2, api.env.basedn),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -67,6 +67,9 @@ class test_replace(Declarative):
|
||||
initials=[u'TU'],
|
||||
mail=[u'test1@example.com', u'test2@example.com'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -98,6 +98,9 @@ class test_user(Declarative):
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
|
||||
),
|
||||
),
|
||||
@@ -153,7 +156,7 @@ class test_user(Declarative):
|
||||
'krbprincipalname': [u'tuser1@' + api.env.realm],
|
||||
'loginshell': [u'/bin/sh'],
|
||||
'memberof_group': [u'ipausers'],
|
||||
'objectclass': objectclasses.user + [u'mepOriginEntry'],
|
||||
'objectclass': objectclasses.user,
|
||||
'sn': [u'User1'],
|
||||
'uid': [user1],
|
||||
'uidnumber': [fuzzy_digits],
|
||||
@@ -442,6 +445,9 @@ class test_user(Declarative):
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
|
||||
),
|
||||
),
|
||||
@@ -471,6 +477,9 @@ class test_user(Declarative):
|
||||
cn=[u'Test User2'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user2, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=tuser2,cn=users,cn=accounts,' + api.env.basedn,
|
||||
),
|
||||
),
|
||||
@@ -602,6 +611,9 @@ class test_user(Declarative):
|
||||
postalcode=[u'01234-5678'],
|
||||
telephonenumber=[u'410-555-1212'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
memberof_group=[u'ipausers'],
|
||||
dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
|
||||
),
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user