openstack/deb-designate
Code Issues Proposed changes

Merge "Add proxy support to dynect client"

Browse Source
This commit is contained in:
Jenkins 2014-08-01 01:32:16 +00:00 committed by Gerrit Code Review
commit 7a1435c7e0
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
designate/backend/impl_dynect.py
View File

@ -22,6 +22,7 @@ import requests
from requests.adapters import HTTPAdapter from requests.adapters import HTTPAdapter
from designate import exceptions from designate import exceptions
from designate import utils
from designate.backend import base from designate.backend import base
from designate.openstack.common import log as logging from designate.openstack.common import log as logging
from designate.i18n import _LI from designate.i18n import _LI
@ -201,6 +202,8 @@ class DynClient(object):
url = self.endpoint + url url = self.endpoint + url
kwargs.setdefault("headers", kwargs.get("headers", {})) kwargs.setdefault("headers", kwargs.get("headers", {}))
kwargs['proxies'] = utils.get_proxies()
if self.token is not None: if self.token is not None:
kwargs['headers']['Auth-Token'] = self.token kwargs['headers']['Auth-Token'] = self.token
if self.timeout is not None: if self.timeout is not None:

37
designate/utils.py
View File

@ -39,6 +39,24 @@ cfg.CONF.register_opts([
]) ])
# Set some proxy options (Used for clients that need to communicate via a
# proxy)
cfg.CONF.register_group(cfg.OptGroup(
name='proxy', title="Configuration for Client Proxy"
))
proxy_opts = [
cfg.StrOpt('http_proxy', default=None,
help='Proxy HTTP requests via this proxy.'),
cfg.StrOpt('https_proxy', default=None,
help='Proxy HTTPS requests via this proxy'),
cfg.ListOpt('no_proxy', default=[],
help='These addresses should not be proxied')
]
cfg.CONF.register_opts(proxy_opts, group='proxy')
def find_config(config_path): def find_config(config_path):
""" """
Find a configuration file using the given hint. Find a configuration file using the given hint.
@ -293,3 +311,22 @@ def validate_uuid(*check):
return f(*args, **kwargs) return f(*args, **kwargs)
return functools.wraps(f)(wrapper) return functools.wraps(f)(wrapper)
return inner return inner
def get_proxies():
"""Return a requests compatible dict like seen here
http://docs.python-requests.org/en/latest/user/advanced/#proxies for
consumption in clients when we need to proxy requests.
"""
proxies = {}
if cfg.CONF.proxy.no_proxy:
proxies['no_proxy'] = cfg.CONF.proxy.no_proxy
if cfg.CONF.proxy.http_proxy is not None:
proxies['http'] = cfg.CONF.proxy.http_proxy
if cfg.CONF.proxy.https_proxy is not None:
proxies['https'] = cfg.CONF.proxy.https_proxy
elif 'http' in proxies:
proxies['https'] = proxies['http']
return proxies