From 45de34b2efedbdb9da167ab780b51bb5442e6c9b Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Mon, 1 Apr 2019 15:19:31 +0200
Subject: [PATCH] Rename tobiko.openstack.keystone modules.

Change-Id: I25523fe9fe928671fa4404abc1c7a7008451989c
---
 tobiko/openstack/keystone/__init__.py          | 18 +++++++++---------
 .../{credentials.py => _credentials.py}        |  0
 .../keystone/{session.py => _session.py}       |  2 +-
 .../openstack/keystone/test_credentials.py     |  2 +-
 .../tests/openstack/keystone/test_session.py   |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename tobiko/openstack/keystone/{credentials.py => _credentials.py} (100%)
 rename tobiko/openstack/keystone/{session.py => _session.py} (97%)

diff --git a/tobiko/openstack/keystone/__init__.py b/tobiko/openstack/keystone/__init__.py
index 387717012..8c70ac86f 100644
--- a/tobiko/openstack/keystone/__init__.py
+++ b/tobiko/openstack/keystone/__init__.py
@@ -13,14 +13,14 @@
 #    under the License.
 from __future__ import absolute_import
 
-from tobiko.openstack.keystone import credentials
-from tobiko.openstack.keystone import session
+from tobiko.openstack.keystone import _credentials
+from tobiko.openstack.keystone import _session
 
-keystone_credentials = credentials.keystone_credentials
-default_keystone_credentials = credentials.default_keystone_credentials
-KeystoneCredentials = credentials.KeystoneCredentials
-InvalidKeystoneCredentials = credentials.InvalidKeystoneCredentials
+keystone_credentials = _credentials.keystone_credentials
+default_keystone_credentials = _credentials.default_keystone_credentials
+KeystoneCredentials = _credentials.KeystoneCredentials
+InvalidKeystoneCredentials = _credentials.InvalidKeystoneCredentials
 
-KeystoneSessionFixture = session.KeystoneSessionFixture
-KeystoneSessionManager = session.KeystoneSessionManager
-get_keystone_session = session.get_keystone_session
+KeystoneSessionFixture = _session.KeystoneSessionFixture
+KeystoneSessionManager = _session.KeystoneSessionManager
+get_keystone_session = _session.get_keystone_session
diff --git a/tobiko/openstack/keystone/credentials.py b/tobiko/openstack/keystone/_credentials.py
similarity index 100%
rename from tobiko/openstack/keystone/credentials.py
rename to tobiko/openstack/keystone/_credentials.py
diff --git a/tobiko/openstack/keystone/session.py b/tobiko/openstack/keystone/_session.py
similarity index 97%
rename from tobiko/openstack/keystone/session.py
rename to tobiko/openstack/keystone/_session.py
index ea956938c..8f9bbc9ae 100644
--- a/tobiko/openstack/keystone/session.py
+++ b/tobiko/openstack/keystone/_session.py
@@ -18,7 +18,7 @@ from keystoneauth1 import session as _session
 from oslo_log import log
 
 import tobiko
-from tobiko.openstack.keystone import credentials as _credentials
+from tobiko.openstack.keystone import _credentials
 
 
 LOG = log.getLogger(__name__)
diff --git a/tobiko/tests/openstack/keystone/test_credentials.py b/tobiko/tests/openstack/keystone/test_credentials.py
index 0d671c326..265539121 100644
--- a/tobiko/tests/openstack/keystone/test_credentials.py
+++ b/tobiko/tests/openstack/keystone/test_credentials.py
@@ -17,7 +17,7 @@ from __future__ import absolute_import
 import tobiko
 from tobiko import config
 from tobiko.openstack import keystone
-from tobiko.openstack.keystone import credentials as _credentials
+from tobiko.openstack.keystone import _credentials
 from tobiko.tests.openstack import base
 
 V2_PARAMS = {
diff --git a/tobiko/tests/openstack/keystone/test_session.py b/tobiko/tests/openstack/keystone/test_session.py
index 2293c329f..7155a99fc 100644
--- a/tobiko/tests/openstack/keystone/test_session.py
+++ b/tobiko/tests/openstack/keystone/test_session.py
@@ -77,7 +77,7 @@ class KeystoneSessionFixtureTest(CheckSessionCredentialsMixin,
                                  base.OpenstackTest):
 
     default_credentials_fixture = (
-        'tobiko.openstack.keystone.credentials.'
+        'tobiko.openstack.keystone._credentials.'
         'DefaultKeystoneCredentialsFixture')
 
     def setUp(self):