openstack
/
ironic-inspector
Code Issues Proposed changes

Merge "Properly order node deletion from cache"

This commit is contained in:
Jenkins 2015-11-11 14:33:45 +00:00 committed by Gerrit Code Review
parent 57f2225410 9c62b95ffa
commit 81c78cb10d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ironic_inspector/node_cache.py
View File

@ -340,14 +340,12 @@ def _delete_node(uuid, session=None):
"""Delete information about a node.
:param uuid: Ironic node UUID
:param session: optional existing database session
"""
with db.ensure_transaction(session) as session:
(db.model_query(db.Node, session=session).filter_by(uuid=uuid).
delete())
(db.model_query(db.Attribute, session=session).filter_by(uuid=uuid).
delete(synchronize_session=False))
(db.model_query(db.Option, session=session).filter_by(uuid=uuid).
delete())
for model in (db.Attribute, db.Option, db.Node):
db.model_query(model,
session=session).filter_by(uuid=uuid).delete()
def active_macs():