openstack/python-zunclient
Code Issues Proposed changes

Modify ca certificate parameter in the client

Browse Source 
Change-Id: I2965e3a8f4560e78f14f32f7bfc86ad288da5751
Closes-Bug: #1784972
This commit is contained in:
Xianghui Zeng 2018-08-02 10:17:32 +08:00
parent 520ad0b4ff
commit a1c64d9fa2
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zunclient/shell.py
View File

@ -541,12 +541,13 @@ class OpenStackZunShell(object):
os_user_domain_id, os_user_domain_name, os_user_domain_id, os_user_domain_name,
os_project_domain_id, os_project_domain_name, os_project_domain_id, os_project_domain_name,
os_auth_url, os_auth_system, endpoint_type, os_auth_url, os_auth_system, endpoint_type,
service_type, bypass_url, insecure) = ( service_type, bypass_url, insecure, os_cacert) = (
(args.os_username, args.os_project_name, args.os_project_id, (args.os_username, args.os_project_name, args.os_project_id,
args.os_user_domain_id, args.os_user_domain_name, args.os_user_domain_id, args.os_user_domain_name,
args.os_project_domain_id, args.os_project_domain_name, args.os_project_domain_id, args.os_project_domain_name,
args.os_auth_url, args.os_auth_system, args.endpoint_type, args.os_auth_url, args.os_auth_system, args.endpoint_type,
args.service_type, args.bypass_url, args.insecure) args.service_type, args.bypass_url, args.insecure,
args.os_cacert)
) )
if os_auth_system and os_auth_system != "keystone": if os_auth_system and os_auth_system != "keystone":
@ -643,6 +644,7 @@ class OpenStackZunShell(object):
endpoint_override=bypass_url, endpoint_override=bypass_url,
interface=endpoint_type, interface=endpoint_type,
insecure=insecure, insecure=insecure,
cacert=os_cacert,
**kwargs) **kwargs)
args.func(self.cs, args) args.func(self.cs, args)

7
zunclient/tests/unit/test_shell.py
View File

@ -245,7 +245,7 @@ class ShellTest(utils.TestCase):
service_type='container', region_name=expected_region_name, service_type='container', region_name=expected_region_name,
project_domain_id='', project_domain_name='', project_domain_id='', project_domain_name='',
user_domain_id='', user_domain_name='', profile=None, user_domain_id='', user_domain_name='', profile=None,
endpoint_override=None, insecure=False, endpoint_override=None, insecure=False, cacert=None,
version=api_versions.APIVersion('1.20')) version=api_versions.APIVersion('1.20'))
def test_main_option_region(self): def test_main_option_region(self):
@ -273,7 +273,7 @@ class ShellTest(utils.TestCase):
service_type='container', region_name=None, service_type='container', region_name=None,
project_domain_id='', project_domain_name='', project_domain_id='', project_domain_name='',
user_domain_id='', user_domain_name='', profile=None, user_domain_id='', user_domain_name='', profile=None,
endpoint_override=None, insecure=False, endpoint_override=None, insecure=False, cacert=None,
version=api_versions.APIVersion('1.20')) version=api_versions.APIVersion('1.20'))
@mock.patch('zunclient.client.Client') @mock.patch('zunclient.client.Client')
@ -287,7 +287,7 @@ class ShellTest(utils.TestCase):
service_type='container', region_name=None, service_type='container', region_name=None,
project_domain_id='', project_domain_name='', project_domain_id='', project_domain_name='',
user_domain_id='', user_domain_name='', profile=None, user_domain_id='', user_domain_name='', profile=None,
endpoint_override=None, insecure=False, endpoint_override=None, insecure=False, cacert=None,
version=api_versions.APIVersion('1.20')) version=api_versions.APIVersion('1.20'))
@ -319,4 +319,5 @@ class ShellTestKeystoneV3(ShellTest):
project_domain_id='', project_domain_name='Default', project_domain_id='', project_domain_name='Default',
user_domain_id='', user_domain_name='Default', user_domain_id='', user_domain_name='Default',
endpoint_override=None, insecure=False, profile=None, endpoint_override=None, insecure=False, profile=None,
cacert=None,
version=api_versions.APIVersion('1.20')) version=api_versions.APIVersion('1.20'))

5
zunclient/v1/client.py
View File

@ -37,7 +37,7 @@ class Client(object):
project_id=None, project_name=None, region_name=None, project_id=None, project_name=None, region_name=None,
service_name=None, service_type='container', session=None, service_name=None, service_type='container', session=None,
user_domain_id=None, user_domain_name=None, user_domain_id=None, user_domain_name=None,
username=None, **kwargs): username=None, cacert=None, **kwargs):
"""Initialization of Client object. """Initialization of Client object.
:param api_version: Container API version :param api_version: Container API version
@ -60,6 +60,7 @@ class Client(object):
:param str user_domain_id: ID of user domain :param str user_domain_id: ID of user domain
:param str user_id: User ID :param str user_id: User ID
:param str username: Username :param str username: Username
:param str cacert: CA certificate
""" """
if endpoint_override and auth_token: if endpoint_override and auth_token:
auth_type = 'admin_token' auth_type = 'admin_token'
@ -99,7 +100,7 @@ class Client(object):
# This should be able to handle v2 and v3 Keystone Auth # This should be able to handle v2 and v3 Keystone Auth
auth_plugin = loader.load_from_options(**loader_kwargs) auth_plugin = loader.load_from_options(**loader_kwargs)
session = ksa_session.Session(auth=auth_plugin, session = ksa_session.Session(auth=auth_plugin,
verify=(not insecure)) verify=(cacert or not insecure))
client_kwargs = {} client_kwargs = {}
if not endpoint_override: if not endpoint_override:
try: try: