ipaplatform: Remove redundant imports of ipaservices

Also fixes few incorrect imports.

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

Reviewed-By: Petr Viktorin <pviktori@redhat.com>

25 files changed, 12 insertions, 36 deletions

diff --git a/install/restart_scripts/renew_ca_cert b/install/restart_scripts/renew_ca_cert
index 550de969a..a4959bed9 100644
--- a/install/restart_scripts/renew_ca_cert
+++ b/install/restart_scripts/renew_ca_cert
@@ -28,7 +28,6 @@ import shutil
 import traceback
 
 from ipapython import dogtag, certmonger, ipautil
-from ipapython import services as ipaservices
 from ipalib import api, errors, x509, util
 from ipaserver.install import certs, cainstance, installutils
 from ipaserver.plugins.ldap2 import ldap2
diff --git a/install/restart_scripts/renew_ra_cert b/install/restart_scripts/renew_ra_cert
index 46367fd9c..fb4470588 100644
--- a/install/restart_scripts/renew_ra_cert
+++ b/install/restart_scripts/renew_ra_cert
@@ -24,7 +24,6 @@ import sys
 import syslog
 import traceback
 
-from ipapython import services as ipaservices
 from ipalib import api
 from ipaserver.install import certs, cainstance
 from ipaplatform import services
diff --git a/install/restart_scripts/restart_dirsrv b/install/restart_scripts/restart_dirsrv
index 738bb3120..837378191 100644
--- a/install/restart_scripts/restart_dirsrv
+++ b/install/restart_scripts/restart_dirsrv
@@ -22,7 +22,6 @@
 import sys
 import syslog
 import traceback
-from ipapython import services as ipaservices
 from ipalib import api
 from ipaplatform import services
 
diff --git a/install/restart_scripts/restart_httpd b/install/restart_scripts/restart_httpd
index e8ff72824..e3ef73c4f 100644
--- a/install/restart_scripts/restart_httpd
+++ b/install/restart_scripts/restart_httpd
@@ -21,7 +21,6 @@
 
 import syslog
 import traceback
-from ipapython import services as ipaservices
 from ipaplatform import services
 
 def main():
diff --git a/install/restart_scripts/stop_pkicad b/install/restart_scripts/stop_pkicad
index 461baa6a5..b8866f16e 100644
--- a/install/restart_scripts/stop_pkicad
+++ b/install/restart_scripts/stop_pkicad
@@ -22,7 +22,6 @@
 import sys
 import syslog
 import traceback
-from ipapython import services as ipaservices
 from ipapython import dogtag
 from ipalib import api
 from ipaplatform import services
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index 630c83815..01f7b790e 100755
--- a/install/tools/ipa-ca-install
+++ b/install/tools/ipa-ca-install
@@ -24,7 +24,6 @@ import socket
 import os, shutil
 
 from ipapython import ipautil
-from ipapython import services as ipaservices
 
 from ipaserver.install import installutils, service
 from ipaserver.install import certs
diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage
index b37cd6594..ad2cd6d0d 100755
--- a/install/tools/ipa-nis-manage
+++ b/install/tools/ipa-nis-manage
@@ -24,7 +24,6 @@ import os
 try:
     from optparse import OptionParser
     from ipapython import ipautil, config
-    from ipapython import services as ipaservices
     from ipaserver.install import installutils
     from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax
     from ipaserver.plugins.ldap2 import ldap2
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index 1c0488e5f..7658dfa66 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -46,12 +46,11 @@ from ipalib.constants import CACERT
 from ipapython import version
 from ipapython.config import IPAOptionParser
 from ipapython import sysrestore
-from ipapython import services as ipaservices
 from ipapython.ipa_log_manager import *
 from ipapython import dogtag
 from ipapython.dn import DN
 import ipaclient.ntpconf
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipaplatform import services
 
 log_file_name = "/var/log/ipareplica-install.log"
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 19a0bab94..e3b7d5555 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -73,12 +73,11 @@ from ipapython.config import IPAOptionParser
 from ipalib.x509 import load_certificate_from_file, load_certificate_chain_from_file
 from ipalib.util import validate_domain_name
 from ipalib.constants import CACERT
-from ipapython import services as ipaservices
 from ipapython.ipa_log_manager import *
 from ipapython.dn import DN
 
 import ipaclient.ntpconf
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipaplatform import services
 
 uninstalling = False
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index e689f7a44..99dfbdf9d 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -36,7 +36,7 @@ import SSSDConfig
 import ipalib.util
 import ipalib.errors
 from ipaplatform import services
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipapython import ipautil, sysrestore, version
 from ipapython.config import IPAOptionParser
 from ipapython.ipa_log_manager import *
diff --git a/install/tools/ipactl b/install/tools/ipactl
index 44a61ae8d..3f0e79867 100755
--- a/install/tools/ipactl
+++ b/install/tools/ipactl
@@ -30,9 +30,8 @@ from ipaserver.install.installutils import is_ipa_configured, ScriptError
 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
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipapython.dn import DN
 from ipaplatform import services
 from ipaplatform.paths import paths
diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount
index 7c7491b5d..4d0a025ee 100755
--- a/ipa-client/ipa-install/ipa-client-automount
+++ b/ipa-client/ipa-install/ipa-client-automount
@@ -37,8 +37,7 @@ from ipaclient import ipadiscovery
 from ipaclient import ipachangeconf
 from ipapython.ipa_log_manager import *
 from ipapython.dn import DN
-from ipapython import services as ipaservices
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipaplatform import services
 
 AUTOFS_CONF = '/etc/sysconfig/autofs'
diff --git a/ipa-client/ipaclient/ntpconf.py b/ipa-client/ipaclient/ntpconf.py
index 182c977d2..c01dea09c 100644
--- a/ipa-client/ipaclient/ntpconf.py
+++ b/ipa-client/ipaclient/ntpconf.py
@@ -18,10 +18,9 @@
 #
 
 from ipapython import ipautil
-from ipapython import services as ipaservices
 import shutil
 import os
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipaplatform import services
 
 ntp_conf = """# Permit time synchronization with our time source, but do not
diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py
index b5f47bd1e..7d5aabdff 100644
--- a/ipapython/sysrestore.py
+++ b/ipapython/sysrestore.py
@@ -32,8 +32,7 @@ import random
 import string
 
 from ipapython import ipautil
-from ipapython import services as ipaservices
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 
 SYSRESTORE_PATH = "/tmp"
 SYSRESTORE_INDEXFILE = "sysrestore.index"
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index 170feac46..59a383e2e 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -37,7 +37,6 @@ from ipapython.dn import DN
 from ipapython import sysrestore
 from ipapython import ipautil
 from ipapython.ipa_log_manager import *
-from ipapython import services as ipaservices
 
 import ipaclient.ipachangeconf
 from ipaplatform import services
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 599bfffc8..b9c786be9 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -49,9 +49,8 @@ import subprocess
 import traceback
 
 from ipapython import ipautil
-from ipapython import services as ipaservices
 from ipapython import ipaldap
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipaserver.install import service
 from ipaserver.install import installutils
 from ipaserver.install import dsinstance
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py
index c5380e939..a005fb9f7 100644
--- a/ipaserver/install/certs.py
+++ b/ipaserver/install/certs.py
@@ -37,7 +37,6 @@ from ipapython import sysrestore
 from ipapython import ipautil
 from ipapython import certmonger
 from ipapython.certdb import get_ca_nickname
-from ipapython import services as ipaservices
 from ipapython.dn import DN
 from ipalib import pkcs10, x509, api
 from ipalib.errors import CertificateOperationError
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 1186edadb..c1b2ba62a 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -31,7 +31,6 @@ import grp
 
 from ipapython.ipa_log_manager import *
 from ipapython import ipautil, sysrestore, ipaldap
-from ipapython import services as ipaservices
 import service
 import installutils
 import certs
@@ -40,7 +39,7 @@ from ipaserver.install import ldapupdate
 from ipaserver.install import replication
 from ipaserver.install import sysupgrade
 from ipalib import errors
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipalib.constants import CACERT
 from ipapython.dn import DN
 from ipaplatform import services
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index 979d7ff98..2709356be 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -30,12 +30,11 @@ import certs
 import installutils
 from ipapython import sysrestore
 from ipapython import ipautil
-from ipapython import services as ipaservices
 from ipapython import dogtag
 from ipapython.ipa_log_manager import *
 from ipaserver.install import sysupgrade
 from ipalib import api
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipalib.constants import CACERT
 
 HTTPD_DIR = "/etc/httpd"
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index a2de7c1bd..48c347e04 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -42,7 +42,6 @@ from ipapython import config
 from ipalib import errors
 from ipapython.dn import DN
 from ipaserver.install import certs, service
-from ipapython import services as ipaservices
 from ipaplatform import services
 
 # Used to determine install status
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index d3f7f178d..e704c1cb8 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -36,7 +36,6 @@ from ipapython.dn import DN
 from ipaserver.install.dsinstance import realm_to_serverid, DS_USER
 from ipaserver.install.replication import wait_for_task
 from ipaserver.install import installutils
-from ipapython import services as ipaservices
 from ipapython import ipaldap
 from ipalib.session import ISO8601_DATETIME_FMT
 from ipalib.constants import CACERT
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index d2064d4af..bf9b95a84 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -36,9 +36,8 @@ from ipaserver.install.cainstance import PKI_USER
 from ipaserver.install.replication import (wait_for_task, ReplicationManager,
                                            get_cs_replication_manager)
 from ipaserver.install import installutils
-from ipapython import services as ipaservices
 from ipapython import ipaldap
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipaserver.install.ipa_backup import BACKUP_DIR
 from ipaplatform import services
 
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index 9475491e7..cbb54236e 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -30,7 +30,6 @@ import service
 import installutils
 from ipapython import sysrestore
 from ipapython import ipautil
-from ipapython import services as ipaservices
 from ipapython import kernel_keyring
 from ipalib import errors
 from ipalib.constants import CACERT
@@ -45,7 +44,7 @@ import struct
 
 import certs
 from distutils import version
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 
 def update_key_val_in_file(filename, key, val):
     if os.path.exists(filename):
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 4a484d617..dd12c0d1d 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -26,7 +26,6 @@ import ldap
 
 from ipalib import api, errors
 from ipalib.constants import CACERT
-from ipapython import services as ipaservices
 from ipapython.ipa_log_manager import *
 from ipapython import ipautil, dogtag, ipaldap
 from ipapython.dn import DN
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 3a6983856..6108a2b2a 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -25,7 +25,6 @@ import time
 import datetime
 
 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