ipalib: use relative imports for cross-plugin imports

This will make it possible to move the plugin modules between ipalib,
ipaclient and ipaserver without having to change the imports.

https://fedorahosted.org/freeipa/ticket/4739

Reviewed-By: David Kupka <dkupka@redhat.com>

ipalib/plugins/aci.py

@@ -128,7 +128,7 @@ from ipalib.aci import ACI
 from ipalib import output
 from ipalib import _, ngettext
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
+from .baseldap import gen_pkey_only_option, pkey_to_value
 from ipapython.ipa_log_manager import root_logger
 from ipapython.dn import DN
 

ipalib/plugins/automember.py

@@ -25,7 +25,7 @@ import six
 from ipalib import api, errors, Str, StrEnum, DNParam, Flag, _, ngettext
 from ipalib import output, Command
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     pkey_to_value,
     entry_to_dict,
     LDAPObject,

ipalib/plugins/automount.py

@@ -26,7 +26,7 @@ from ipalib import api, errors
 from ipalib import Flag, Str, IA5Str
 from ipalib.frontend import Command
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     pkey_to_value,
     LDAPObject,
     LDAPCreate,

ipalib/plugins/baseuser.py

@@ -24,10 +24,10 @@ import six
 from ipalib import api, errors
 from ipalib import Flag, Int, Password, Str, Bool, StrEnum, DateTime, Bytes
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     DN, LDAPObject, LDAPCreate, LDAPUpdate, LDAPSearch, LDAPDelete,
     LDAPRetrieve, LDAPAddMember, LDAPRemoveMember)
-from ipalib.plugins.service import validate_certificate
+from .service import validate_certificate
 from ipalib.request import context
 from ipalib import _
 from ipapython.ipautil import ipa_generate_password

ipalib/plugins/caacl.py

@@ -7,12 +7,12 @@ import pyhbac
 from ipalib import api, errors, output
 from ipalib import Bool, Str, StrEnum
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject, LDAPSearch, LDAPCreate, LDAPDelete, LDAPQuery,
     LDAPUpdate, LDAPRetrieve, LDAPAddMember, LDAPRemoveMember,
     global_output_params, pkey_to_value)
-from ipalib.plugins.hbacrule import is_all
-from ipalib.plugins.service import normalize_principal, split_any_principal
+from .hbacrule import is_all
+from .service import normalize_principal, split_any_principal
 from ipalib import _, ngettext
 from ipapython.dn import DN
 

ipalib/plugins/cert.py

@@ -31,15 +31,15 @@ from ipalib import x509
 from ipalib import util
 from ipalib import ngettext
 from ipalib.plugable import Registry
-from ipalib.plugins.virtual import VirtualCommand
-from ipalib.plugins.baseldap import pkey_to_value
-from ipalib.plugins.service import split_any_principal
-from ipalib.plugins.certprofile import validate_profile_id
-import ipalib.plugins.caacl
+from .virtual import VirtualCommand
+from .baseldap import pkey_to_value
+from .service import split_any_principal
+from .certprofile import validate_profile_id
+from .caacl import acl_evaluate
 from ipalib.text import _
 from ipalib.request import context
 from ipalib import output
-from ipalib.plugins.service import validate_principal
+from .service import validate_principal
 from ipapython.dn import DN
 
 import six
@@ -228,7 +228,7 @@ def ca_enabled_check():
 
 def caacl_check(principal_type, principal_string, ca, profile_id):
     principal_type_map = {USER: 'user', HOST: 'host', SERVICE: 'service'}
-    if not ipalib.plugins.caacl.acl_evaluate(
+    if not acl_evaluate(
             principal_type_map[principal_type],
             principal_string, ca, profile_id):
         raise errors.ACIError(info=_(

ipalib/plugins/certprofile.py

@@ -7,7 +7,7 @@ import re
 from ipalib import api, Bool, File, Str
 from ipalib import util
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject, LDAPSearch, LDAPCreate,
     LDAPDelete, LDAPUpdate, LDAPRetrieve)
 from ipalib.request import context

ipalib/plugins/config.py

@@ -22,11 +22,11 @@ from ipalib import api
 from ipalib import Bool, Int, Str, IA5Str, StrEnum, DNParam
 from ipalib import errors
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject,
     LDAPUpdate,
     LDAPRetrieve)
-from ipalib.plugins.selinuxusermap import validate_selinuxuser
+from .selinuxusermap import validate_selinuxuser
 from ipalib import _
 from ipapython.dn import DN
 

ipalib/plugins/delegation.py

@@ -24,7 +24,7 @@ from ipalib import api, crud
 from ipalib import output
 from ipalib import Object
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
+from .baseldap import gen_pkey_only_option, pkey_to_value
 
 __doc__ = _("""
 Group to Group Delegation

ipalib/plugins/dns.py

@@ -42,7 +42,7 @@ from ipalib.capabilities import (
 from ipalib.parameters import (Flag, Bool, Int, Decimal, Str, StrEnum, Any,
                                DeprecatedParam, DNSNameParam)
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     pkey_to_value,
     LDAPObject,
     LDAPCreate,

ipalib/plugins/group.py

@@ -23,7 +23,7 @@ import six
 from ipalib import api
 from ipalib import Int, Str, Flag
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     add_external_post_callback,
     pkey_to_value,
     remove_external_post_callback,
@@ -37,8 +37,8 @@ from ipalib.plugins.baseldap import (
     LDAPRemoveMember,
     LDAPQuery,
 )
-from ipalib.plugins.idviews import remove_ipaobject_overrides
-from ipalib.plugins import baseldap
+from .idviews import remove_ipaobject_overrides
+from . import baseldap
 from ipalib import _, ngettext
 from ipalib import errors
 from ipalib import output

ipalib/plugins/hbacrule.py

@@ -20,7 +20,7 @@
 from ipalib import api, errors
 from ipalib import AccessTime, Str, StrEnum, Bool, DeprecatedParam
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     pkey_to_value,
     external_host_param,
     LDAPObject,

ipalib/plugins/hbacsvc.py

@@ -20,8 +20,8 @@
 from ipalib import api
 from ipalib import Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import LDAPObject, LDAPCreate, LDAPDelete
-from ipalib.plugins.baseldap import LDAPUpdate, LDAPSearch, LDAPRetrieve
+from .baseldap import LDAPObject, LDAPCreate, LDAPDelete
+from .baseldap import LDAPUpdate, LDAPSearch, LDAPRetrieve
 
 from ipalib import _, ngettext
 

ipalib/plugins/hbacsvcgroup.py

@@ -19,7 +19,7 @@
 
 from ipalib import api, Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject,
     LDAPCreate,
     LDAPUpdate,

ipalib/plugins/host.py

@@ -26,17 +26,17 @@ from ipalib import api, errors, util
 from ipalib import messages
 from ipalib import Str, Flag, Bytes
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (LDAPQuery, LDAPObject, LDAPCreate,
+from .baseldap import (LDAPQuery, LDAPObject, LDAPCreate,
                                      LDAPDelete, LDAPUpdate, LDAPSearch,
                                      LDAPRetrieve, LDAPAddMember,
                                      LDAPRemoveMember, host_is_master,
                                      pkey_to_value, add_missing_object_class,
                                      LDAPAddAttribute, LDAPRemoveAttribute)
-from ipalib.plugins.service import (split_principal, validate_certificate,
+from .service import (split_principal, validate_certificate,
     set_certificate_attrs, ticket_flags_params, update_krbticketflags,
     set_kerberos_attrs, rename_ipaallowedtoperform_from_ldap,
     rename_ipaallowedtoperform_to_ldap, revoke_certs)
-from ipalib.plugins.dns import (dns_container_exists,
+from .dns import (dns_container_exists,
         add_records_for_host_validation, add_records_for_host,
         get_reverse_zone)
 from ipalib import _, ngettext

ipalib/plugins/hostgroup.py

@@ -21,12 +21,12 @@
 import six
 
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (LDAPObject, LDAPCreate, LDAPRetrieve,
+from .baseldap import (LDAPObject, LDAPCreate, LDAPRetrieve,
                                      LDAPDelete, LDAPUpdate, LDAPSearch,
                                      LDAPAddMember, LDAPRemoveMember,
                                      entry_from_entry, wait_for_value)
 from ipalib import Str, api, _, ngettext, errors
-from ipalib.plugins.netgroup import NETGROUP_PATTERN, NETGROUP_PATTERN_ERRMSG
+from .netgroup import NETGROUP_PATTERN, NETGROUP_PATTERN_ERRMSG
 from ipapython.dn import DN
 
 if six.PY3:

ipalib/plugins/idrange.py

@@ -20,7 +20,7 @@
 import six
 
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (LDAPObject, LDAPCreate, LDAPDelete,
+from .baseldap import (LDAPObject, LDAPCreate, LDAPDelete,
                                      LDAPRetrieve, LDAPSearch, LDAPUpdate)
 from ipalib import api, Int, Str, DeprecatedParam, StrEnum, _, ngettext
 from ipalib import errors

ipalib/plugins/idviews.py

@@ -21,12 +21,12 @@ import re
 
 import six
 
-from ipalib.plugins.baseldap import (LDAPQuery, LDAPObject, LDAPCreate,
+from .baseldap import (LDAPQuery, LDAPObject, LDAPCreate,
                                      LDAPDelete, LDAPUpdate, LDAPSearch,
                                      LDAPAddAttribute, LDAPRemoveAttribute,
                                      LDAPRetrieve, global_output_params)
-from ipalib.plugins.hostgroup import get_complete_hostgroup_member_list
-from ipalib.plugins.service import validate_certificate
+from .hostgroup import get_complete_hostgroup_member_list
+from .service import validate_certificate
 from ipalib import api, Str, Int, Bytes, Flag, _, ngettext, errors, output
 from ipalib.constants import IPA_ANCHOR_PREFIX, SID_ANCHOR_PREFIX
 from ipalib.plugable import Registry

ipalib/plugins/krbtpolicy.py

@@ -19,8 +19,8 @@
 
 from ipalib import api, errors, output, _
 from ipalib import Int, Str
-from ipalib.plugins import baseldap
-from ipalib.plugins.baseldap import entry_to_dict, pkey_to_value
+from . import baseldap
+from .baseldap import entry_to_dict, pkey_to_value
 from ipalib.plugable import Registry
 from ipapython.dn import DN
 

ipalib/plugins/migration.py

@@ -27,7 +27,7 @@ from ipalib import api, errors, output
 from ipalib import Command, Password, Str, Flag, StrEnum, DNParam, File, Bool
 from ipalib.cli import to_cli
 from ipalib.plugable import Registry
-from ipalib.plugins.user import NO_UPG_MAGIC
+from .user import NO_UPG_MAGIC
 if api.env.in_server and api.env.context in ['lite', 'server']:
     try:
         from ipaserver.plugins.ldap2 import ldap2

ipalib/plugins/netgroup.py

@@ -23,7 +23,7 @@ import six
 from ipalib import api, errors
 from ipalib import Str, StrEnum, Flag
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     external_host_param,
     add_external_pre_callback,
     add_external_post_callback,
@@ -37,7 +37,7 @@ from ipalib.plugins.baseldap import (
     LDAPAddMember,
     LDAPRemoveMember)
 from ipalib import _, ngettext
-from ipalib.plugins.hbacrule import is_all
+from .hbacrule import is_all
 from ipapython.dn import DN
 
 if six.PY3:

ipalib/plugins/otpconfig.py

@@ -19,7 +19,7 @@
 
 from ipalib import _, api, Int
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import DN, LDAPObject, LDAPUpdate, LDAPRetrieve
+from .baseldap import DN, LDAPObject, LDAPUpdate, LDAPRetrieve
 
 __doc__ = _("""
 OTP configuration

ipalib/plugins/otptoken.py

@@ -20,8 +20,8 @@
 from __future__ import print_function
 import sys
 
-from ipalib.plugins.baseldap import LDAPObject, LDAPAddMember, LDAPRemoveMember
-from ipalib.plugins.baseldap import LDAPCreate, LDAPDelete, LDAPUpdate, LDAPSearch, LDAPRetrieve
+from .baseldap import LDAPObject, LDAPAddMember, LDAPRemoveMember
+from .baseldap import LDAPCreate, LDAPDelete, LDAPUpdate, LDAPSearch, LDAPRetrieve
 from ipalib import api, Int, Str, Bool, DateTime, Flag, Bytes, IntEnum, StrEnum, Password, _, ngettext
 from ipalib.messages import add_message, ResultFormattingError
 from ipalib.plugable import Registry

ipalib/plugins/passwd.py

@@ -23,7 +23,7 @@ from ipalib import Str, Password
 from ipalib import _
 from ipalib import output
 from ipalib.plugable import Registry
-from ipalib.plugins.baseuser import validate_principal, normalize_principal
+from .baseuser import validate_principal, normalize_principal
 from ipalib.request import context
 from ipapython.dn import DN
 

ipalib/plugins/permission.py

@@ -22,8 +22,8 @@ import traceback
 
 import six
 
-from ipalib.plugins import baseldap
-from ipalib.plugins.privilege import validate_permission_to_privilege
+from . import baseldap
+from .privilege import validate_permission_to_privilege
 from ipalib import errors
 from ipalib.parameters import Str, StrEnum, DNParam, Flag
 from ipalib import api, _, ngettext

ipalib/plugins/privilege.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject,
     LDAPCreate,
     LDAPDelete,

ipalib/plugins/pwpolicy.py

@@ -21,7 +21,7 @@
 from ipalib import api
 from ipalib import Int, Str, DNParam
 from ipalib import errors
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject,
     LDAPCreate,
     LDAPDelete,

ipalib/plugins/radiusproxy.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject,
     LDAPCreate,
     LDAPDelete,

ipalib/plugins/realmdomains.py

@@ -23,7 +23,7 @@ from ipalib import api, errors, messages
 from ipalib import Str, Flag
 from ipalib import _
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import LDAPObject, LDAPUpdate, LDAPRetrieve
+from .baseldap import LDAPObject, LDAPUpdate, LDAPRetrieve
 from ipalib.util import has_soa_or_ns_record, validate_domain_name
 from ipalib.util import detect_dns_zone_realm_type
 from ipapython.dn import DN

ipalib/plugins/role.py

@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject,
     LDAPCreate,
     LDAPDelete,

ipalib/plugins/selfservice.py

@@ -23,7 +23,7 @@ from ipalib import api, crud, errors
 from ipalib import output
 from ipalib import Object
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
+from .baseldap import gen_pkey_only_option, pkey_to_value
 
 __doc__ = _("""
 Self-service Permissions

ipalib/plugins/selinuxusermap.py

@@ -22,7 +22,7 @@ import re
 from ipalib import api, errors
 from ipalib import Str, StrEnum, Bool
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     pkey_to_value,
     LDAPObject,
     LDAPCreate,
@@ -35,7 +35,7 @@ from ipalib.plugins.baseldap import (
     LDAPRemoveMember)
 from ipalib import _, ngettext
 from ipalib import output
-from ipalib.plugins.hbacrule import is_all
+from .hbacrule import is_all
 from ipapython.dn import DN
 
 __doc__ = _("""

ipalib/plugins/server.py

@@ -8,7 +8,7 @@ import dbus.mainloop.glib
 from ipalib import api, crud, errors, messages
 from ipalib import Int, Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPSearch,
     LDAPRetrieve,
     LDAPDelete,

ipalib/plugins/service.py

@@ -24,7 +24,7 @@ import six
 from ipalib import api, errors
 from ipalib import Bytes, StrEnum, Bool, Str, Flag
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     host_is_master,
     add_missing_object_class,
     pkey_to_value,

ipalib/plugins/servicedelegation.py

@@ -7,7 +7,7 @@ import six
 from ipalib import api
 from ipalib import Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject,
     LDAPAddMember,
     LDAPRemoveMember,
@@ -15,7 +15,7 @@ from ipalib.plugins.baseldap import (
     LDAPDelete,
     LDAPSearch,
     LDAPRetrieve)
-from ipalib.plugins.service import normalize_principal
+from .service import normalize_principal
 from ipalib import _, ngettext
 from ipalib import errors
 from ipapython.dn import DN

ipalib/plugins/stageuser.py

@@ -25,12 +25,12 @@ import six
 from ipalib import api, errors
 from ipalib import DeprecatedParam
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPCreate,
     LDAPQuery,
     DN)
-from ipalib.plugins import baseldap
-from ipalib.plugins.baseuser import (
+from . import baseldap
+from .baseuser import (
     baseuser,
     baseuser_add,
     baseuser_del,

ipalib/plugins/sudocmd.py

@@ -20,7 +20,7 @@
 from ipalib import api, errors
 from ipalib import Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject,
     LDAPCreate,
     LDAPDelete,

ipalib/plugins/sudocmdgroup.py

@@ -20,7 +20,7 @@
 from ipalib import api
 from ipalib import Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject,
     LDAPCreate,
     LDAPDelete,

ipalib/plugins/sudorule.py

@@ -23,7 +23,7 @@ import six
 from ipalib import api, errors
 from ipalib import Str, StrEnum, Bool, Int
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (LDAPObject, LDAPCreate, LDAPDelete,
+from .baseldap import (LDAPObject, LDAPCreate, LDAPDelete,
                                      LDAPUpdate, LDAPSearch, LDAPRetrieve,
                                      LDAPQuery, LDAPAddMember, LDAPRemoveMember,
                                      add_external_pre_callback,
@@ -31,7 +31,7 @@ from ipalib.plugins.baseldap import (LDAPObject, LDAPCreate, LDAPDelete,
                                      remove_external_post_callback,
                                      output, entry_to_dict, pkey_to_value,
                                      external_host_param)
-from ipalib.plugins.hbacrule import is_all
+from .hbacrule import is_all
 from ipalib import _, ngettext
 from ipalib.util import validate_hostmask
 from ipapython.dn import DN

ipalib/plugins/topology.py

@@ -7,7 +7,7 @@ import six
 from ipalib import api, errors
 from ipalib import Int, Str, StrEnum, Flag, DNParam
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     LDAPObject, LDAPSearch, LDAPCreate, LDAPDelete, LDAPUpdate, LDAPQuery,
     LDAPRetrieve)
 from ipalib import _, ngettext

ipalib/plugins/trust.py

@@ -24,7 +24,7 @@ from ipalib.messages import (
     add_message,
     BrokenTrust)
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     pkey_to_value,
     entry_to_dict,
     LDAPCreate,
@@ -34,7 +34,7 @@ from ipalib.plugins.baseldap import (
     LDAPRetrieve,
     LDAPObject,
     LDAPQuery)
-from ipalib.plugins.dns import dns_container_exists
+from .dns import dns_container_exists
 from ipapython.dn import DN
 from ipapython.ipautil import realm_to_suffix
 from ipapython.ipa_log_manager import root_logger

ipalib/plugins/user.py

@@ -29,7 +29,7 @@ from ipalib import api
 from ipalib import errors
 from ipalib import util
 from ipalib import Bool, Flag, Str
-from ipalib.plugins.baseuser import (
+from .baseuser import (
     baseuser,
     baseuser_add,
     baseuser_del,
@@ -46,9 +46,9 @@ from ipalib.plugins.baseuser import (
     fix_addressbook_permission_bindrule,
     baseuser_add_manager,
     baseuser_remove_manager)
-from ipalib.plugins.idviews import remove_ipaobject_overrides
+from .idviews import remove_ipaobject_overrides
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import (
+from .baseldap import (
     pkey_to_value,
     LDAPCreate,
     LDAPSearch,
@@ -56,7 +56,7 @@ from ipalib.plugins.baseldap import (
     LDAPMultiQuery,
     LDAPAddAttribute,
     LDAPRemoveAttribute)
-from ipalib.plugins import baseldap
+from . import baseldap
 from ipalib.request import context
 from ipalib import _, ngettext
 from ipalib import output

ipalib/plugins/vault.py

@@ -42,12 +42,12 @@ from ipalib import Bytes, Flag, Str, StrEnum
 from ipalib import output
 from ipalib.crud import PKQuery, Retrieve
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import LDAPObject, LDAPCreate, LDAPDelete,\
+from .baseldap import LDAPObject, LDAPCreate, LDAPDelete,\
     LDAPSearch, LDAPUpdate, LDAPRetrieve, LDAPAddMember, LDAPRemoveMember,\
     LDAPModMember, pkey_to_value
 from ipalib.request import context
-from ipalib.plugins.baseuser import split_principal
-from ipalib.plugins.service import normalize_principal
+from .baseuser import split_principal
+from .service import normalize_principal
 from ipalib import _, ngettext
 from ipaplatform.paths import paths
 from ipapython.dn import DN