ea89a2a08c
Six is in use to help us to keep support for python 2.7. Since the ussuri cycle we decide to remove the python 2.7 support so we can go ahead and also remove six usage from the python code. Review process and help ----------------------- Removing six introduce a lot of changes and an huge amount of modified files To simplify reviews we decided to split changes into several patches to avoid painful reviews and avoid mistakes. To review this patch you can use the six documentation [1] to obtain help and understand choices. Additional informations ----------------------- Changes related to 'six.b(data)' [2] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ six.b [2] encode the given datas in latin-1 in python3 so I did the same things in this patch. Latin-1 is equal to iso-8859-1 [3]. This encoding is the default encoding [4] of certain descriptive HTTP headers. I suggest to keep latin-1 for the moment and to move to another encoding in a follow-up patch if needed to move to most powerful encoding (utf8). HTML4 support utf8 charset and utf8 is the default charset for HTML5 [5]. Note that this commit message is autogenerated and not necesserly contains changes related to 'six.b' [1] https://six.readthedocs.io/ [2] https://six.readthedocs.io/#six.b [3] https://docs.python.org/3/library/codecs.html#standard-encodings [4] https://www.w3schools.com/charsets/ref_html_8859.asp [5] https://www.w3schools.com/html/html_charset.asp Patch 25 of a serie of 28 patches Change-Id: I62f75179047c901c545bdd3efba80e4a8088bb5e
96 lines
4.0 KiB
Python
96 lines
4.0 KiB
Python
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import json
|
|
from keystoneauth1 import loading as ks_loading
|
|
from keystoneauth1 import session
|
|
import mock
|
|
|
|
from heat.common import auth_plugin
|
|
from heat.common import config
|
|
from heat.common import exception
|
|
from heat.common import policy
|
|
from heat.tests import common
|
|
|
|
|
|
class TestAuthPlugin(common.HeatTestCase):
|
|
|
|
def setUp(self):
|
|
self.credential = (
|
|
'{"auth_type": "v3applicationcredential", '
|
|
'"auth": {"auth_url": "http://192.168.1.101/identity/v3", '
|
|
'"application_credential_id": '
|
|
'"9dfa187e5a354484bf9c49a2b674333a", '
|
|
'"application_credential_secret": "sec"} }')
|
|
self.m_plugin = mock.Mock()
|
|
self.m_loader = self.patchobject(
|
|
ks_loading, 'get_plugin_loader', return_value=self.m_plugin)
|
|
self.patchobject(policy.Enforcer, 'check_is_admin')
|
|
self.secret_id = '0eca0615-c330-41aa-b0cb-a2493a770409'
|
|
self.session = session.Session(
|
|
**config.get_ssl_options('keystone'))
|
|
super(TestAuthPlugin, self).setUp()
|
|
|
|
def _get_keystone_plugin_loader(self):
|
|
auth_plugin.get_keystone_plugin_loader(self.credential, self.session)
|
|
|
|
self.m_plugin.load_from_options.assert_called_once_with(
|
|
application_credential_id='9dfa187e5a354484bf9c49a2b674333a',
|
|
application_credential_secret='sec',
|
|
auth_url='http://192.168.1.101/identity/v3')
|
|
self.m_loader.assert_called_once_with('v3applicationcredential')
|
|
|
|
def test_get_keystone_plugin_loader(self):
|
|
self._get_keystone_plugin_loader()
|
|
# called in validate_auth_plugin
|
|
self.assertEqual(
|
|
1, self.m_plugin.load_from_options().get_token.call_count)
|
|
|
|
def test_get_keystone_plugin_loader_with_no_AuthZ(self):
|
|
self.m_plugin.load_from_options().get_token.side_effect = Exception
|
|
self.assertRaises(
|
|
exception.AuthorizationFailure, self._get_keystone_plugin_loader)
|
|
self.assertEqual(
|
|
1, self.m_plugin.load_from_options().get_token.call_count)
|
|
|
|
def test_parse_auth_credential_to_dict(self):
|
|
cred_dict = json.loads(self.credential)
|
|
self.assertEqual(
|
|
cred_dict, auth_plugin.parse_auth_credential_to_dict(
|
|
self.credential))
|
|
|
|
def test_parse_auth_credential_to_dict_with_value_error(self):
|
|
credential = (
|
|
'{"auth": {"auth_url": "http://192.168.1.101/identity/v3", '
|
|
'"application_credential_id": '
|
|
'"9dfa187e5a354484bf9c49a2b674333a", '
|
|
'"application_credential_secret": "sec"} }')
|
|
error = self.assertRaises(
|
|
ValueError, auth_plugin.parse_auth_credential_to_dict, credential)
|
|
self.assertEqual("Missing key in auth information, the correct "
|
|
"format contains [\'auth_type\', \'auth\'].",
|
|
str(error))
|
|
|
|
def test_parse_auth_credential_to_dict_with_json_error(self):
|
|
credential = (
|
|
"{'auth_type': v3applicationcredential, "
|
|
"'auth': {'auth_url': 'http://192.168.1.101/identity/v3', "
|
|
"'application_credential_id': "
|
|
"'9dfa187e5a354484bf9c49a2b674333a', "
|
|
"'application_credential_secret': 'sec'} }")
|
|
error = self.assertRaises(
|
|
ValueError, auth_plugin.parse_auth_credential_to_dict, credential)
|
|
error_msg = ('Failed to parse credential, please check your Stack '
|
|
'Credential format.')
|
|
self.assertEqual(error_msg, str(error))
|