x/quark
Code Issues Proposed changes

Removed redundant call to deallocate the floating IP address

Browse Source
This commit is contained in:
Alan Quillin
2016-03-11 19:26:12 -05:00
parent f6d9fcf20d
commit 7f371999dc
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
quark/plugin_modules/floating_ips.py
View File

@@ -271,11 +271,8 @@ def delete_floatingip(context, id):
if flip.fixed_ip: if flip.fixed_ip:
flip = db_api.floating_ip_disassociate_fixed_ip(context, flip) flip = db_api.floating_ip_disassociate_fixed_ip(context, flip)
db_api.ip_address_deallocate(context, flip) driver = registry.DRIVER_REGISTRY.get_driver()
driver.remove_floating_ip(flip)
if flip.fixed_ip:
driver = registry.DRIVER_REGISTRY.get_driver()
driver.remove_floating_ip(flip)
context.session.commit() context.session.commit()
except Exception: except Exception:
context.session.rollback() context.session.rollback()