x/vmware-nsx
Code Issues Proposed changes

Merge "Improve ODL ML2 Exception Handling"

Browse Source
This commit is contained in:
Jenkins 2014-05-14 21:17:44 +00:00 committed by Gerrit Code Review
commit 6e1dccdb52
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
neutron/plugins/ml2/drivers/mechanism_odl.py
View File

@ -68,6 +68,10 @@ def try_del(d, keys):
pass
class OpendaylightAuthError(n_exc.NeutronException):
message = '%(msg)s'
class JsessionId(requests.auth.AuthBase):
"""Attaches the JSESSIONID and JSESSIONIDSSO cookies to an HTTP Request.
@ -95,8 +99,16 @@ class JsessionId(requests.auth.AuthBase):
def obtain_auth_cookies(self):
"""Make a REST call to obtain cookies for ODL authenticiation."""
r = requests.get(self.url, auth=(self.username, self.password))
r.raise_for_status()
try:
r = requests.get(self.url, auth=(self.username, self.password))
r.raise_for_status()
except requests.exceptions.HTTPError as e:
raise OpendaylightAuthError(msg=_("Failed to authenticate with "
"OpenDaylight: %s") % e)
except requests.exceptions.Timeout as e:
raise OpendaylightAuthError(msg=_("Authentication Timed"
" Out: %s") % e)
jsessionid = r.cookies.get('JSESSIONID')
jsessionidsso = r.cookies.get('JSESSIONIDSSO')
if jsessionid and jsessionidsso:
@ -203,9 +215,11 @@ class OpenDaylightMechanismDriver(api.MechanismDriver):
urlpath = collection_name + '/' + resource['id']
self.sendjson('get', urlpath, None)
except requests.exceptions.HTTPError as e:
if e.response.status_code == 404:
attr_filter(resource, context, dbcontext)
to_be_synced.append(resource)
with excutils.save_and_reraise_exception() as ctx:
if e.response.status_code == 404:
attr_filter(resource, context, dbcontext)
to_be_synced.append(resource)
ctx.reraise = False
key = resource_name if len(to_be_synced) == 1 else collection_name