Skip to content

Commit

Permalink
Merge "Remove 'propagate_exc' parameter in _get_vrouter_config()"
Browse files Browse the repository at this point in the history
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed Mar 25, 2016
2 parents 074ac67 + 03c081f commit 3f58110
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 19 deletions.
27 changes: 10 additions & 17 deletions neutron_plugin_contrail/plugins/opencontrail/contrail_plugin.py
View file
Expand Up @@ -227,20 +227,17 @@ def _prune(self, resource_dict, fields):
return resource_dict

def _transform_response(self, status_code, info=None, obj_name=None,
fields=None, propagate_exc=False):
fields=None):
if status_code == requests.codes.ok:
if not isinstance(info, list):
return self._prune(info, fields)
else:
return [self._prune(items, fields) for items in info]

if propagate_exc:
raise HttpResponseError(info)

plugin_base._raise_contrail_error(info, obj_name)


def _create_resource(self, res_type, context, res_data, propagate_exc=False):
def _create_resource(self, res_type, context, res_data):
"""Create a resource in API server.
This method encodes neutron model, and sends it to the
Expand All @@ -255,14 +252,13 @@ def _create_resource(self, res_type, context, res_data, propagate_exc=False):
status_code, res_info = self._request_backend(context, res_dict,
res_type, 'CREATE')
res_dicts = self._transform_response(status_code, info=res_info,
obj_name=res_type,
propagate_exc=propagate_exc)
obj_name=res_type)
LOG.debug("create_%(res_type)s(): %(res_dicts)s",
{'res_type': res_type, 'res_dicts': res_dicts})

return res_dicts

def _get_resource(self, res_type, context, id, fields, propagate_exc=False):
def _get_resource(self, res_type, context, id, fields):
"""Get a resource from API server.
This method gets a resource from the contrail api server
Expand All @@ -272,14 +268,13 @@ def _get_resource(self, res_type, context, id, fields, propagate_exc=False):
status_code, res_info = self._request_backend(context, res_dict,
res_type, 'READ')
res_dicts = self._transform_response(status_code, info=res_info,
fields=fields, obj_name=res_type,
propagate_exc=propagate_exc)
fields=fields, obj_name=res_type)
LOG.debug("get_%(res_type)s(): %(res_dicts)s",
{'res_type': res_type, 'res_dicts': res_dicts})

return res_dicts

def _update_resource(self, res_type, context, id, res_data, propagate_exc=False):
def _update_resource(self, res_type, context, id, res_data):
"""Update a resource in API server.
This method updates a resource in the contrail api server
Expand All @@ -290,14 +285,13 @@ def _update_resource(self, res_type, context, id, res_data, propagate_exc=False)
status_code, res_info = self._request_backend(context, res_dict,
res_type, 'UPDATE')
res_dicts = self._transform_response(status_code, info=res_info,
obj_name=res_type,
propagate_exc=propagate_exc)
obj_name=res_type)
LOG.debug("update_%(res_type)s(): %(res_dicts)s",
{'res_type': res_type, 'res_dicts': res_dicts})

return res_dicts

def _delete_resource(self, res_type, context, id, propagate_exc=False):
def _delete_resource(self, res_type, context, id):
"""Delete a resource in API server
This method deletes a resource in the contrail api server
Expand All @@ -312,13 +306,12 @@ def _delete_resource(self, res_type, context, id, propagate_exc=False):
plugin_base._raise_contrail_error(info=res_info,
obj_name=res_type)

def _list_resource(self, res_type, context, filters, fields, propagate_exc=False):
def _list_resource(self, res_type, context, filters, fields):
res_dict = self._encode_resource(filters=filters, fields=fields)
status_code, res_info = self._request_backend(context, res_dict,
res_type, 'READALL')
res_dicts = self._transform_response(status_code, info=res_info,
fields=fields, obj_name=res_type,
propagate_exc=propagate_exc)
fields=fields, obj_name=res_type)
LOG.debug(
"get_%(res_type)s(): filters: %(filters)r data: %(res_dicts)r",
{'res_type': res_type, 'filters': filters,
Expand Down
7 changes: 5 additions & 2 deletions neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py
View file
Expand Up @@ -88,6 +88,8 @@ def _raise_contrail_error(info, obj_name):
if exc_name:
if exc_name == 'BadRequest' and 'resource' not in info:
info['resource'] = obj_name
if exc_name == 'VirtualRouterNotFound':
raise HttpResponseError(info)
if hasattr(exc, exc_name):
raise getattr(exc, exc_name)(**info)
if hasattr(l3, exc_name):
Expand Down Expand Up @@ -360,8 +362,7 @@ def _update_ips_for_port(self, context, network_id, port_id, original_ips,
return new_ips, prev_ips

def _get_vrouter_config(self, context, id, fields=None):
return self._get_resource('virtual_router', context, id, fields,
propagate_exc=True)
return self._get_resource('virtual_router', context, id, fields)

def _list_vrouters(self, context, filters=None, fields=None):
return self._list_resource('virtual_router', context, filters, fields)
Expand Down Expand Up @@ -439,6 +440,8 @@ def _is_dpdk_enabled(self, context, port):
except HttpResponseError as e:
if e.response_info['exception'] == 'VirtualRouterNotFound':
return False
else:
raise e

return vrouter['dpdk_enabled']

Expand Down

0 comments on commit 3f58110

Please sign in to comment.