openstack/neutron
Code Issues Proposed changes

Merge "fix generation of exception for mismatched floating ip tenant-ids"

Browse Source
This commit is contained in:
Jenkins 2012-09-09 07:09:16 +00:00 committed by Gerrit Code Review
commit 32d0f9c717
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
quantum/db/l3_db.py
View File

@ -434,10 +434,17 @@ class L3_NAT_db_mixin(l3.RouterPluginBase):
"""
internal_port = self._get_port(context, fip['port_id'])
if not internal_port['tenant_id'] == fip['tenant_id']:
msg = ('Port %s is associated with a different tenant'
'and therefore cannot be found to floating IP %s'
% (fip['port_id'], fip['id']))
raise q_exc.BadRequest(resource='floating', msg=msg)
port_id = fip['port_id']
if 'id' in fip:
floatingip_id = fip['id']
msg = _('Port %(port_id)s is associated with a different '
'tenant than Floating IP %(floatingip_id)s and '
'therefore cannot be bound.')
else:
msg = _('Cannnot create floating IP and bind it to '
'Port %(port_id)s, since that port is owned by a '
'different tenant.')
raise q_exc.BadRequest(resource='floatingip', msg=msg % locals())
internal_subnet_id = None
if 'fixed_ip_address' in fip and fip['fixed_ip_address']: