ipalib: move server-side plugins to ipaserver

Move the remaining plugin code from ipalib.plugins to ipaserver.plugins.

Remove the now unused ipalib.plugins package.

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

Reviewed-By: David Kupka <dkupka@redhat.com>

API.txt

@@ -2729,6 +2729,13 @@ output: Output('completed', type=[<type 'int'>])
 output: Output('failed', type=[<type 'dict'>])
 output: Output('succeeded', type=[<type 'dict'>])
 output: Output('summary', type=[<type 'unicode'>, <type 'NoneType'>])
+command: join
+args: 1,4,0
+arg: Str('cn', autofill=True, cli_name='hostname')
+option: Str('nshardwareplatform?', cli_name='platform')
+option: Str('nsosversion?', cli_name='os')
+option: Str('realm', autofill=True)
+option: Str('version?')
 command: json_metadata
 args: 2,4,3
 arg: Str('objname?')

install/oddjob/com.redhat.idm.trust-fetch-domains

@@ -81,7 +81,7 @@ api.finalize()
 
 # Only import trust plugin after api is initialized or internal imports
 # within the plugin will not work
-from ipalib.plugins import trust
+from ipaserver.plugins import trust
 
 # We have to dance with two different credentials caches:
 # ccache_name         --  for cifs/ipa.master@IPA.REALM to communicate with LDAP

install/ui/util/sync.sh

@@ -60,7 +60,7 @@ OPTIONS
     --config
                 files from html/
     --strings
-                ipalib/plugins/internal.py
+                ipaserver/plugins/internal.py
     -C
     --compiled
                 changes source dir of --freeipa and --dojo to /src/build/freeipa
@@ -340,8 +340,8 @@ pushd $DIR/../../ #freeipa/install
 popd
 
 if [[ $STRINGS ]] ; then
-    SOURCE=ipalib/plugins/internal.py
+    SOURCE=ipaserver/plugins/internal.py
-    TARGET=/usr/lib/python2.7/site-packages/ipalib/plugins
+    TARGET=/usr/lib/python2.7/site-packages/ipaserver/plugins
     RECURSIVE=0
     CLEAN=0 # don't clean entire folder
     pushd $DIR/../../../

ipaclient/remote_plugins/__init__.py

@@ -7,7 +7,7 @@ from . import schema
 
 def get_package(api):
     if api.env.in_tree:
-        from ipalib import plugins
+        from ipaserver import plugins
     else:
         plugins = schema.get_package(api)
 

ipalib/__init__.py

@@ -908,10 +908,8 @@ class API(plugable.API):
     @property
     def packages(self):
         if self.env.in_server:
-            import ipalib.plugins
             import ipaserver.plugins
             result = (
-                ipalib.plugins,
                 ipaserver.plugins,
             )
         else:

ipalib/plugins/__init__.py

@@ -1,22 +0,0 @@
-# Authors:
-#   Jason Gerard DeRose <jderose@redhat.com>
-#
-# Copyright (C) 2008  Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-Sub-package containing all core plugins.
-"""

ipalib/setup.py.in

@@ -59,9 +59,7 @@ def setup_package():
             classifiers=[line for line in CLASSIFIERS.split('\n') if line],
             platforms = ["Linux", "Solaris", "Unix"],
             package_dir = {'ipalib': ''},
-            packages = ["ipalib",
+            packages = ["ipalib"],
-                        "ipalib.plugins",
-                       ],
         )
     finally:
         del sys.path[0]

ipaserver/install/plugins/dns.py

@@ -27,8 +27,8 @@ from ipalib import Registry, errors, util
 from ipalib import Updater
 from ipapython.dn import DN
 from ipapython import dnsutil
-from ipalib.plugins.dns import dns_container_exists
 from ipapython.ipa_log_manager import root_logger
+from ipaserver.plugins.dns import dns_container_exists
 
 register = Registry()
 

ipaserver/install/plugins/update_managed_permissions.py

@@ -88,11 +88,11 @@ import six
 from ipalib import api, errors
 from ipapython.dn import DN
 from ipalib.plugable import Registry
-from ipalib.plugins import aci
-from ipalib.plugins.permission import permission, permission_del
 from ipalib.aci import ACI
 from ipalib import Updater
 from ipapython import ipautil
+from ipaserver.plugins import aci
+from ipaserver.plugins.permission import permission, permission_del
 
 if six.PY3:
     unicode = str

ipaserver/plugins/dogtag.py

@@ -244,19 +244,21 @@ import json
 from lxml import etree
 import time
 
-import pki
-from pki.client import PKIConnection
-import pki.crypto as cryptoutil
-from pki.kra import KRAClient
 import six
 from six.moves import urllib
 
-from ipalib import Backend
+from ipalib import Backend, api
 from ipapython.dn import DN
 import ipapython.cookie
 from ipapython import dogtag
 from ipapython import ipautil
 
+if api.env.in_server:
+    import pki
+    from pki.client import PKIConnection
+    import pki.crypto as cryptoutil
+    from pki.kra import KRAClient
+
 if six.PY3:
     unicode = str
 
@@ -1269,7 +1271,7 @@ def select_any_master(ldap2, service='CA'):
 
 #-------------------------------------------------------------------------------
 
-from ipalib import Registry, api, errors, SkipPluginModule
+from ipalib import Registry, errors, SkipPluginModule
 if api.env.ra_plugin != 'dogtag':
     # In this case, abort loading this plugin module...
     raise SkipPluginModule(reason='dogtag not selected as RA plugin')

ipaserver/plugins/join.py

@@ -49,6 +49,8 @@ def validate_host(ugettext, cn):
 class join(Command):
     """Join an IPA domain"""
 
+    NO_CLI = True
+
     takes_args = (
         Str('cn',
             validate_host,

ipatests/test_cmdline/test_help.py

@@ -23,7 +23,7 @@ import six
 from six import StringIO
 
 from ipalib import api, errors
-from ipalib.plugins.user import user_add
+from ipaserver.plugins.user import user_add
 import pytest
 
 if six.PY3:

ipatests/test_ipaserver/test_ldap.py

@@ -35,8 +35,8 @@ import nss.nss as nss
 import six
 
 from ipaserver.plugins.ldap2 import ldap2
-from ipalib.plugins.service import service, service_show
+from ipaserver.plugins.service import service, service_show
-from ipalib.plugins.host import host
+from ipaserver.plugins.host import host
 from ipalib import api, x509, create_api, errors
 from ipapython import ipautil
 from ipaplatform.paths import paths

ipatests/test_xmlrpc/test_automember_plugin.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/automember.py` module.
+Test the `ipaserver/plugins/automember.py` module.
 """
 
 from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker

ipatests/test_xmlrpc/test_automount_plugin.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/automount.py' module.
+Test the `ipaserver/plugins/automount.py' module.
 """
 
 import textwrap

ipatests/test_xmlrpc/test_baseldap_plugin.py

@@ -27,7 +27,7 @@ from ipapython.dn import DN
 from ipapython import ipaldap
 from ipalib import errors
 from ipalib.frontend import Command
-from ipalib.plugins import baseldap
+from ipaserver.plugins import baseldap
 from ipatests.util import assert_deepequal
 import pytest
 

ipatests/test_xmlrpc/test_batch_plugin.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/batch.py` module.
+Test the `ipaserver/plugins/batch.py` module.
 """
 
 from ipalib import api

ipatests/test_xmlrpc/test_cert_plugin.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/cert.py` module against a RA.
+Test the `ipaserver/plugins/cert.py` module against a RA.
 """
 
 import os

ipatests/test_xmlrpc/test_config_plugin.py

@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/config.py` module.
+Test the `ipaserver/plugins/config.py` module.
 """
 
 from ipalib import errors

ipatests/test_xmlrpc/test_delegation_plugin.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/delegation.py` module.
+Test the `ipaserver/plugins/delegation.py` module.
 """
 
 from ipalib import api, errors

ipatests/test_xmlrpc/test_dns_plugin.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/dns.py` module.
+Test the `ipaserver/plugins/dns.py` module.
 """
 
 import nose

ipatests/test_xmlrpc/test_group_plugin.py

@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/group.py` module.
+Test the `ipaserver/plugins/group.py` module.
 """
 
 import pytest

ipatests/test_xmlrpc/test_hbac_plugin.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/hbacrule.py` module.
+Test the `ipaserver/plugins/hbacrule.py` module.
 """
 
 from nose.tools import raises, assert_raises  # pylint: disable=E0611

ipatests/test_xmlrpc/test_hbactest_plugin.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/hbactest.py` module.
+Test the `ipaserver/plugins/hbactest.py` module.
 """
 
 from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test

ipatests/test_xmlrpc/test_netgroup_plugin.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/netgroup.py` module.
+Test the `ipaserver/plugins/netgroup.py` module.
 """
 
 from ipalib import api

ipatests/test_xmlrpc/test_old_permission_plugin.py

@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/permission.py` module with old API.
+Test the `ipaserver/plugins/permission.py` module with old API.
 
 This ensures basic backwards compatibility for code before
 http://www.freeipa.org/page/V3/Permissions_V2

ipatests/test_xmlrpc/test_passwd_plugin.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/passwd.py` module.
+Test the `ipaserver/plugins/passwd.py` module.
 """
 
 from nose.tools import assert_raises  # pylint: disable=E0611

ipatests/test_xmlrpc/test_permission_plugin.py

@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/permission.py` module.
+Test the `ipaserver/plugins/permission.py` module.
 """
 from __future__ import print_function
 

ipatests/test_xmlrpc/test_ping_plugin.py

@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/ping.py` module, and XML-RPC in general.
+Test the `ipaserver/plugins/ping.py` module, and XML-RPC in general.
 """
 
 import pytest

ipatests/test_xmlrpc/test_privilege_plugin.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/privilege.py` module.
+Test the `ipaserver/plugins/privilege.py` module.
 """
 
 from ipalib import api, errors

ipatests/test_xmlrpc/test_pwpolicy_plugin.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/pwpolicy.py` module.
+Test the `ipaserver/plugins/pwpolicy.py` module.
 """
 
 from nose.tools import assert_raises  # pylint: disable=E0611

ipatests/test_xmlrpc/test_range_plugin.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/idrange.py` module, and XML-RPC in general.
+Test the `ipaserver/plugins/idrange.py` module, and XML-RPC in general.
 """
 
 import six

ipatests/test_xmlrpc/test_realmdomains_plugin.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/realmdomains.py` module.
+Test the `ipaserver/plugins/realmdomains.py` module.
 """
 
 from ipalib import api, errors

ipatests/test_xmlrpc/test_role_plugin.py

@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/role.py` module.
+Test the `ipaserver/plugins/role.py` module.
 """
 
 from ipalib import api, errors

ipatests/test_xmlrpc/test_selfservice_plugin.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/selfservice.py` module.
+Test the `ipaserver/plugins/selfservice.py` module.
 """
 
 from ipalib import errors

ipatests/test_xmlrpc/test_selinuxusermap_plugin.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/selinuxusermap.py` module.
+Test the `ipaserver/plugins/selinuxusermap.py` module.
 """
 
 from ipalib import api, errors

ipatests/test_xmlrpc/test_service_plugin.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/service.py` module.
+Test the `ipaserver/plugins/service.py` module.
 """
 
 from ipalib import api, errors, x509

ipatests/test_xmlrpc/test_servicedelegation_plugin.py

@@ -2,7 +2,7 @@
 # Copyright (C) 2015  FreeIPA Contributors see COPYING for license
 #
 """
-Test the `ipalib/plugins/serviceconstraint.py` module.
+Test the `ipaserver/plugins/serviceconstraint.py` module.
 """
 
 from ipalib import api, errors

ipatests/test_xmlrpc/test_stageuser_plugin.py

@@ -3,7 +3,7 @@
 #
 
 """
-Test the `ipalib/plugins/stageuser.py` module.
+Test the `ipaserver/plugins/stageuser.py` module.
 """
 
 import pytest

ipatests/test_xmlrpc/test_sudocmd_plugin.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Test the `ipalib/plugins/sudocmd.py` module.
+Test the `ipaserver/plugins/sudocmd.py` module.
 """
 
 from ipalib import api, errors

ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/sudocmdgroup.py` module.
+Test the `ipaserver/plugins/sudocmdgroup.py` module.
 """
 
 from ipalib import errors

ipatests/test_xmlrpc/test_sudorule_plugin.py

@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/sudorule.py` module.
+Test the `ipaserver/plugins/sudorule.py` module.
 """
 
 from nose.tools import raises, assert_raises  # pylint: disable=E0611

ipatests/test_xmlrpc/test_trust_plugin.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-Test the `ipalib/plugins/trust.py` module.
+Test the `ipaserver/plugins/trust.py` module.
 """
 
 import nose