x/vmware-nsx
Code Issues Proposed changes

Merge "Raising proper error in case of router-interface addition"

Browse Source
This commit is contained in:
Jenkins 2016-10-23 09:05:33 +00:00 committed by Gerrit Code Review
commit db4ba11c4f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -2585,14 +2585,13 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
"to router %(router_id)s") % { "to router %(router_id)s") % {
'net_id': net_id, 'net_id': net_id,
'router_id': router_ids[0]} 'router_id': router_ids[0]}
LOG.error(err_msg)
if router_id in router_ids: if router_id in router_ids:
LOG.error(err_msg)
# attach to the same router again # attach to the same router again
raise n_exc.InvalidInput(error_message=err_msg) raise n_exc.InvalidInput(error_message=err_msg)
else: else:
LOG.error(err_msg)
# attach to multiple routers # attach to multiple routers
raise n_exc.Conflict(error_message=err_msg) raise l3.RouterInterfaceAttachmentConflict(reason=err_msg)
def _add_router_interface_wrapper(self, context, router_id, def _add_router_interface_wrapper(self, context, router_id,
interface_info): interface_info):