diff options
-rw-r--r-- | install/migration/migration.py | 2 | ||||
-rwxr-xr-x | install/tools/ipa-csreplica-manage | 5 | ||||
-rwxr-xr-x | install/tools/ipa-managed-entries | 3 | ||||
-rwxr-xr-x | install/tools/ipa-replica-manage | 4 | ||||
-rwxr-xr-x | install/tools/ipactl | 2 | ||||
-rw-r--r-- | ipaserver/dcerpc.py | 3 | ||||
-rw-r--r-- | ipaserver/install/bindinstance.py | 5 | ||||
-rw-r--r-- | ipaserver/install/cainstance.py | 3 | ||||
-rw-r--r-- | ipaserver/install/dsinstance.py | 10 | ||||
-rw-r--r-- | ipaserver/install/ldapupdate.py | 4 | ||||
-rw-r--r-- | ipaserver/install/plugins/fix_replica_agreements.py | 2 | ||||
-rw-r--r-- | ipaserver/install/replication.py | 3 | ||||
-rw-r--r-- | ipaserver/install/service.py | 5 | ||||
-rw-r--r-- | ipaserver/ipaldap.py | 24 | ||||
-rw-r--r-- | tests/test_install/test_updates.py | 7 |
15 files changed, 22 insertions, 60 deletions
diff --git a/install/migration/migration.py b/install/migration/migration.py index 38f280f4b..81b15b021 100644 --- a/install/migration/migration.py +++ b/install/migration/migration.py @@ -29,8 +29,8 @@ import wsgiref from ipapython.ipa_log_manager import root_logger from ipapython.ipautil import get_ipa_basedn from ipapython.dn import DN +from ipapython.ipaldap import IPAdmin from ipalib import errors -from ipaserver.ipaldap import IPAdmin def convert_exception(error): diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index 2c8d03a9d..cd2fd010b 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -25,12 +25,9 @@ import os import krbV from ipapython.ipa_log_manager import * -from ipapython import ipautil from ipaserver.install import replication, installutils -from ipaserver import ipaldap -from ipapython import version -from ipapython import dogtag from ipalib import api, errors, util +from ipapython import ipautil, ipaldap, version, dogtag from ipapython.dn import DN CACERT = "/etc/ipa/ca.crt" diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries index df1b8930b..5bf3ad64b 100755 --- a/install/tools/ipa-managed-entries +++ b/install/tools/ipa-managed-entries @@ -22,9 +22,8 @@ import re import sys from optparse import OptionParser -from ipapython import ipautil, config +from ipapython import ipautil, config, ipaldap from ipaserver.install import installutils -from ipaserver import ipaldap from ipalib import api, errors from ipapython.ipa_log_manager import * from ipapython.dn import DN diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index 82648bd52..fb80ca752 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -27,8 +27,8 @@ from urllib2 import urlparse from ipapython import ipautil from ipaserver.install import replication, dsinstance, installutils from ipaserver.install import bindinstance -from ipaserver import ipaldap -from ipapython import version +from ipaserver.plugins import ldap2 +from ipapython import version, ipaldap from ipalib import api, errors, util from ipapython.ipa_log_manager import * from ipapython.dn import DN diff --git a/install/tools/ipactl b/install/tools/ipactl index 86632f886..6500c274c 100755 --- a/install/tools/ipactl +++ b/install/tools/ipactl @@ -27,8 +27,8 @@ import ldapurl from ipaserver.install import service, installutils from ipaserver.install.dsinstance import config_dirname, realm_to_serverid from ipaserver.install.installutils import is_ipa_configured, ScriptError -from ipaserver.ipaldap import IPAdmin from ipalib import api, errors +from ipapython.ipaldap import IPAdmin from ipapython.ipautil import wait_for_open_ports, wait_for_open_socket from ipapython import services as ipaservices from ipapython import config, dogtag diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index b8f83e9a4..150f72709 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -31,6 +31,7 @@ from ipapython import ipautil from ipapython.ipa_log_manager import * from ipapython.dn import DN from ipaserver.install import installutils +from ipaserver.plugins import ldap2 from ipalib.util import normalize_name import os, string, struct, copy @@ -48,7 +49,7 @@ try: except ImportError: from ldap.controls import LDAPControl as LDAPControl #pylint: disable=F0401 import ldap as _ldap -from ipaserver.ipaldap import IPAdmin +from ipapython.ipaldap import IPAdmin from ipalib.session import krbccache_dir, krbccache_prefix from dns import resolver, rdatatype from dns.exception import DNSException diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index dff661dd6..c14f2423e 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -27,11 +27,10 @@ import ldap import installutils import service -from ipaserver import ipaldap +from ipaserver.plugins import ldap2 from ipaserver.install.dsinstance import realm_to_serverid from ipaserver.install.cainstance import IPA_CA_CNAME -from ipapython import sysrestore -from ipapython import ipautil +from ipapython import sysrestore, ipautil, ipaldap from ipapython.ipa_log_manager import * from ipapython.dn import DN import ipalib diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index cba5fc9f6..deb9a6135 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -48,8 +48,7 @@ import traceback from ipapython import ipautil from ipapython import services as ipaservices - -from ipaserver import ipaldap +from ipapython import ipaldap from ipaserver.install import service from ipaserver.install import installutils from ipaserver.install import dsinstance diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 25cac6c27..23843d759 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -19,29 +19,25 @@ # import shutil -from ipapython.ipa_log_manager import * import pwd import sys import os import re import time import tempfile +import base64 -from ipapython import ipautil -from ipapython import sysrestore +from ipapython.ipa_log_manager import * +from ipapython import ipautil, sysrestore, dogtag, ipaldap from ipapython import services as ipaservices -from ipapython import dogtag - import service import installutils import certs import ldap -from ipaserver import ipaldap from ipaserver.install import ldapupdate from ipaserver.install import replication from ipalib import errors from ipapython.dn import DN -import base64 SERVER_ROOT_64 = "/usr/lib64/dirsrv" SERVER_ROOT_32 = "/usr/lib/dirsrv" diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 2f2e7debe..79aea1787 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -39,13 +39,13 @@ import ldap from ldap.schema.models import ObjectClass, AttributeType from ipaserver.install import installutils -from ipaserver import ipaldap -from ipapython import ipautil +from ipapython import ipautil, ipaldap from ipalib import errors from ipalib import api from ipapython.dn import DN from ipapython.ipa_log_manager import * from ipaserver.install.plugins import PRE_UPDATE, POST_UPDATE +from ipaserver.plugins import ldap2 class BadSyntax(installutils.ScriptError): diff --git a/ipaserver/install/plugins/fix_replica_agreements.py b/ipaserver/install/plugins/fix_replica_agreements.py index bbebbbc04..472e50217 100644 --- a/ipaserver/install/plugins/fix_replica_agreements.py +++ b/ipaserver/install/plugins/fix_replica_agreements.py @@ -19,9 +19,9 @@ import os import pwd +from ipapython import ipaldap from ipaserver.install.plugins import MIDDLE from ipaserver.install.plugins.baseupdate import PreUpdate -from ipaserver import ipaldap from ipaserver.install import replication from ipalib import api diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 804d046bf..076d4f87f 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -23,11 +23,10 @@ import os import ldap -from ipaserver import ipaldap from ipalib import api, errors from ipapython import services as ipaservices from ipapython.ipa_log_manager import * -from ipapython import ipautil, dogtag +from ipapython import ipautil, dogtag, ipaldap from ipapython.dn import DN CACERT = "/etc/ipa/ca.crt" diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 633287e20..83ade9030 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -24,14 +24,11 @@ import pwd import time import datetime -from ipapython import sysrestore -from ipapython import ipautil -from ipapython import dogtag +from ipapython import sysrestore, ipautil, dogtag, ipaldap from ipapython import services as ipaservices from ipapython.dn import DN from ipapython.ipa_log_manager import * from ipalib import errors -from ipaserver import ipaldap CACERT = "/etc/ipa/ca.crt" diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py deleted file mode 100644 index 92cffb1c8..000000000 --- a/ipaserver/ipaldap.py +++ /dev/null @@ -1,24 +0,0 @@ -# Author: Petr Viktorin <pviktori@redhat.com> -# -# Copyright (C) 2013 Red Hat -# see file 'COPYING' for use and warranty information -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# 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 ipapython.ipaldap import IPAdmin - -# FIXME: Some installer tools depend on ipaldap importing plugins.ldap2. -# The proper plugins should rather be imported explicitly. -import ipaserver.plugins.ldap2 diff --git a/tests/test_install/test_updates.py b/tests/test_install/test_updates.py index dfd38d9e3..ffd6ee6d0 100644 --- a/tests/test_install/test_updates.py +++ b/tests/test_install/test_updates.py @@ -22,15 +22,14 @@ Test the `ipaserver/install/ldapupdate.py` module. import unittest import os -import sys import ldap + import nose from ipalib import api from ipalib import errors -from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax, UPDATES_DIR +from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax from ipaserver.install import installutils -from ipaserver import ipaldap -from ipapython import ipautil +from ipapython import ipautil, ipaldap from ipapython.dn import DN """ |