Drop pki token check from Token class in openstack_auth

PKI Tokens got removed from Keystone in 2016[1] so this check is no
longer needed.

OPENSTACK_TOKEN_HASH_ALGORITHM setting is dropped
as it is used only in PKI token check.

[1] https://review.openstack.org/#/c/374479/

Change-Id: I2de02fe6fab531842752b03c5e17af2bcf502cd8

2 files changed, 2 insertions, 24 deletions

diff --git a/openstack_auth/tests/data_v3.py b/openstack_auth/tests/data_v3.py
index 366b9d8f6..81429efbf 100644
--- a/openstack_auth/tests/data_v3.py
+++ b/openstack_auth/tests/data_v3.py
@@ -17,7 +17,6 @@ import uuid
 from django.utils import datetime_safe
 from keystoneauth1.access import access
 from keystoneauth1.access import service_catalog
-from keystoneclient.common import cms
 from keystoneclient.v3 import domains
 from keystoneclient.v3 import projects
 from keystoneclient.v3 import roles
@@ -55,8 +54,7 @@ class TestResponse(requests.Response):
         return self._text
 
 
-def generate_test_data(pki=False, service_providers=False,
-                       endpoint='localhost'):
+def generate_test_data(service_providers=False, endpoint='localhost'):
     '''Builds a set of test_data data as returned by Keystone V2.'''
     test_data = TestDataContainer()
 
@@ -179,12 +177,7 @@ def generate_test_data(pki=False, service_providers=False,
     # Tokens
     tomorrow = datetime_safe.datetime.now() + datetime.timedelta(days=1)
     expiration = datetime_safe.datetime.isoformat(tomorrow)
-    if pki:
-        # We don't need a real PKI token, but just the prefix to make the
-        # keystone client treat it as a PKI token
-        auth_token = cms.PKI_ASN1_PREFIX + uuid.uuid4().hex
-    else:
-        auth_token = uuid.uuid4().hex
+    auth_token = uuid.uuid4().hex
 
     auth_response_headers = {
         'X-Subject-Token': auth_token
diff --git a/openstack_auth/tests/unit/test_user.py b/openstack_auth/tests/unit/test_user.py
index d088fe589..9ad14ea5a 100644
--- a/openstack_auth/tests/unit/test_user.py
+++ b/openstack_auth/tests/unit/test_user.py
@@ -14,7 +14,6 @@
 from django import test
 import mock
 
-from openstack_auth.tests import data_v3
 from openstack_auth import user
 
 
@@ -37,17 +36,3 @@ class PermTestCase(test.TestCase):
             # perm1 AND (perm2 OR perm3)
             perm_list = ['perm1', ('perm2', 'perm3')]
             self.assertTrue(testuser.has_perms(perm_list))
-
-
-class UserTestCase(test.TestCase):
-
-    def setUp(self):
-        super(UserTestCase, self).setUp()
-        self.data = data_v3.generate_test_data(pki=True)
-
-    def test_unscoped_token_is_none(self):
-        created_token = user.Token(self.data.domain_scoped_access_info,
-                                   unscoped_token=None)
-        self.assertTrue(created_token._is_pki_token(
-                        self.data.domain_scoped_access_info.auth_token))
-        self.assertFalse(created_token._is_pki_token(None))