openstack/heat
Code Issues Proposed changes

Merge "Remove the db object delete method"

Browse Source
This commit is contained in:
Jenkins 2016-07-19 09:04:55 +00:00 committed by Gerrit Code Review
commit 0bdd21bd11
4 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/db/api.py
View File

@ -118,6 +118,10 @@ def resource_create(context, values):
return IMPL.resource_create(context, values)
def resource_delete(context, resource_id):
return IMPL.resource_delete(context, resource_id)
def resource_exchange_stacks(context, resource_id1, resource_id2):
return IMPL.resource_exchange_stacks(context, resource_id1, resource_id2)

37
heat/db/sqlalchemy/api.py
View File

@ -125,14 +125,17 @@ def raw_template_update(context, template_id, values):
def raw_template_delete(context, template_id):
raw_template = raw_template_get(context, template_id)
raw_tmpl_files_id = raw_template.files_id
raw_template.delete()
if raw_tmpl_files_id is None:
return
# If no other raw_template is referencing the same raw_template_files,
# delete that too
if context.session.query(models.RawTemplate).filter_by(
files_id=raw_tmpl_files_id).first() is None:
raw_template_files_get(context, raw_tmpl_files_id).delete()
session = context.session
with session.begin(subtransactions=True):
session.delete(raw_template)
if raw_tmpl_files_id is None:
return
# If no other raw_template is referencing the same raw_template_files,
# delete that too
if session.query(models.RawTemplate).filter_by(
files_id=raw_tmpl_files_id).first() is None:
raw_tmpl_files = raw_template_files_get(context, raw_tmpl_files_id)
session.delete(raw_tmpl_files)
def raw_template_files_create(context, values):
@ -221,6 +224,14 @@ def resource_update(context, resource_id, values, atomic_key,
return bool(rows_updated)
def resource_delete(context, resource_id):
session = context.session
with session.begin(subtransactions=True):
resource = session.query(models.Resource).get(resource_id)
if resource:
session.delete(resource)
def resource_data_get_all(context, resource_id, data=None):
"""Looks up resource_data by resource.id.
@ -276,7 +287,7 @@ def stack_tags_delete(context, stack_id):
result = stack_tags_get(context, stack_id)
if result:
for tag in result:
tag.delete()
session.delete(tag)
def stack_tags_get(context, stack_id):
@ -334,7 +345,9 @@ def resource_exchange_stacks(context, resource_id1, resource_id2):
def resource_data_delete(context, resource_id, key):
result = resource_data_get_by_key(context, resource_id, key)
result.delete()
session = context.session
with session.begin(subtransactions=True):
session.delete(result)
def resource_create(context, values):
@ -1032,7 +1045,9 @@ def software_deployment_update(context, deployment_id, values):
def software_deployment_delete(context, deployment_id):
deployment = software_deployment_get(context, deployment_id)
deployment.delete()
session = context.session
with session.begin(subtransactions=True):
session.delete(deployment)
def snapshot_create(context, values):

10
heat/db/sqlalchemy/models.py
View File

@ -46,16 +46,6 @@ class HeatBase(models.ModelBase, models.TimestampMixin):
session = get_session()
session.expire(self, attrs)
def delete(self, session=None):
"""Delete this object."""
if not session:
session = orm_session.Session.object_session(self)
if not session:
session = get_session()
session.begin(subtransactions=True)
session.delete(self)
session.commit()
def update_and_save(self, values, session=None):
if not session:
session = orm_session.Session.object_session(self)

3
heat/objects/resource.py
View File

@ -125,8 +125,7 @@ class Resource(
@classmethod
def delete(cls, context, resource_id):
resource_db = db_api.resource_get(context, resource_id)
resource_db.delete()
db_api.resource_delete(context, resource_id)
@classmethod
def exchange_stacks(cls, context, resource_id1, resource_id2):