session: move the session module from ipalib to ipaserver

The module is used only on the server, so there's no need to have it in
ipalib, which is shared by client and server.

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

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>

6 files changed, 7 insertions, 7 deletions

diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index f0f5a0d71..21ac89dfd 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -50,7 +50,7 @@ except ImportError:
     from ldap.controls import LDAPControl as LDAPControl    #pylint: disable=F0401
 import ldap as _ldap
 from ipapython.ipaldap import IPAdmin
-from ipalib.session import krbccache_dir, krbccache_prefix
+from ipaserver.session import krbccache_dir, krbccache_prefix
 from dns import resolver, rdatatype
 from dns.exception import DNSException
 import pysss_nss_idmap
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index 65176964a..18a60ecd1 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -34,8 +34,8 @@ from ipapython import admintool
 from ipapython.dn import DN
 from ipaserver.install.replication import wait_for_task
 from ipaserver.install import installutils
+from ipaserver.session import ISO8601_DATETIME_FMT
 from ipapython import ipaldap
-from ipalib.session import ISO8601_DATETIME_FMT
 from ipalib.constants import CACERT
 from ipaplatform.constants import constants
 from ipaplatform.tasks import tasks
diff --git a/ipaserver/plugins/session.py b/ipaserver/plugins/session.py
index b03b6b410..9daa1426b 100644
--- a/ipaserver/plugins/session.py
+++ b/ipaserver/plugins/session.py
@@ -7,7 +7,7 @@ from ipalib.request import context
 from ipalib.plugable import Registry
 
 if api.env.in_server:
-    from ipalib.session import session_mgr
+    from ipaserver.session import session_mgr
 
 register = Registry()
 
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index 98a243d53..ac27ae7f6 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -50,7 +50,7 @@ from ipalib.rpc import (xml_dumps, xml_loads,
 from ipalib.util import parse_time_duration, normalize_name
 from ipapython.dn import DN
 from ipaserver.plugins.ldap2 import ldap2
-from ipalib.session import (
+from ipaserver.session import (
     session_mgr, AuthManager, get_ipa_ccache_name,
     load_ccache_data, bind_ipa_ccache, release_ipa_ccache, fmt_time,
     default_max_session_duration, krbccache_dir, krbccache_prefix)
diff --git a/ipalib/session.py b/ipaserver/session.py
index 35eb554b4..35eb554b4 100644
--- a/ipalib/session.py
+++ b/ipaserver/session.py
diff --git a/pylint_plugins.py b/pylint_plugins.py
index 982efa324..26a4efb6a 100644
--- a/pylint_plugins.py
+++ b/pylint_plugins.py
@@ -195,9 +195,6 @@ ipa_class_members = {
         'Updater',
         'Advice',
     ] + LOGGING_ATTRS,
-    'ipalib.session.AuthManager': LOGGING_ATTRS,
-    'ipalib.session.SessionAuthManager': LOGGING_ATTRS,
-    'ipalib.session.SessionManager': LOGGING_ATTRS,
     'ipalib.util.ForwarderValidationError': [
         'msg',
     ],
@@ -209,6 +206,9 @@ ipa_class_members = {
     'ipaserver.rpcserver.KerberosSession': [
         fake_api,
     ] + LOGGING_ATTRS,
+    'ipaserver.session.AuthManager': LOGGING_ATTRS,
+    'ipaserver.session.SessionAuthManager': LOGGING_ATTRS,
+    'ipaserver.session.SessionManager': LOGGING_ATTRS,
     'ipatests.test_integration.base.IntegrationTest': [
         'domain',
         {'master': [