openstack
/
nova
Code Issues Proposed changes

Merge "db: Remove unnecessary 'insert()' argument"

This commit is contained in:
Zuul 2023-06-07 16:54:08 +00:00 committed by Gerrit Code Review
parent c472d829fa b2520d6728
commit 0e997a428c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/db/main/api.py
View File

@ -4733,7 +4733,7 @@ def instance_tag_set(context, instance_uuid, tags):
if to_add:
data = [
{'resource_id': instance_uuid, 'tag': tag} for tag in to_add]
context.session.execute(models.Tag.__table__.insert(None), data)
context.session.execute(models.Tag.__table__.insert(), data)
return context.session.query(models.Tag).filter_by(
resource_id=instance_uuid).all()

2
nova/objects/aggregate.py
View File

@ -125,7 +125,7 @@ def _metadata_add_to_db(context, aggregate_id, metadata, max_retries=10,
"aggregate_id": aggregate_id})
if new_entries:
context.session.execute(
api_models.AggregateMetadata.__table__.insert(None),
api_models.AggregateMetadata.__table__.insert(),
new_entries)
return metadata

2
nova/tests/unit/db/main/test_api.py
View File

@ -6617,7 +6617,7 @@ class TestDBInstanceTags(test.TestCase):
db.instance_tag_set(self.context, uuid, [tag1, tag2])
# Check insert() was called to insert 'tag1' and 'tag2'
mock_insert.assert_called_once_with(None)
mock_insert.assert_called_once_with()
mock_insert.reset_mock()
db.instance_tag_set(self.context, uuid, [tag1])