| |
@@ -13,7 +13,7 @@
|
| |
from lib389.schema import Schema
|
| |
from lib389.idm.domain import Domain
|
| |
from lib389.idm.user import UserAccount, UserAccounts, TEST_USER_PROPERTIES
|
| |
- from lib389.idm.organisationalrole import OrganisationalRole, OrganisationalRoles
|
| |
+ from lib389.idm.organizationalrole import OrganizationalRole, OrganizationalRoles
|
| |
|
| |
from lib389.topologies import topology_m2
|
| |
from lib389._constants import SUFFIX, DN_SCHEMA, DN_DM, DEFAULT_SUFFIX, PASSWORD
|
| |
@@ -156,7 +156,7 @@
|
| |
ACI_BODY = ACI_TARGET_TO + ACI_TARGET_FROM + ACI_ALLOW + ACI_SUBJECT
|
| |
# topology_m2.ms["master1"].modify_s(SUFFIX, mod)
|
| |
topology_m2.ms["master1"].log.info("Add a DENY aci under %s " % PROD_EXCEPT_DN)
|
| |
- prod_except = OrganisationalRole(topology_m2.ms["master1"], PROD_EXCEPT_DN)
|
| |
+ prod_except = OrganizationalRole(topology_m2.ms["master1"], PROD_EXCEPT_DN)
|
| |
prod_except.set('aci', ACI_BODY, mod_type)
|
| |
|
| |
|
| |
@@ -226,7 +226,7 @@
|
| |
"""
|
| |
|
| |
m1 = topology_m2.ms["master1"]
|
| |
- o_roles = OrganisationalRoles(m1, SUFFIX)
|
| |
+ o_roles = OrganizationalRoles(m1, SUFFIX)
|
| |
|
| |
m1.log.info("\n\n######## INITIALIZATION ########\n")
|
| |
|
| |
@@ -250,7 +250,7 @@
|
| |
|
| |
# DIT for production/except
|
| |
m1.log.info("Add {}".format(PROD_EXCEPT_DN))
|
| |
- o_roles_prod = OrganisationalRoles(m1, PRODUCTION_DN)
|
| |
+ o_roles_prod = OrganizationalRoles(m1, PRODUCTION_DN)
|
| |
o_roles_prod.create(properties={'cn': EXCEPT_CN, 'description': "production except DIT"})
|
| |
|
| |
# enable acl error logging
|
| |
@@ -445,7 +445,7 @@
|
| |
old_dn = "%s,%s" % (old_rdn, STAGING_DN)
|
| |
new_rdn = old_rdn
|
| |
new_superior = PRODUCTION_DN
|
| |
- prod = OrganisationalRole(topology_m2.ms["master1"], PRODUCTION_DN)
|
| |
+ prod = OrganizationalRole(topology_m2.ms["master1"], PRODUCTION_DN)
|
| |
|
| |
#
|
| |
# Try to rename without the appropriate ACI => INSUFFICIENT_ACCESS
|
| |
Bug description:
RFC4519 defines 'organization' object class using Oxford spelling.
It is common for academic, formal, and technical writing for an
international readership. We should be following common spelling
in function names and methods, otherwise it is confusing
and annoying to remember which one is used where.
Fix description:
Use Oxford spelling for 'organization' and 'organizationalUnit'.
https://pagure.io/389-ds-base/issue/49678
Reviewed by: ???