openstack/python-neutronclient
Code Issues Proposed changes

Merge "Make USER_AGENT variable global"

Browse Source
This commit is contained in:
Jenkins
2016-07-14 22:39:06 +00:00
committed by Gerrit Code Review
parent b44ad42a0b 0cbd30b375
commit 20047f2ad0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
neutronclient/client.py
View File

@@ -42,12 +42,12 @@ else:
logging.getLogger("requests").setLevel(_requests_log_level) logging.getLogger("requests").setLevel(_requests_log_level)
MAX_URI_LEN = 8192 MAX_URI_LEN = 8192
USER_AGENT = 'python-neutronclient'
class HTTPClient(object): class HTTPClient(object):
"""Handles the REST calls and responses, include authn.""" """Handles the REST calls and responses, include authn."""
USER_AGENT = 'python-neutronclient'
CONTENT_TYPE = 'application/json' CONTENT_TYPE = 'application/json'
@debtcollector.renames.renamed_kwarg( @debtcollector.renames.renamed_kwarg(
@@ -88,7 +88,7 @@ class HTTPClient(object):
def _cs_request(self, *args, **kwargs): def _cs_request(self, *args, **kwargs):
kargs = {} kargs = {}
kargs.setdefault('headers', kwargs.get('headers', {})) kargs.setdefault('headers', kwargs.get('headers', {}))
kargs['headers']['User-Agent'] = self.USER_AGENT kargs['headers']['User-Agent'] = USER_AGENT
if 'body' in kwargs: if 'body' in kwargs:
kargs['body'] = kwargs['body'] kargs['body'] = kwargs['body']
@@ -139,7 +139,7 @@ class HTTPClient(object):
if body: if body:
headers.setdefault('Content-Type', content_type) headers.setdefault('Content-Type', content_type)
headers['User-Agent'] = self.USER_AGENT headers['User-Agent'] = USER_AGENT
resp = requests.request( resp = requests.request(
method, method,
@@ -372,7 +372,7 @@ def construct_http_client(username=None,
**kwargs): **kwargs):
if session: if session:
kwargs.setdefault('user_agent', 'python-neutronclient') kwargs.setdefault('user_agent', USER_AGENT)
kwargs.setdefault('interface', endpoint_type) kwargs.setdefault('interface', endpoint_type)
return SessionClient(session=session, return SessionClient(session=session,
service_type=service_type, service_type=service_type,