From b2520d6728036791aa529f531b210fb92a6940e1 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 17 Apr 2023 16:41:37 +0100 Subject: [PATCH] db: Remove unnecessary 'insert()' argument The function signature for this method is change in SQLAlchemy 2.x: TypeError: insert() takes 1 positional argument but 2 were given We missed this previously as the deprecation checks in SQLAlchemy were presumably checking for non-None values. Change-Id: I4e366a0dbad56e739370b8bec0b84f6162f3d7a0 Signed-off-by: Stephen Finucane --- nova/db/main/api.py | 2 +- nova/objects/aggregate.py | 2 +- nova/tests/unit/db/main/test_api.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/db/main/api.py b/nova/db/main/api.py index 7d24f974f91a..78cf3df53ada 100644 --- a/nova/db/main/api.py +++ b/nova/db/main/api.py @@ -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() diff --git a/nova/objects/aggregate.py b/nova/objects/aggregate.py index 1d6597965c0f..198e35b4281a 100644 --- a/nova/objects/aggregate.py +++ b/nova/objects/aggregate.py @@ -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 diff --git a/nova/tests/unit/db/main/test_api.py b/nova/tests/unit/db/main/test_api.py index 98f9c854d92c..9f7f837f9f39 100644 --- a/nova/tests/unit/db/main/test_api.py +++ b/nova/tests/unit/db/main/test_api.py @@ -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])