openstack/python-ironicclient
Code Issues Proposed changes

Merge "Allow to use none auth in functional tests"

Browse Source
This commit is contained in:
Zuul
2018-06-18 23:41:29 +00:00
committed by Gerrit Code Review
parent 9c9c62e51b 40a87d534f
commit a49938dad2
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ironicclient/tests/functional/base.py
View File

@@ -52,10 +52,8 @@ class FunctionalTestBase(base.ClientTestBase):
setattr(self, domain_attr, config[domain_attr]) setattr(self, domain_attr, config[domain_attr])
else: else:
self.ironic_url = config['ironic_url'] self.ironic_url = config['ironic_url']
self.os_auth_token = config['os_auth_token']
client = base.CLIClient(cli_dir=cli_dir, client = base.CLIClient(cli_dir=cli_dir,
ironic_url=self.ironic_url, ironic_url=self.ironic_url)
os_auth_token=self.os_auth_token)
return client return client
def _get_config(self): def _get_config(self):
@@ -86,7 +84,7 @@ class FunctionalTestBase(base.ClientTestBase):
'os_project_domain_id', 'os_project_domain_id',
'os_identity_api_version'] 'os_identity_api_version']
else: else:
conf_settings += ['os_auth_token', 'ironic_url'] conf_settings += ['ironic_url']
cli_flags = {} cli_flags = {}
missing = [] missing = []
@@ -119,10 +117,9 @@ class FunctionalTestBase(base.ClientTestBase):
:param params: optional positional args to use :param params: optional positional args to use
:type params: string :type params: string
""" """
flags = ('--os_auth_token %(token)s --ironic_url %(url)s %(flags)s' flags = ('--os-endpoint %(url)s %(flags)s'
% %
{'token': self.os_auth_token, {'url': self.ironic_url,
'url': self.ironic_url,
'flags': flags}) 'flags': flags})
return base.execute(cmd, action, flags, params, return base.execute(cmd, action, flags, params,
cli_dir=self.client.cli_dir) cli_dir=self.client.cli_dir)
@@ -144,12 +141,15 @@ class FunctionalTestBase(base.ClientTestBase):
""" """
if cmd == 'openstack': if cmd == 'openstack':
config = self._get_config() config = self._get_config()
id_api_version = config['os_identity_api_version'] id_api_version = config.get('os_identity_api_version')
flags += ' --os-identity-api-version {0}'.format(id_api_version) if id_api_version:
flags += ' --os-identity-api-version {}'.format(id_api_version)
else: else:
flags += ' --os-endpoint-type publicURL' flags += ' --os-endpoint-type publicURL'
if hasattr(self, 'os_auth_token'): if hasattr(self, 'ironic_url'):
if cmd == 'openstack':
flags += ' --os-auth-type none'
return self._cmd_no_auth(cmd, action, flags, params) return self._cmd_no_auth(cmd, action, flags, params)
else: else:
for keystone_object in 'user', 'project': for keystone_object in 'user', 'project':

3
tools/run_functional.sh
View File

@@ -3,12 +3,11 @@
FUNC_TEST_DIR=$(dirname $0)/../ironicclient/tests/functional/ FUNC_TEST_DIR=$(dirname $0)/../ironicclient/tests/functional/
CONFIG_FILE=$FUNC_TEST_DIR/test.conf CONFIG_FILE=$FUNC_TEST_DIR/test.conf
if [[ -n "$OS_AUTH_TOKEN" ]] && [[ -n "$IRONIC_URL" ]]; then if [[ -n "$IRONIC_URL" ]]; then
cat <<END >$CONFIG_FILE cat <<END >$CONFIG_FILE
[functional] [functional]
api_version = 1 api_version = 1
auth_strategy=noauth auth_strategy=noauth
os_auth_token=$OS_AUTH_TOKEN
ironic_url=$IRONIC_URL ironic_url=$IRONIC_URL
END END
else else