openstack/nova
Code Issues Proposed changes

updated the mac_address delete function to actually delete the rows, and update fixed_ips

Browse Source
This commit is contained in:
Trey Morris
2011-05-16 15:41:26 -05:00
parent 826e3273c1
commit 07ba43fc30
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nova/db/sqlalchemy/api.py
View File

@@ -791,17 +791,8 @@ def mac_address_create(context, values):
mac_address_ref = models.MacAddress() mac_address_ref = models.MacAddress()
mac_address_ref.update(values) mac_address_ref.update(values)
mac_address_ref.save() mac_address_ref.save()
# instance_id = values['instance_id']
# network_id = values['network_id'] return mac_address_ref
#
# session = get_session()
# with session.begin():
# instance = instance_get(context, instance_id, session=session)
# network = network_get(context, network_id, session=session)
# mac_address.instance = instance
# mac_address.network = network
# mac_address_ref.save(session=session)
# return mac_address_ref
@require_context @require_context
@@ -912,10 +903,12 @@ def mac_address_delete(context, address):
context = request context object context = request context object
instance_id = instance to remove macs for instance_id = instance to remove macs for
""" """
ref = mac_address_get_by_address(address) mac_address = mac_address_get_by_address(address)
session = get_session() session = get_session()
with session.begin(): with session.begin():
ref.delete(session=session) for fixed_ip in mac_address['fixed_ips']:
fixed_ip.mac_address = None
session.delete(mac_address)
@require_context @require_context
@@ -927,10 +920,8 @@ def mac_address_delete_by_instance(context, instance_id):
instance_id = instance to remove macs for instance_id = instance to remove macs for
""" """
refs = mac_address_get_all_by_instance(instance_id) refs = mac_address_get_all_by_instance(instance_id)
session = get_session()
with session.begin():
for ref in refs: for ref in refs:
ref.delete(session=session) self.mac_address_delete(ref)
################### ###################