ipaplatform: Change service code in freeipa to use ipaplatform services

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

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

9 files changed, 39 insertions, 30 deletions

diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index f44765a08..170feac46 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -40,6 +40,7 @@ from ipapython.ipa_log_manager import *
 from ipapython import services as ipaservices
 
 import ipaclient.ipachangeconf
+from ipaplatform import services
 
 
 ALLOWED_NETBIOS_CHARS = string.ascii_uppercase + string.digits
@@ -730,21 +731,21 @@ class ADTRUSTInstance(service.Service):
     def __start(self):
         try:
             self.start()
-            ipaservices.service('winbind').start()
+            services.service('winbind').start()
         except:
             root_logger.critical("CIFS services failed to start")
 
     def __stop(self):
         self.backup_state("running", self.is_running())
         try:
-            ipaservices.service('winbind').stop()
+            services.service('winbind').stop()
             self.stop()
         except:
             pass
 
     def __restart_dirsrv(self):
         try:
-            ipaservices.knownservices.dirsrv.restart()
+            services.knownservices.dirsrv.restart()
         except:
             pass
 
@@ -889,7 +890,7 @@ class ADTRUSTInstance(service.Service):
         self.restore_state("running")
         self.restore_state("enabled")
 
-        winbind = ipaservices.service("winbind")
+        winbind = services.service("winbind")
         # Always try to stop and disable smb service, since we do not leave
         # working configuration after uninstall
         try:
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index c6221e5e0..599bfffc8 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -59,6 +59,7 @@ from ipaserver.install import certs
 from ipaserver.install.installutils import stopped_service
 from ipaserver.plugins import ldap2
 from ipapython.ipa_log_manager import *
+from ipaplatform import services
 
 HTTPD_CONFD = "/etc/httpd/conf.d/"
 DEFAULT_DSPORT = dogtag.install_constants.DS_PORT
@@ -286,7 +287,7 @@ class CADSInstance(service.Service):
         running = self.restore_state("running")
 
         if not enabled is None and not enabled:
-            ipaservices.knownservices.dirsrv.disable()
+            services.knownservices.dirsrv.disable()
 
         if not serverid is None:
             # drop the trailing / off the config_dirname so the directory
@@ -306,8 +307,8 @@ class CADSInstance(service.Service):
 def stop_tracking_certificates(dogtag_constants):
     """Stop tracking our certificates. Called on uninstall.
     """
-    cmonger = ipaservices.knownservices.certmonger
-    ipaservices.knownservices.messagebus.start()
+    cmonger = services.knownservices.certmonger
+    services.knownservices.messagebus.start()
     cmonger.start()
 
     for nickname in ['Server-Cert cert-pki-ca',
@@ -1335,8 +1336,8 @@ class CAInstance(service.Service):
         # cause files to have a new owner.
         user_exists = self.restore_state("user_exists")
 
-        ipaservices.knownservices.messagebus.start()
-        cmonger = ipaservices.knownservices.certmonger
+        services.knownservices.messagebus.start()
+        cmonger = services.knownservices.certmonger
         cmonger.start()
 
         bus = dbus.SystemBus()
@@ -1388,8 +1389,8 @@ class CAInstance(service.Service):
         Create a new CA type for certmonger that will retrieve updated
         certificates from the dogtag master server.
         """
-        ipaservices.knownservices.messagebus.start()
-        cmonger = ipaservices.knownservices.certmonger
+        services.knownservices.messagebus.start()
+        cmonger = services.knownservices.certmonger
         cmonger.enable()
         cmonger.start()
 
@@ -1667,7 +1668,7 @@ def install_replica_ca(config, postinstall=False):
     # Without the restart, CA service status check would fail due to missing
     # proxy
     if postinstall:
-        ipaservices.knownservices.httpd.restart()
+        services.knownservices.httpd.restart()
 
 
     # The dogtag DS instance needs to be restarted after installation.
@@ -1682,7 +1683,7 @@ def install_replica_ca(config, postinstall=False):
     service.print_msg("Restarting the directory and certificate servers")
     ca.stop(dogtag.install_constants.PKI_INSTANCE_NAME)
 
-    ipaservices.knownservices.dirsrv.restart()
+    services.knownservices.dirsrv.restart()
 
     ca.start(dogtag.install_constants.PKI_INSTANCE_NAME)
 
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py
index 9ee854ebf..c5380e939 100644
--- a/ipaserver/install/certs.py
+++ b/ipaserver/install/certs.py
@@ -42,6 +42,7 @@ from ipapython.dn import DN
 from ipalib import pkcs10, x509, api
 from ipalib.errors import CertificateOperationError
 from ipalib.text import _
+from ipaplatform import services
 
 # Apache needs access to this database so we need to create it
 # where apache can reach
@@ -509,9 +510,9 @@ class CertDB(object):
             else:
                 libpath = 'lib'
             command = '/usr/%s/ipa/certmonger/%s' % (libpath, command)
-        cmonger = ipaservices.knownservices.certmonger
+        cmonger = services.knownservices.certmonger
         cmonger.enable()
-        ipaservices.knownservices.messagebus.start()
+        services.knownservices.messagebus.start()
         cmonger.start()
         try:
             (stdout, stderr, rc) = certmonger.start_tracking(nickname, self.secdir, password_file, command)
@@ -541,8 +542,8 @@ class CertDB(object):
 
         # Always start certmonger. We can't untrack something if it isn't
         # running
-        cmonger = ipaservices.knownservices.certmonger
-        ipaservices.knownservices.messagebus.start()
+        cmonger = services.knownservices.certmonger
+        services.knownservices.messagebus.start()
         cmonger.start()
         try:
             certmonger.stop_tracking(self.secdir, nickname=nickname)
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index b06c13d90..1186edadb 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -43,6 +43,7 @@ from ipalib import errors
 from ipaplatform import tasks
 from ipalib.constants import CACERT
 from ipapython.dn import DN
+from ipaplatform import services
 
 SERVER_ROOT_64 = "/usr/lib64/dirsrv"
 SERVER_ROOT_32 = "/usr/lib/dirsrv"
@@ -145,7 +146,7 @@ def check_ports():
     return (ds_unsecure, ds_secure)
 
 def is_ds_running(server_id=''):
-    return ipaservices.knownservices.dirsrv.is_running(instance_name=server_id)
+    return services.knownservices.dirsrv.is_running(instance_name=server_id)
 
 
 def create_ds_user():
@@ -819,7 +820,7 @@ class DsInstance(service.Service):
         # (re)start them.
         for ds_instance in get_ds_instances():
             try:
-                ipaservices.knownservices.dirsrv.restart(ds_instance, wait=False)
+                services.knownservices.dirsrv.restart(ds_instance, wait=False)
             except Exception, e:
                 root_logger.error('Unable to restart ds instance %s: %s', ds_instance, e)
 
@@ -884,7 +885,7 @@ class DsInstance(service.Service):
         """
 
         # Do the platform-specific changes
-        proceed = ipaservices.knownservices.dirsrv.tune_nofile_platform(
+        proceed = services.knownservices.dirsrv.tune_nofile_platform(
                     num=num, fstore=self.fstore)
 
         if proceed:
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index 7f15d3769..a2de7c1bd 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -43,6 +43,7 @@ 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
 IPA_MODULES = [
@@ -833,19 +834,19 @@ def stopped_service(service, instance_name=""):
                       log_instance_name)
 
     # Figure out if the service is running, if not, yield
-    if not ipaservices.knownservices[service].is_running(instance_name):
+    if not services.knownservices[service].is_running(instance_name):
         root_logger.debug('Service %s%s is not running, continue.', service,
                           log_instance_name)
         yield
     else:
         # Stop the service, do the required stuff and start it again
         root_logger.debug('Stopping %s%s.', service, log_instance_name)
-        ipaservices.knownservices[service].stop(instance_name)
+        services.knownservices[service].stop(instance_name)
         try:
             yield
         finally:
             root_logger.debug('Starting %s%s.', service, log_instance_name)
-            ipaservices.knownservices[service].start(instance_name)
+            services.knownservices[service].start(instance_name)
 
 def check_entropy():
     '''
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index 1da272fe9..d3f7f178d 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -25,6 +25,7 @@ import time
 import pwd
 from optparse import OptionGroup
 from ConfigParser import SafeConfigParser
+from ipaplatform import services
 
 from ipalib import api, errors
 from ipapython import version
@@ -258,7 +259,7 @@ class Backup(admintool.AdminTool):
 
         cwd = os.getcwd()
         try:
-            dirsrv = ipaservices.knownservices.dirsrv
+            dirsrv = services.knownservices.dirsrv
 
             self.add_instance_specific_data()
 
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index 56e522895..d2064d4af 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -40,6 +40,7 @@ from ipapython import services as ipaservices
 from ipapython import ipaldap
 from ipaplatform import tasks
 from ipaserver.install.ipa_backup import BACKUP_DIR
+from ipaplatform import services
 
 
 def recursive_chown(path, uid, gid):
@@ -204,7 +205,7 @@ class Restore(admintool.AdminTool):
 
         cwd = os.getcwd()
         try:
-            dirsrv = ipaservices.knownservices.dirsrv
+            dirsrv = services.knownservices.dirsrv
 
             self.read_header()
             # These two checks would normally be in the validate method but
@@ -294,13 +295,13 @@ class Restore(admintool.AdminTool):
             else:
                 # explicitly enable then disable the pki tomcatd service to
                 # re-register its instance. FIXME, this is really wierd.
-                ipaservices.knownservices.pki_tomcatd.enable()
-                ipaservices.knownservices.pki_tomcatd.disable()
+                services.knownservices.pki_tomcatd.enable()
+                services.knownservices.pki_tomcatd.disable()
 
                 self.log.info('Starting IPA services')
                 run(['ipactl', 'start'])
                 self.log.info('Restarting SSSD')
-                sssd = ipaservices.service('sssd')
+                sssd = services.service('sssd')
                 sssd.restart()
         finally:
             try:
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index f295fb305..4a484d617 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -30,6 +30,7 @@ from ipapython import services as ipaservices
 from ipapython.ipa_log_manager import *
 from ipapython import ipautil, dogtag, ipaldap
 from ipapython.dn import DN
+from ipaplatform import services
 
 # the default container used by AD for user entries
 WIN_USER_CONTAINER = DN(('cn', 'Users'))
@@ -108,7 +109,7 @@ def enable_replication_version_checking(hostname, realm, dirman_passwd):
         conn.modify_s(entry.dn, [(ldap.MOD_REPLACE, 'nsslapd-pluginenabled', 'on')])
         conn.unbind()
         serverid = "-".join(realm.split("."))
-        ipaservices.knownservices.dirsrv.restart(instance_name=serverid)
+        services.knownservices.dirsrv.restart(instance_name=serverid)
     else:
         conn.unbind()
 
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 387cb1cf4..3a6983856 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -29,6 +29,7 @@ from ipapython import services as ipaservices
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import *
 from ipalib import errors
+from ipaplatform import services
 
 # Autobind modes
 AUTO = 1
@@ -75,7 +76,7 @@ class Service(object):
     def __init__(self, service_name, service_desc=None, sstore=None, dm_password=None, ldapi=True, autobind=AUTO):
         self.service_name = service_name
         self.service_desc = service_desc
-        self.service = ipaservices.service(service_name)
+        self.service = services.service(service_name)
         self.steps = []
         self.output_fd = sys.stdout
         self.dm_password = dm_password