openstack/python-tackerclient
Code Issues Proposed changes

Merge "Do not have to mention ssl_ca_cert in vim config file (client)"

Browse Source
This commit is contained in:
Zuul
2018-03-01 02:13:41 +00:00
committed by Gerrit Code Review
parent 7a13c3ce96 17d108e146
commit 9b2027930b
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tackerclient/tacker/v1_0/nfvo/vim_utils.py
View File

@@ -74,16 +74,9 @@ def args2body_vim(config_param, vim):
message='username and password or bearer_token must be' message='username and password or bearer_token must be'
'provided', 'provided',
status_code=404) status_code=404)
if 'ssl_ca_cert' in config_param: ssl_ca_cert = config_param.pop('ssl_ca_cert', '')
ssl_ca_cert = config_param.pop('ssl_ca_cert', '') if ssl_ca_cert:
if ssl_ca_cert == 'None': vim['auth_cred']['ssl_ca_cert'] = ssl_ca_cert
vim['auth_cred']['ssl_ca_cert'] = None
else:
vim['auth_cred']['ssl_ca_cert'] = ssl_ca_cert
else:
raise exceptions.TackerClientException(
message='ssl_ca_cert must be provided or leave it with None',
status_code=404)
def validate_auth_url(url): def validate_auth_url(url):

2
tackerclient/tests/unit/vm/test_cli10_vim_k8s_with_bearer_token.py
View File

@@ -35,7 +35,7 @@ class CLITestV10VIMJSON(test_cli10.CLITestV10Base):
plurals = {'vims': 'vim'} plurals = {'vims': 'vim'}
super(CLITestV10VIMJSON, self).setUp(plurals=plurals) super(CLITestV10VIMJSON, self).setUp(plurals=plurals)
self.vim_project = {'name': 'default'} self.vim_project = {'name': 'default'}
self.auth_cred = {'bearer_token': 'xyz', 'ssl_ca_cert': None} self.auth_cred = {'bearer_token': 'xyz', 'ssl_ca_cert': "None"}
self.auth_url = 'https://1.2.3.4:6443' self.auth_url = 'https://1.2.3.4:6443'
self.type = 'kubernetes' self.type = 'kubernetes'

2
tackerclient/tests/unit/vm/test_vim_utils.py
View File

@@ -63,7 +63,7 @@ class TestVIMUtils(testtools.TestCase):
def test_args2body_kubernetes_vim_bearer(self): def test_args2body_kubernetes_vim_bearer(self):
config_param = {'bearer_token': sentinel.bearer_token, config_param = {'bearer_token': sentinel.bearer_token,
'ssl_ca_cert': None, 'ssl_ca_cert': "None",
'project_name': sentinel.prj_name, 'project_name': sentinel.prj_name,
'type': 'kubernetes'} 'type': 'kubernetes'}
vim = {} vim = {}