ipapython: move certmonger and sysrestore to ipalib.install

The certmonger and sysrestore modules depend on ipaplatform.

Move them to ipalib.install as they are used only from installers.

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

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>

client/ipa-client-automount

@@ -41,7 +41,7 @@ from six.moves.urllib.parse import urlsplit
 
 from optparse import OptionParser  # pylint: disable=deprecated-module
 from ipalib import api, errors
-from ipapython import sysrestore
+from ipalib.install import sysrestore
 from ipapython import ipautil
 from ipaclient import ipadiscovery
 from ipaclient import ipachangeconf

install/tools/ipa-adtrust-install

@@ -31,6 +31,7 @@ import six
 
 from optparse import SUPPRESS_HELP  # pylint: disable=deprecated-module
 
+from ipalib.install import sysrestore
 from ipaserver.install import adtrustinstance
 from ipaserver.install.installutils import (
     read_password,
@@ -38,7 +39,7 @@ from ipaserver.install.installutils import (
     run_script)
 from ipaserver.install import service
 from ipapython import version
-from ipapython import ipautil, sysrestore, ipaldap
+from ipapython import ipautil, ipaldap
 from ipalib import api, errors, krb_utils
 from ipapython.config import IPAOptionParser
 from ipaplatform.paths import paths

ipaclient/install/client.py

@@ -43,8 +43,8 @@ from ipalib import (
     x509,
 )
 from ipalib.constants import CACERT
+from ipalib.install import certmonger, service, sysrestore
 from ipalib.install import hostname as hostname_
-from ipalib.install import service
 from ipalib.install.service import enroll_only, prepare_only
 from ipalib.rpc import delete_persistent_client_session_data
 from ipalib.util import (
@@ -56,14 +56,7 @@ from ipalib.util import (
 from ipaplatform import services
 from ipaplatform.paths import paths
 from ipaplatform.tasks import tasks
-from ipapython import (
-    certdb,
-    certmonger,
-    kernel_keyring,
-    ipaldap,
-    ipautil,
-    sysrestore,
-)
+from ipapython import certdb, kernel_keyring, ipaldap, ipautil
 from ipapython.admintool import ScriptError
 from ipapython.dn import DN
 from ipapython.install import typing

ipaclient/ipa_certupdate.py

@@ -25,8 +25,8 @@ import shutil
 from six.moves.urllib.parse import urlsplit
 # pylint: enable=import-error
 
-from ipapython import (admintool, ipautil, ipaldap, sysrestore, certmonger,
-                       certdb)
+from ipalib.install import certmonger, sysrestore
+from ipapython import admintool, certdb, ipaldap, ipautil
 from ipaplatform import services
 from ipaplatform.paths import paths
 from ipaplatform.tasks import tasks

ipaserver/install/cainstance.py

@@ -43,14 +43,13 @@ from ipalib import api
 from ipalib import x509
 from ipalib import errors
 import ipalib.constants
-
+from ipalib.install import certmonger
 from ipaplatform import services
 from ipaplatform.constants import constants
 from ipaplatform.paths import paths
 from ipaplatform.tasks import tasks
 
 from ipapython import dogtag
-from ipapython import certmonger
 from ipapython import ipautil
 from ipapython import ipaldap
 from ipapython.certdb import get_ca_nickname

ipaserver/install/certs.py

@@ -33,11 +33,10 @@ import datetime
 import six
 from six.moves import configparser
 
+from ipalib.install import certmonger, sysrestore
 from ipapython.ipa_log_manager import root_logger
 from ipapython import dogtag
-from ipapython import sysrestore
 from ipapython import ipautil
-from ipapython import certmonger
 from ipapython.certdb import get_ca_nickname, find_cert_from_txt, NSSDatabase
 from ipapython.dn import DN
 from ipalib import pkcs10, x509, api

ipaserver/install/dns.py

@@ -22,13 +22,12 @@ from subprocess import CalledProcessError
 from ipalib import api
 from ipalib import errors
 from ipalib import util
-from ipalib.install import hostname
+from ipalib.install import hostname, sysrestore
 from ipalib.install.service import enroll_only, prepare_only
 from ipaplatform.paths import paths
 from ipaplatform.constants import constants
 from ipaplatform import services
 from ipapython import ipautil
-from ipapython import sysrestore
 from ipapython import dnsutil
 from ipapython.dn import DN
 from ipapython.dnsutil import check_zone_overlap

ipaserver/install/dogtaginstance.py

@@ -32,10 +32,10 @@ import pki.system
 
 from ipalib import api, errors
 
+from ipalib.install import certmonger
 from ipaplatform import services
 from ipaplatform.constants import constants
 from ipaplatform.paths import paths
-from ipapython import certmonger
 from ipapython import ipaldap
 from ipapython import ipautil
 from ipapython.dn import DN

ipaserver/install/dsinstance.py

@@ -31,6 +31,7 @@ import fnmatch
 
 import ldap
 
+from ipalib.install import certmonger
 from ipapython.ipa_log_manager import root_logger
 from ipapython import ipautil, ipaldap
 from ipapython import dogtag
@@ -48,7 +49,6 @@ from ipalib import constants
 from ipaplatform.constants import constants as platformconstants
 from ipaplatform.tasks import tasks
 from ipalib.constants import CACERT
-from ipapython import certmonger
 from ipapython.dn import DN
 from ipapython.admintool import ScriptError
 from ipaplatform import services

ipaserver/install/httpinstance.py

@@ -31,10 +31,10 @@ import locale
 
 import six
 
+from ipalib.install import certmonger
 from ipaserver.install import service
 from ipaserver.install import certs
 from ipaserver.install import installutils
-from ipapython import certmonger
 from ipapython import dogtag
 from ipapython import ipautil
 from ipapython.dn import DN

ipaserver/install/installutils.py

@@ -44,9 +44,9 @@ import six
 from six.moves.configparser import SafeConfigParser, NoOptionError
 # pylint: enable=import-error
 
+from ipalib.install import sysrestore
 import ipaplatform
-
-from ipapython import ipautil, sysrestore, admintool, version
+from ipapython import ipautil, admintool, version
 from ipapython.admintool import ScriptError
 from ipapython.ipa_log_manager import root_logger
 from ipalib.util import validate_hostname

ipaserver/install/ipa_cacert_manage.py

@@ -24,7 +24,8 @@ from optparse import OptionGroup  # pylint: disable=deprecated-module
 from cryptography.hazmat.primitives import serialization
 import gssapi
 
-from ipapython import admintool, certmonger, ipautil
+from ipalib.install import certmonger
+from ipapython import admintool, ipautil
 from ipapython.dn import DN
 from ipaplatform.paths import paths
 from ipalib import api, errors, x509, certstore

ipaserver/install/opendnssecinstance.py

@@ -9,11 +9,12 @@ import stat
 import shutil
 from subprocess import CalledProcessError
 
+from ipalib.install import sysrestore
 from ipaserver.install import service
 from ipaserver.install import installutils
 from ipapython.ipa_log_manager import root_logger
 from ipapython.dn import DN
-from ipapython import sysrestore, ipautil
+from ipapython import ipautil
 from ipaplatform import services
 from ipaplatform.constants import constants
 from ipaplatform.paths import paths

ipaserver/install/plugins/ca_renewal_master.py

@@ -20,8 +20,8 @@
 from ipaserver.install import installutils, certs, cainstance
 from ipalib import errors
 from ipalib import Updater
+from ipalib.install import certmonger
 from ipalib.plugable import Registry
-from ipapython import certmonger
 from ipaplatform.paths import paths
 from ipapython.dn import DN
 

ipaserver/install/server/install.py

@@ -14,7 +14,8 @@ import textwrap
 
 import six
 
-from ipapython import certmonger, ipautil, sysrestore
+from ipalib.install import certmonger, sysrestore
+from ipapython import ipautil
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import root_logger
 from ipapython.ipautil import (

ipaserver/install/server/replicainstall.py

@@ -17,7 +17,8 @@ import traceback
 from pkg_resources import parse_version
 import six
 
-from ipapython import ipaldap, ipautil, sysrestore
+from ipalib.install import sysrestore
+from ipapython import ipaldap, ipautil
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import root_logger
 from ipapython.admintool import ScriptError

ipaserver/install/server/upgrade.py

@@ -19,14 +19,14 @@ from six.moves.configparser import SafeConfigParser
 # pylint: enable=import-error
 
 from ipalib import api
+from ipalib.install import certmonger, sysrestore
 import SSSDConfig
 import ipalib.util
 import ipalib.errors
 from ipaplatform import services
 from ipaplatform.tasks import tasks
-from ipapython import ipautil, sysrestore, version, certdb
+from ipapython import ipautil, version, certdb
 from ipapython.ipa_log_manager import root_logger
-from ipapython import certmonger
 from ipapython import dnsutil
 from ipapython.dn import DN
 from ipaplatform.constants import constants

ipaserver/install/service.py

@@ -27,7 +27,8 @@ import tempfile
 
 import six
 
-from ipapython import ipautil, sysrestore
+from ipalib.install import sysrestore
+from ipapython import ipautil
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import root_logger
 from ipapython import kerberos

ipaserver/install/sysupgrade.py

@@ -20,7 +20,7 @@
 import os
 import os.path
 
-from ipapython import sysrestore
+from ipalib.install import sysrestore
 from ipaplatform.paths import paths
 from ipapython.ipa_log_manager import root_logger