ipaplatform: Remove redundant imports of ipaservices

Also fixes few incorrect imports.

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

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

11 files changed, 4 insertions, 14 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