From b6b9f043ffe664c643456912148648ecc0d6c9b4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 28 Jan 2024 01:02:26 +0900
Subject: [PATCH] Replace usage of deprecated [DATABASE] sql_connection

This option was deprecated in oslo.db a long ago and was removed in
master.

Change-Id: Iba6aa00e4f86fc4b82fa354fddf2fc7d6b47c52f
---
 glance/tests/functional/__init__.py             | 13 ++++++++-----
 glance/tests/functional/serial/test_scrubber.py |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py
index 5244f22caa..7d4386d159 100644
--- a/glance/tests/functional/__init__.py
+++ b/glance/tests/functional/__init__.py
@@ -181,8 +181,8 @@ class BaseServer(metaclass=abc.ABCMeta):
             conf_filepath = os.path.join(conf_dir, 'glance-manage.conf')
 
             with open(conf_filepath, 'w') as conf_file:
-                conf_file.write('[DEFAULT]\n')
-                conf_file.write('sql_connection = %s' % self.sql_connection)
+                conf_file.write('[database]\n')
+                conf_file.write('connection = %s' % self.sql_connection)
                 conf_file.flush()
 
             glance_db_env = 'GLANCE_DB_TEST_SQLITE_FILE'
@@ -440,7 +440,6 @@ scrub_time = %(scrub_time)s
 send_identity_headers = %(send_identity_headers)s
 image_cache_dir = %(image_cache_dir)s
 image_cache_driver = %(image_cache_driver)s
-sql_connection = %(sql_connection)s
 show_image_direct_url = %(show_image_direct_url)s
 show_multiple_locations = %(show_multiple_locations)s
 user_storage_quota = %(user_storage_quota)s
@@ -454,6 +453,8 @@ image_location_quota=%(image_location_quota)s
 location_strategy=%(location_strategy)s
 allow_additional_image_properties = True
 node_staging_uri=%(node_staging_uri)s
+[database]
+connection = %(sql_connection)s
 [oslo_policy]
 policy_file = %(policy_file)s
 policy_default_rule = %(policy_default_rule)s
@@ -630,7 +631,6 @@ scrub_time = %(scrub_time)s
 send_identity_headers = %(send_identity_headers)s
 image_cache_dir = %(image_cache_dir)s
 image_cache_driver = %(image_cache_driver)s
-sql_connection = %(sql_connection)s
 show_image_direct_url = %(show_image_direct_url)s
 show_multiple_locations = %(show_multiple_locations)s
 user_storage_quota = %(user_storage_quota)s
@@ -644,6 +644,8 @@ image_location_quota=%(image_location_quota)s
 location_strategy=%(location_strategy)s
 allow_additional_image_properties = True
 enabled_backends=file1:file,file2:file,file3:file
+[database]
+connection = %(sql_connection)s
 [oslo_policy]
 policy_file = %(policy_file)s
 policy_default_rule = %(policy_default_rule)s
@@ -795,8 +797,9 @@ wakeup_time = 2
 scrub_time = %(scrub_time)s
 metadata_encryption_key = %(metadata_encryption_key)s
 lock_path = %(lock_path)s
-sql_connection = %(sql_connection)s
 sql_idle_timeout = 3600
+[database]
+connection = %(sql_connection)s
 [glance_store]
 filesystem_store_datadir=%(image_dir)s
 [oslo_policy]
diff --git a/glance/tests/functional/serial/test_scrubber.py b/glance/tests/functional/serial/test_scrubber.py
index 3674ff7d2d..bb35ba5172 100644
--- a/glance/tests/functional/serial/test_scrubber.py
+++ b/glance/tests/functional/serial/test_scrubber.py
@@ -40,7 +40,8 @@ class TestScrubber(functional.FunctionalTest):
         self.api_server.deployment_flavor = 'noauth'
         self.api_server.send_identity_credentials = True
         self.admin_context = context.get_admin_context(show_deleted=True)
-        CONF.set_override('sql_connection', self.api_server.sql_connection)
+        CONF.set_override('connection', self.api_server.sql_connection,
+                          group='database')
 
     def _headers(self, custom_headers=None):
         base_headers = {