ipalib: move certstore to the install subpackage

The certstore module depends on ipaplatform.

Move it to ipalib.install, as it is used only from installers.

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

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

10 files changed, 17 insertions, 20 deletions

diff --git a/install/restart_scripts/renew_ca_cert b/install/restart_scripts/renew_ca_cert
index 31412f7ad..46e4242a4 100644
--- a/install/restart_scripts/renew_ca_cert
+++ b/install/restart_scripts/renew_ca_cert
@@ -27,8 +27,9 @@ import tempfile
 import shutil
 import traceback
 
+from ipalib.install import certstore
 from ipapython import ipautil
-from ipalib import api, errors, x509, certstore
+from ipalib import api, errors, x509
 from ipalib.install.kinit import kinit_keytab
 from ipaserver.install import certs, cainstance, installutils
 from ipaserver.plugins.ldap2 import ldap2
diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
index 6d8a7ede7..0cf97a8a7 100644
--- a/ipaclient/install/client.py
+++ b/ipaclient/install/client.py
@@ -36,14 +36,9 @@ from ipaclient import (
     ntpconf,
 )
 from ipaclient.ipachangeconf import IPAChangeConf
-from ipalib import (
-    api,
-    certstore,
-    errors,
-    x509,
-)
+from ipalib import api, errors, x509
 from ipalib.constants import CACERT
-from ipalib.install import certmonger, service, sysrestore
+from ipalib.install import certmonger, certstore, service, sysrestore
 from ipalib.install import hostname as hostname_
 from ipalib.install.kinit import kinit_keytab, kinit_password
 from ipalib.install.service import enroll_only, prepare_only
diff --git a/ipaclient/ipa_certupdate.py b/ipaclient/ipa_certupdate.py
index 6fb44c16d..2c55db462 100644
--- a/ipaclient/ipa_certupdate.py
+++ b/ipaclient/ipa_certupdate.py
@@ -25,13 +25,13 @@ import shutil
 from six.moves.urllib.parse import urlsplit
 # pylint: enable=import-error
 
-from ipalib.install import certmonger, sysrestore
+from ipalib.install import certmonger, certstore, sysrestore
 from ipalib.install.kinit import kinit_keytab
 from ipapython import admintool, certdb, ipaldap, ipautil
 from ipaplatform import services
 from ipaplatform.paths import paths
 from ipaplatform.tasks import tasks
-from ipalib import api, errors, x509, certstore
+from ipalib import api, errors, x509
 from ipalib.constants import IPA_CA_NICKNAME, RENEWAL_CA_NAME
 
 
diff --git a/ipalib/certstore.py b/ipalib/install/certstore.py
index 70ae94210..70ae94210 100644
--- a/ipalib/certstore.py
+++ b/ipalib/install/certstore.py
diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
index 4bbcb12c2..efc8c870e 100644
--- a/ipaserver/install/ca.py
+++ b/ipaserver/install/ca.py
@@ -13,6 +13,7 @@ import os.path
 
 import six
 
+from ipalib.install import certstore
 from ipalib.install.service import enroll_only, master_install_only, replica_install_only
 from ipapython.install import typing
 from ipapython.install.core import knob
@@ -26,7 +27,7 @@ from ipaplatform import services
 from ipaplatform.paths import paths
 from ipaserver.install import installutils, certs
 from ipaserver.install.replication import replica_conn_check
-from ipalib import api, certstore, x509
+from ipalib import api, x509
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import root_logger
 
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 397e3fcc2..af018a067 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -31,7 +31,7 @@ import fnmatch
 
 import ldap
 
-from ipalib.install import certmonger
+from ipalib.install import certmonger, certstore
 from ipapython.ipa_log_manager import root_logger
 from ipapython import ipautil, ipaldap
 from ipapython import dogtag
@@ -43,7 +43,6 @@ from ipaserver.install import replication
 from ipaserver.install import sysupgrade
 from ipaserver.install import upgradeinstance
 from ipalib import api
-from ipalib import certstore
 from ipalib import errors
 from ipalib import constants
 from ipaplatform.constants import constants as platformconstants
diff --git a/ipaserver/install/ipa_cacert_manage.py b/ipaserver/install/ipa_cacert_manage.py
index 9857ea7c8..5a278f434 100644
--- a/ipaserver/install/ipa_cacert_manage.py
+++ b/ipaserver/install/ipa_cacert_manage.py
@@ -24,11 +24,11 @@ from optparse import OptionGroup  # pylint: disable=deprecated-module
 from cryptography.hazmat.primitives import serialization
 import gssapi
 
-from ipalib.install import certmonger
+from ipalib.install import certmonger, certstore
 from ipapython import admintool, ipautil
 from ipapython.dn import DN
 from ipaplatform.paths import paths
-from ipalib import api, errors, x509, certstore
+from ipalib import api, errors, x509
 from ipaserver.install import certs, cainstance, installutils
 
 
diff --git a/ipaserver/install/plugins/upload_cacrt.py b/ipaserver/install/plugins/upload_cacrt.py
index 931611598..1a78108a0 100644
--- a/ipaserver/install/plugins/upload_cacrt.py
+++ b/ipaserver/install/plugins/upload_cacrt.py
@@ -17,8 +17,9 @@
 # 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.install import certstore
 from ipaserver.install import certs
-from ipalib import Registry, errors, certstore
+from ipalib import Registry, errors
 from ipalib import Updater
 from ipapython import certdb
 from ipapython.dn import DN
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index a9e25c98f..74b985784 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -17,7 +17,7 @@ import traceback
 from pkg_resources import parse_version
 import six
 
-from ipalib.install import sysrestore
+from ipalib.install import certstore, sysrestore
 from ipalib.install.kinit import kinit_keytab
 from ipapython import ipaldap, ipautil
 from ipapython.dn import DN
@@ -26,7 +26,7 @@ from ipapython.admintool import ScriptError
 from ipaplatform import services
 from ipaplatform.tasks import tasks
 from ipaplatform.paths import paths
-from ipalib import api, certstore, constants, create_api, errors, rpc, x509
+from ipalib import api, constants, create_api, errors, rpc, x509
 from ipalib.config import Env
 from ipalib.util import (
     network_ip_address_warning,
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 35f2cd2b5..4cc7012f6 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -27,12 +27,12 @@ import tempfile
 
 import six
 
-from ipalib.install import sysrestore
+from ipalib.install import certstore, sysrestore
 from ipapython import ipautil
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import root_logger
 from ipapython import kerberos
-from ipalib import api, errors, certstore
+from ipalib import api, errors
 from ipaplatform import services
 from ipaplatform.paths import paths