x/python-k8sclient
Code Issues Proposed changes

Merge "Change ca to ca-cert for consistency in k8sclient"

Browse Source
This commit is contained in:
Jenkins
2015-07-28 07:49:29 +00:00
committed by Gerrit Code Review
parent d3f2ba77e3 71cf0cd4a6
commit 19071a9070
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
magnum/common/pythonk8sclient/client/ApivbetaApi.py
View File

@@ -2364,7 +2364,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -2407,7 +2407,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -2439,7 +2439,7 @@ class ApivbetaApi(object):
Returns: V1beta3_Pod Returns: V1beta3_Pod
""" """
allParams = ['name', 'namespaces', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -2485,7 +2485,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -2520,7 +2520,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['name', 'namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -2569,7 +2569,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -2604,7 +2604,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['name', 'namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -2653,7 +2653,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -2687,7 +2687,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['name', 'namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -2736,7 +2736,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -3001,7 +3001,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -3044,7 +3044,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -3076,7 +3076,7 @@ class ApivbetaApi(object):
Returns: V1beta3_ReplicationController Returns: V1beta3_ReplicationController
""" """
allParams = ['name', 'namespaces', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -3122,7 +3122,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -3157,7 +3157,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['name', 'namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -3206,7 +3206,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -3241,7 +3241,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['name', 'namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -3290,7 +3290,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -3324,7 +3324,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['name', 'namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -3373,7 +3373,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -4456,7 +4456,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -4499,7 +4499,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -4531,7 +4531,7 @@ class ApivbetaApi(object):
Returns: V1beta3_Service Returns: V1beta3_Service
""" """
allParams = ['name', 'namespaces', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -4577,7 +4577,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -4612,7 +4612,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['name', 'namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -4661,7 +4661,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -4693,7 +4693,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['name', 'namespaces', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -4739,7 +4739,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')
@@ -4773,7 +4773,7 @@ class ApivbetaApi(object):
Returns: Returns:
""" """
allParams = ['name', 'namespaces', 'body', 'ca', 'cert', 'key'] allParams = ['name', 'namespaces', 'body', 'ca_cert', 'cert', 'key']
params = locals() params = locals()
for (key, val) in params['kwargs'].iteritems(): for (key, val) in params['kwargs'].iteritems():
@@ -4822,7 +4822,7 @@ class ApivbetaApi(object):
postData = (formParams if formParams else bodyParam) postData = (formParams if formParams else bodyParam)
ca = params.get('ca') ca = params.get('ca_cert')
cert = params.get('cert') cert = params.get('cert')
key = params.get('key') key = params.get('key')

4
magnum/common/pythonk8sclient/client/swagger.py
View File

@@ -69,7 +69,7 @@ class ApiClient(object):
self.defaultHeaders[headerName] = headerValue self.defaultHeaders[headerName] = headerValue
def callAPI(self, resourcePath, method, queryParams, postData, def callAPI(self, resourcePath, method, queryParams, postData,
ca=None, cert=None, key=None, headerParams=None, files=None): ca_cert=None, cert=None, key=None, headerParams=None, files=None):
url = self.host + resourcePath url = self.host + resourcePath
@@ -116,7 +116,7 @@ class ApiClient(object):
utils.raise_exception_invalid_scheme(url) utils.raise_exception_invalid_scheme(url)
response = requests.request(method, url=url, headers=headers, data=data, response = requests.request(method, url=url, headers=headers, data=data,
cert=(cert, key), verify=ca) cert=(cert, key), verify=ca_cert)
if 'Set-Cookie' in response.headers: if 'Set-Cookie' in response.headers:
self.cookie = response.headers['Set-Cookie'] self.cookie = response.headers['Set-Cookie']
try: try: