diff --git a/API.txt b/API.txt index c37973202..44bf64d17 100644 --- a/API.txt +++ b/API.txt @@ -2729,6 +2729,13 @@ output: Output('completed', type=[]) output: Output('failed', type=[]) output: Output('succeeded', type=[]) output: Output('summary', type=[, ]) +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?') diff --git a/install/oddjob/com.redhat.idm.trust-fetch-domains b/install/oddjob/com.redhat.idm.trust-fetch-domains index 7c70c41d5..ea00f30d9 100755 --- a/install/oddjob/com.redhat.idm.trust-fetch-domains +++ b/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 diff --git a/install/ui/util/sync.sh b/install/ui/util/sync.sh index 2fde91d9b..6a081fbb3 100755 --- a/install/ui/util/sync.sh +++ b/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 - TARGET=/usr/lib/python2.7/site-packages/ipalib/plugins + SOURCE=ipaserver/plugins/internal.py + TARGET=/usr/lib/python2.7/site-packages/ipaserver/plugins RECURSIVE=0 CLEAN=0 # don't clean entire folder pushd $DIR/../../../ diff --git a/ipaclient/remote_plugins/__init__.py b/ipaclient/remote_plugins/__init__.py index c59de0ca7..93636fcb5 100644 --- a/ipaclient/remote_plugins/__init__.py +++ b/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) diff --git a/ipalib/__init__.py b/ipalib/__init__.py index 0070e62db..4a61aced2 100644 --- a/ipalib/__init__.py +++ b/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: diff --git a/ipalib/plugins/__init__.py b/ipalib/plugins/__init__.py deleted file mode 100644 index e3bf6db35..000000000 --- a/ipalib/plugins/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# Authors: -# Jason Gerard DeRose -# -# 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 . - -""" -Sub-package containing all core plugins. -""" diff --git a/ipalib/setup.py.in b/ipalib/setup.py.in index 8107c81ff..3bc6b7590 100644 --- a/ipalib/setup.py.in +++ b/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", - "ipalib.plugins", - ], + packages = ["ipalib"], ) finally: del sys.path[0] diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py index d2a9bd8f8..2399264c2 100644 --- a/ipaserver/install/plugins/dns.py +++ b/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() diff --git a/ipaserver/install/plugins/update_managed_permissions.py b/ipaserver/install/plugins/update_managed_permissions.py index 36ac5cca8..5b3722742 100644 --- a/ipaserver/install/plugins/update_managed_permissions.py +++ b/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 diff --git a/ipalib/plugins/aci.py b/ipaserver/plugins/aci.py similarity index 100% rename from ipalib/plugins/aci.py rename to ipaserver/plugins/aci.py diff --git a/ipalib/plugins/automember.py b/ipaserver/plugins/automember.py similarity index 100% rename from ipalib/plugins/automember.py rename to ipaserver/plugins/automember.py diff --git a/ipalib/plugins/automount.py b/ipaserver/plugins/automount.py similarity index 100% rename from ipalib/plugins/automount.py rename to ipaserver/plugins/automount.py diff --git a/ipalib/plugins/baseldap.py b/ipaserver/plugins/baseldap.py similarity index 100% rename from ipalib/plugins/baseldap.py rename to ipaserver/plugins/baseldap.py diff --git a/ipalib/plugins/baseuser.py b/ipaserver/plugins/baseuser.py similarity index 100% rename from ipalib/plugins/baseuser.py rename to ipaserver/plugins/baseuser.py diff --git a/ipalib/plugins/batch.py b/ipaserver/plugins/batch.py similarity index 100% rename from ipalib/plugins/batch.py rename to ipaserver/plugins/batch.py diff --git a/ipalib/plugins/caacl.py b/ipaserver/plugins/caacl.py similarity index 100% rename from ipalib/plugins/caacl.py rename to ipaserver/plugins/caacl.py diff --git a/ipalib/plugins/cert.py b/ipaserver/plugins/cert.py similarity index 100% rename from ipalib/plugins/cert.py rename to ipaserver/plugins/cert.py diff --git a/ipalib/plugins/certprofile.py b/ipaserver/plugins/certprofile.py similarity index 100% rename from ipalib/plugins/certprofile.py rename to ipaserver/plugins/certprofile.py diff --git a/ipalib/plugins/config.py b/ipaserver/plugins/config.py similarity index 100% rename from ipalib/plugins/config.py rename to ipaserver/plugins/config.py diff --git a/ipalib/plugins/delegation.py b/ipaserver/plugins/delegation.py similarity index 100% rename from ipalib/plugins/delegation.py rename to ipaserver/plugins/delegation.py diff --git a/ipalib/plugins/dns.py b/ipaserver/plugins/dns.py similarity index 100% rename from ipalib/plugins/dns.py rename to ipaserver/plugins/dns.py diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py index 8836e70dc..197814c4d 100644 --- a/ipaserver/plugins/dogtag.py +++ b/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') diff --git a/ipalib/plugins/domainlevel.py b/ipaserver/plugins/domainlevel.py similarity index 100% rename from ipalib/plugins/domainlevel.py rename to ipaserver/plugins/domainlevel.py diff --git a/ipalib/plugins/group.py b/ipaserver/plugins/group.py similarity index 100% rename from ipalib/plugins/group.py rename to ipaserver/plugins/group.py diff --git a/ipalib/plugins/hbac.py b/ipaserver/plugins/hbac.py similarity index 100% rename from ipalib/plugins/hbac.py rename to ipaserver/plugins/hbac.py diff --git a/ipalib/plugins/hbacrule.py b/ipaserver/plugins/hbacrule.py similarity index 100% rename from ipalib/plugins/hbacrule.py rename to ipaserver/plugins/hbacrule.py diff --git a/ipalib/plugins/hbacsvc.py b/ipaserver/plugins/hbacsvc.py similarity index 100% rename from ipalib/plugins/hbacsvc.py rename to ipaserver/plugins/hbacsvc.py diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipaserver/plugins/hbacsvcgroup.py similarity index 100% rename from ipalib/plugins/hbacsvcgroup.py rename to ipaserver/plugins/hbacsvcgroup.py diff --git a/ipalib/plugins/hbactest.py b/ipaserver/plugins/hbactest.py similarity index 100% rename from ipalib/plugins/hbactest.py rename to ipaserver/plugins/hbactest.py diff --git a/ipalib/plugins/host.py b/ipaserver/plugins/host.py similarity index 100% rename from ipalib/plugins/host.py rename to ipaserver/plugins/host.py diff --git a/ipalib/plugins/hostgroup.py b/ipaserver/plugins/hostgroup.py similarity index 100% rename from ipalib/plugins/hostgroup.py rename to ipaserver/plugins/hostgroup.py diff --git a/ipalib/plugins/idrange.py b/ipaserver/plugins/idrange.py similarity index 100% rename from ipalib/plugins/idrange.py rename to ipaserver/plugins/idrange.py diff --git a/ipalib/plugins/idviews.py b/ipaserver/plugins/idviews.py similarity index 100% rename from ipalib/plugins/idviews.py rename to ipaserver/plugins/idviews.py diff --git a/ipalib/plugins/internal.py b/ipaserver/plugins/internal.py similarity index 100% rename from ipalib/plugins/internal.py rename to ipaserver/plugins/internal.py diff --git a/ipaserver/plugins/join.py b/ipaserver/plugins/join.py index 0f877b4d1..efec4226a 100644 --- a/ipaserver/plugins/join.py +++ b/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, diff --git a/ipalib/plugins/krbtpolicy.py b/ipaserver/plugins/krbtpolicy.py similarity index 100% rename from ipalib/plugins/krbtpolicy.py rename to ipaserver/plugins/krbtpolicy.py diff --git a/ipalib/plugins/migration.py b/ipaserver/plugins/migration.py similarity index 100% rename from ipalib/plugins/migration.py rename to ipaserver/plugins/migration.py diff --git a/ipalib/plugins/misc.py b/ipaserver/plugins/misc.py similarity index 100% rename from ipalib/plugins/misc.py rename to ipaserver/plugins/misc.py diff --git a/ipalib/plugins/netgroup.py b/ipaserver/plugins/netgroup.py similarity index 100% rename from ipalib/plugins/netgroup.py rename to ipaserver/plugins/netgroup.py diff --git a/ipalib/plugins/otp.py b/ipaserver/plugins/otp.py similarity index 100% rename from ipalib/plugins/otp.py rename to ipaserver/plugins/otp.py diff --git a/ipalib/plugins/otpconfig.py b/ipaserver/plugins/otpconfig.py similarity index 100% rename from ipalib/plugins/otpconfig.py rename to ipaserver/plugins/otpconfig.py diff --git a/ipalib/plugins/otptoken.py b/ipaserver/plugins/otptoken.py similarity index 100% rename from ipalib/plugins/otptoken.py rename to ipaserver/plugins/otptoken.py diff --git a/ipalib/plugins/passwd.py b/ipaserver/plugins/passwd.py similarity index 100% rename from ipalib/plugins/passwd.py rename to ipaserver/plugins/passwd.py diff --git a/ipalib/plugins/permission.py b/ipaserver/plugins/permission.py similarity index 100% rename from ipalib/plugins/permission.py rename to ipaserver/plugins/permission.py diff --git a/ipalib/plugins/ping.py b/ipaserver/plugins/ping.py similarity index 100% rename from ipalib/plugins/ping.py rename to ipaserver/plugins/ping.py diff --git a/ipalib/plugins/pkinit.py b/ipaserver/plugins/pkinit.py similarity index 100% rename from ipalib/plugins/pkinit.py rename to ipaserver/plugins/pkinit.py diff --git a/ipalib/plugins/privilege.py b/ipaserver/plugins/privilege.py similarity index 100% rename from ipalib/plugins/privilege.py rename to ipaserver/plugins/privilege.py diff --git a/ipalib/plugins/pwpolicy.py b/ipaserver/plugins/pwpolicy.py similarity index 100% rename from ipalib/plugins/pwpolicy.py rename to ipaserver/plugins/pwpolicy.py diff --git a/ipalib/plugins/radiusproxy.py b/ipaserver/plugins/radiusproxy.py similarity index 100% rename from ipalib/plugins/radiusproxy.py rename to ipaserver/plugins/radiusproxy.py diff --git a/ipalib/plugins/realmdomains.py b/ipaserver/plugins/realmdomains.py similarity index 100% rename from ipalib/plugins/realmdomains.py rename to ipaserver/plugins/realmdomains.py diff --git a/ipalib/plugins/role.py b/ipaserver/plugins/role.py similarity index 100% rename from ipalib/plugins/role.py rename to ipaserver/plugins/role.py diff --git a/ipalib/plugins/schema.py b/ipaserver/plugins/schema.py similarity index 100% rename from ipalib/plugins/schema.py rename to ipaserver/plugins/schema.py diff --git a/ipalib/plugins/selfservice.py b/ipaserver/plugins/selfservice.py similarity index 100% rename from ipalib/plugins/selfservice.py rename to ipaserver/plugins/selfservice.py diff --git a/ipalib/plugins/selinuxusermap.py b/ipaserver/plugins/selinuxusermap.py similarity index 100% rename from ipalib/plugins/selinuxusermap.py rename to ipaserver/plugins/selinuxusermap.py diff --git a/ipalib/plugins/server.py b/ipaserver/plugins/server.py similarity index 100% rename from ipalib/plugins/server.py rename to ipaserver/plugins/server.py diff --git a/ipalib/plugins/service.py b/ipaserver/plugins/service.py similarity index 100% rename from ipalib/plugins/service.py rename to ipaserver/plugins/service.py diff --git a/ipalib/plugins/servicedelegation.py b/ipaserver/plugins/servicedelegation.py similarity index 100% rename from ipalib/plugins/servicedelegation.py rename to ipaserver/plugins/servicedelegation.py diff --git a/ipalib/plugins/session.py b/ipaserver/plugins/session.py similarity index 100% rename from ipalib/plugins/session.py rename to ipaserver/plugins/session.py diff --git a/ipalib/plugins/stageuser.py b/ipaserver/plugins/stageuser.py similarity index 100% rename from ipalib/plugins/stageuser.py rename to ipaserver/plugins/stageuser.py diff --git a/ipalib/plugins/sudo.py b/ipaserver/plugins/sudo.py similarity index 100% rename from ipalib/plugins/sudo.py rename to ipaserver/plugins/sudo.py diff --git a/ipalib/plugins/sudocmd.py b/ipaserver/plugins/sudocmd.py similarity index 100% rename from ipalib/plugins/sudocmd.py rename to ipaserver/plugins/sudocmd.py diff --git a/ipalib/plugins/sudocmdgroup.py b/ipaserver/plugins/sudocmdgroup.py similarity index 100% rename from ipalib/plugins/sudocmdgroup.py rename to ipaserver/plugins/sudocmdgroup.py diff --git a/ipalib/plugins/sudorule.py b/ipaserver/plugins/sudorule.py similarity index 100% rename from ipalib/plugins/sudorule.py rename to ipaserver/plugins/sudorule.py diff --git a/ipalib/plugins/topology.py b/ipaserver/plugins/topology.py similarity index 100% rename from ipalib/plugins/topology.py rename to ipaserver/plugins/topology.py diff --git a/ipalib/plugins/trust.py b/ipaserver/plugins/trust.py similarity index 100% rename from ipalib/plugins/trust.py rename to ipaserver/plugins/trust.py diff --git a/ipalib/plugins/user.py b/ipaserver/plugins/user.py similarity index 100% rename from ipalib/plugins/user.py rename to ipaserver/plugins/user.py diff --git a/ipalib/plugins/vault.py b/ipaserver/plugins/vault.py similarity index 100% rename from ipalib/plugins/vault.py rename to ipaserver/plugins/vault.py diff --git a/ipalib/plugins/virtual.py b/ipaserver/plugins/virtual.py similarity index 100% rename from ipalib/plugins/virtual.py rename to ipaserver/plugins/virtual.py diff --git a/ipatests/test_cmdline/test_help.py b/ipatests/test_cmdline/test_help.py index 7940086e7..0c0ae9a55 100644 --- a/ipatests/test_cmdline/test_help.py +++ b/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: diff --git a/ipatests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py index 42245a087..816f12fc5 100644 --- a/ipatests/test_ipaserver/test_ldap.py +++ b/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 ipalib.plugins.host import host +from ipaserver.plugins.service import service, service_show +from ipaserver.plugins.host import host from ipalib import api, x509, create_api, errors from ipapython import ipautil from ipaplatform.paths import paths diff --git a/ipatests/test_xmlrpc/test_automember_plugin.py b/ipatests/test_xmlrpc/test_automember_plugin.py index 2078b1fcb..9060b69bd 100644 --- a/ipatests/test_xmlrpc/test_automember_plugin.py +++ b/ipatests/test_xmlrpc/test_automember_plugin.py @@ -18,7 +18,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/automember.py` module. +Test the `ipaserver/plugins/automember.py` module. """ from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker diff --git a/ipatests/test_xmlrpc/test_automount_plugin.py b/ipatests/test_xmlrpc/test_automount_plugin.py index 6694bf07c..9379b53ac 100644 --- a/ipatests/test_xmlrpc/test_automount_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/automount.py' module. +Test the `ipaserver/plugins/automount.py' module. """ import textwrap diff --git a/ipatests/test_xmlrpc/test_baseldap_plugin.py b/ipatests/test_xmlrpc/test_baseldap_plugin.py index faec5e598..50a9f1eb6 100644 --- a/ipatests/test_xmlrpc/test_baseldap_plugin.py +++ b/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 diff --git a/ipatests/test_xmlrpc/test_batch_plugin.py b/ipatests/test_xmlrpc/test_batch_plugin.py index c2d108fb9..95c682c89 100644 --- a/ipatests/test_xmlrpc/test_batch_plugin.py +++ b/ipatests/test_xmlrpc/test_batch_plugin.py @@ -18,7 +18,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/batch.py` module. +Test the `ipaserver/plugins/batch.py` module. """ from ipalib import api diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py index 7f320c157..1a6168da2 100644 --- a/ipatests/test_xmlrpc/test_cert_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/cert.py` module against a RA. +Test the `ipaserver/plugins/cert.py` module against a RA. """ import os diff --git a/ipatests/test_xmlrpc/test_config_plugin.py b/ipatests/test_xmlrpc/test_config_plugin.py index dc480a652..6f00d8bbf 100644 --- a/ipatests/test_xmlrpc/test_config_plugin.py +++ b/ipatests/test_xmlrpc/test_config_plugin.py @@ -19,7 +19,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/config.py` module. +Test the `ipaserver/plugins/config.py` module. """ from ipalib import errors diff --git a/ipatests/test_xmlrpc/test_delegation_plugin.py b/ipatests/test_xmlrpc/test_delegation_plugin.py index 99a0bcdcb..509c26107 100644 --- a/ipatests/test_xmlrpc/test_delegation_plugin.py +++ b/ipatests/test_xmlrpc/test_delegation_plugin.py @@ -18,7 +18,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/delegation.py` module. +Test the `ipaserver/plugins/delegation.py` module. """ from ipalib import api, errors diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py index dbc3bae37..f3484166d 100644 --- a/ipatests/test_xmlrpc/test_dns_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/dns.py` module. +Test the `ipaserver/plugins/dns.py` module. """ import nose diff --git a/ipatests/test_xmlrpc/test_group_plugin.py b/ipatests/test_xmlrpc/test_group_plugin.py index 02467daed..27a8a3396 100644 --- a/ipatests/test_xmlrpc/test_group_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/group.py` module. +Test the `ipaserver/plugins/group.py` module. """ import pytest diff --git a/ipatests/test_xmlrpc/test_hbac_plugin.py b/ipatests/test_xmlrpc/test_hbac_plugin.py index 5412591d2..55b038754 100644 --- a/ipatests/test_xmlrpc/test_hbac_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/hbacrule.py` module. +Test the `ipaserver/plugins/hbacrule.py` module. """ from nose.tools import raises, assert_raises # pylint: disable=E0611 diff --git a/ipatests/test_xmlrpc/test_hbactest_plugin.py b/ipatests/test_xmlrpc/test_hbactest_plugin.py index fba3bec8e..bad59f4c8 100644 --- a/ipatests/test_xmlrpc/test_hbactest_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/hbactest.py` module. +Test the `ipaserver/plugins/hbactest.py` module. """ from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test diff --git a/ipatests/test_xmlrpc/test_netgroup_plugin.py b/ipatests/test_xmlrpc/test_netgroup_plugin.py index 2d2df7c49..6194fa4d4 100644 --- a/ipatests/test_xmlrpc/test_netgroup_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/netgroup.py` module. +Test the `ipaserver/plugins/netgroup.py` module. """ from ipalib import api diff --git a/ipatests/test_xmlrpc/test_old_permission_plugin.py b/ipatests/test_xmlrpc/test_old_permission_plugin.py index 38662c21f..2328c6742 100644 --- a/ipatests/test_xmlrpc/test_old_permission_plugin.py +++ b/ipatests/test_xmlrpc/test_old_permission_plugin.py @@ -19,7 +19,7 @@ # along with this program. If not, see . """ -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 diff --git a/ipatests/test_xmlrpc/test_passwd_plugin.py b/ipatests/test_xmlrpc/test_passwd_plugin.py index 0ebe14c26..948db1432 100644 --- a/ipatests/test_xmlrpc/test_passwd_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/passwd.py` module. +Test the `ipaserver/plugins/passwd.py` module. """ from nose.tools import assert_raises # pylint: disable=E0611 diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py index 938ab4bb6..d7061c62c 100644 --- a/ipatests/test_xmlrpc/test_permission_plugin.py +++ b/ipatests/test_xmlrpc/test_permission_plugin.py @@ -19,7 +19,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/permission.py` module. +Test the `ipaserver/plugins/permission.py` module. """ from __future__ import print_function diff --git a/ipatests/test_xmlrpc/test_ping_plugin.py b/ipatests/test_xmlrpc/test_ping_plugin.py index 2c089a9cb..5d1440cb8 100644 --- a/ipatests/test_xmlrpc/test_ping_plugin.py +++ b/ipatests/test_xmlrpc/test_ping_plugin.py @@ -19,7 +19,7 @@ # along with this program. If not, see . """ -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 diff --git a/ipatests/test_xmlrpc/test_privilege_plugin.py b/ipatests/test_xmlrpc/test_privilege_plugin.py index c80cfef7d..c375f907f 100644 --- a/ipatests/test_xmlrpc/test_privilege_plugin.py +++ b/ipatests/test_xmlrpc/test_privilege_plugin.py @@ -18,7 +18,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/privilege.py` module. +Test the `ipaserver/plugins/privilege.py` module. """ from ipalib import api, errors diff --git a/ipatests/test_xmlrpc/test_pwpolicy_plugin.py b/ipatests/test_xmlrpc/test_pwpolicy_plugin.py index 7cbb9bad4..381674608 100644 --- a/ipatests/test_xmlrpc/test_pwpolicy_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/pwpolicy.py` module. +Test the `ipaserver/plugins/pwpolicy.py` module. """ from nose.tools import assert_raises # pylint: disable=E0611 diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py index 019bfd839..0f0e05a47 100644 --- a/ipatests/test_xmlrpc/test_range_plugin.py +++ b/ipatests/test_xmlrpc/test_range_plugin.py @@ -18,7 +18,7 @@ # along with this program. If not, see . """ -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 diff --git a/ipatests/test_xmlrpc/test_realmdomains_plugin.py b/ipatests/test_xmlrpc/test_realmdomains_plugin.py index dfc33514b..4d85306e6 100644 --- a/ipatests/test_xmlrpc/test_realmdomains_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/realmdomains.py` module. +Test the `ipaserver/plugins/realmdomains.py` module. """ from ipalib import api, errors diff --git a/ipatests/test_xmlrpc/test_role_plugin.py b/ipatests/test_xmlrpc/test_role_plugin.py index 2c368b351..74ff505cc 100644 --- a/ipatests/test_xmlrpc/test_role_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/role.py` module. +Test the `ipaserver/plugins/role.py` module. """ from ipalib import api, errors diff --git a/ipatests/test_xmlrpc/test_selfservice_plugin.py b/ipatests/test_xmlrpc/test_selfservice_plugin.py index 9dd3916de..02aea35e1 100644 --- a/ipatests/test_xmlrpc/test_selfservice_plugin.py +++ b/ipatests/test_xmlrpc/test_selfservice_plugin.py @@ -18,7 +18,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/selfservice.py` module. +Test the `ipaserver/plugins/selfservice.py` module. """ from ipalib import errors diff --git a/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py index b8beba6e4..1acb38804 100644 --- a/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/selinuxusermap.py` module. +Test the `ipaserver/plugins/selinuxusermap.py` module. """ from ipalib import api, errors diff --git a/ipatests/test_xmlrpc/test_service_plugin.py b/ipatests/test_xmlrpc/test_service_plugin.py index 663e1f36d..0a38e3d65 100644 --- a/ipatests/test_xmlrpc/test_service_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/service.py` module. +Test the `ipaserver/plugins/service.py` module. """ from ipalib import api, errors, x509 diff --git a/ipatests/test_xmlrpc/test_servicedelegation_plugin.py b/ipatests/test_xmlrpc/test_servicedelegation_plugin.py index bf7897581..9aed58c86 100644 --- a/ipatests/test_xmlrpc/test_servicedelegation_plugin.py +++ b/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 diff --git a/ipatests/test_xmlrpc/test_stageuser_plugin.py b/ipatests/test_xmlrpc/test_stageuser_plugin.py index cfb7ab478..96f7e22b3 100644 --- a/ipatests/test_xmlrpc/test_stageuser_plugin.py +++ b/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 diff --git a/ipatests/test_xmlrpc/test_sudocmd_plugin.py b/ipatests/test_xmlrpc/test_sudocmd_plugin.py index 7ffe7a1d0..dd880b58e 100644 --- a/ipatests/test_xmlrpc/test_sudocmd_plugin.py +++ b/ipatests/test_xmlrpc/test_sudocmd_plugin.py @@ -18,7 +18,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/sudocmd.py` module. +Test the `ipaserver/plugins/sudocmd.py` module. """ from ipalib import api, errors diff --git a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py index be47de980..ac00d5c56 100644 --- a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/sudocmdgroup.py` module. +Test the `ipaserver/plugins/sudocmdgroup.py` module. """ from ipalib import errors diff --git a/ipatests/test_xmlrpc/test_sudorule_plugin.py b/ipatests/test_xmlrpc/test_sudorule_plugin.py index ef21f28b4..bd3ed00be 100644 --- a/ipatests/test_xmlrpc/test_sudorule_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/sudorule.py` module. +Test the `ipaserver/plugins/sudorule.py` module. """ from nose.tools import raises, assert_raises # pylint: disable=E0611 diff --git a/ipatests/test_xmlrpc/test_trust_plugin.py b/ipatests/test_xmlrpc/test_trust_plugin.py index 0427ed151..f37f776c4 100644 --- a/ipatests/test_xmlrpc/test_trust_plugin.py +++ b/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 . """ -Test the `ipalib/plugins/trust.py` module. +Test the `ipaserver/plugins/trust.py` module. """ import nose diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py index 975b2b876..dbfdb4c08 100644 --- a/ipatests/test_xmlrpc/test_user_plugin.py +++ b/ipatests/test_xmlrpc/test_user_plugin.py @@ -21,7 +21,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/user.py` module. +Test the `ipaserver/plugins/user.py` module. """ import pytest diff --git a/ipatests/test_xmlrpc/test_vault_plugin.py b/ipatests/test_xmlrpc/test_vault_plugin.py index 932185f86..7023d6a9b 100644 --- a/ipatests/test_xmlrpc/test_vault_plugin.py +++ b/ipatests/test_xmlrpc/test_vault_plugin.py @@ -18,7 +18,7 @@ # along with this program. If not, see . """ -Test the `ipalib/plugins/vault.py` module. +Test the `ipaserver/plugins/vault.py` module. """ import nose diff --git a/pylint_plugins.py b/pylint_plugins.py index 35976bccd..2f0bad1b4 100644 --- a/pylint_plugins.py +++ b/pylint_plugins.py @@ -168,10 +168,6 @@ ipa_class_members = { 'ipalib.parameters.Str': ['noextrawhitespace'], 'ipalib.parameters.Password': ['confirm'], 'ipalib.parameters.File': ['stdin_if_missing'], - 'ipalib.plugins.dns.DNSRecord': [ - 'validatedns', - 'normalizedns', - ], 'ipalib.parameters.Enum': ['values'], 'ipalib.parameters.Number': [ 'minvalue', @@ -202,6 +198,10 @@ ipa_class_members = { 'msg', ], 'ipaserver.install.ldapupdate.LDAPUpdate': LOGGING_ATTRS, + 'ipaserver.plugins.dns.DNSRecord': [ + 'validatedns', + 'normalizedns', + ], 'ipaserver.rpcserver.KerberosSession': [ fake_api, ] + LOGGING_ATTRS,