openstack
/
ironic
Code Issues Proposed changes

db: Replace use of Engine.execute() method 

Resolve the following RemovedIn20Warning warning:

  The Engine.execute() method is considered legacy as of the 1.x
  series of SQLAlchemy and will be removed in 2.0.

Closes-Bug: #2061345
Co-Authored-By: Stephen Finucane <stephenfin@redhat.com>
Change-Id: Ib0519af8a15ca02e351f8d739d52f4e658f7615a
This commit is contained in:
Takashi Kajinami 2024-04-15 11:47:25 +09:00
parent d68aea2ebe
commit 7408a93dcd
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/cmd/status.py
View File

@ -101,7 +101,9 @@ class Checks(upgradecheck.UpgradeCommands):
# This test only applies to mysql and database schema
# selection.
return upgradecheck.Result(upgradecheck.Code.SUCCESS)
res = engine.execute("show create table allocations")
with engine.connect() as conn, conn.begin():
res = conn.execute(
sqlalchemy.text("show create table allocations"))
results = str(res.all()).lower()
if 'utf8' not in results:
msg = ('The Allocations table is is not using UTF8 encoding. '

30
ironic/tests/unit/cmd/test_status.py
View File

@ -45,16 +45,30 @@ class TestUpgradeChecks(db_base.DbTestCase):
self.assertEqual(Code.SUCCESS,
check_result.code)
def _create_mock_context_manager(self, return_self=True):
mock_obj = mock.Mock()
if return_self:
val = mock_obj
else:
val = mock.Mock()
mock_obj.__enter__ = mock.Mock(return_value=val)
mock_obj.__exit__ = mock.Mock()
return mock_obj
@mock.patch.object(sqlalchemy.enginefacade.reader,
'get_engine', autospec=True)
def test__check_allocations_table_latin1(self, mock_reader):
mock_engine = mock.Mock()
mock_res = mock.Mock()
mock_engine.url = '..mysql..'
mock_res.all.return_value = (
'... ENGINE=InnoDB DEFAULT CHARSET=latin1',
)
mock_engine.url = '..mysql..'
mock_engine.execute.return_value = mock_res
mock_conn = self._create_mock_context_manager(True)
mock_trans = self._create_mock_context_manager(False)
mock_engine.connect.return_value = mock_conn
mock_conn.execute.return_value = mock_res
mock_conn.begin.return_value = mock_trans
mock_reader.return_value = mock_engine
check_result = self.cmd._check_allocations_table()
self.assertEqual(Code.WARNING,
@ -76,7 +90,11 @@ class TestUpgradeChecks(db_base.DbTestCase):
mock_res.all.return_value = (
'... ENGINE=MyIASM DEFAULT CHARSET=utf8',
)
mock_engine.execute.return_value = mock_res
mock_conn = self._create_mock_context_manager(True)
mock_trans = self._create_mock_context_manager(False)
mock_engine.connect.return_value = mock_conn
mock_conn.execute.return_value = mock_res
mock_conn.begin.return_value = mock_trans
mock_reader.return_value = mock_engine
check_result = self.cmd._check_allocations_table()
self.assertEqual(Code.WARNING,
@ -100,7 +118,11 @@ class TestUpgradeChecks(db_base.DbTestCase):
mock_res.all.return_value = (
'... ENGINE=MyIASM DEFAULT CHARSET=latin1',
)
mock_engine.execute.return_value = mock_res
mock_conn = self._create_mock_context_manager(True)
mock_trans = self._create_mock_context_manager(False)
mock_engine.connect.return_value = mock_conn
mock_conn.execute.return_value = mock_res
mock_conn.begin.return_value = mock_trans
mock_reader.return_value = mock_engine
check_result = self.cmd._check_allocations_table()
self.assertEqual(Code.WARNING,