openstack/neutron
Code Issues Proposed changes

The ovn_db_revision_check is not required anymore

Browse Source 
The OVN code is in-tree. This check is not required anymore.
Removing the check and unit tests.

Closes-Bug: #2086780
Change-Id: I2c61fefda44ca82066da30b944cb477648b49b5d
This commit is contained in:
Sharat Sharma
2024-11-06 18:36:37 +05:30
committed by Rodolfo Alonso
parent e47aed1508
commit 7910d46313
2 changed files with 0 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
neutron/cmd/upgrade_checks/checks.py
View File

@@ -103,13 +103,6 @@ def table_exists(table_name):
return table_name in tables
def get_ovn_db_revisions():
ctx = context.get_admin_context()
with db_api.CONTEXT_READER.using(ctx):
return [row[0] for row in ctx.session.execute(
"SELECT version_num from %s;" % OVN_ALEMBIC_TABLE_NAME)] # nosec
def count_vlan_allocations_invalid_segmentation_id():
ctx = context.get_admin_context()
with db_api.CONTEXT_READER.using(ctx):
@@ -214,8 +207,6 @@ class CoreChecks(base.BaseChecks):
def get_checks(self):
return [
(_("Worker counts configured"), self.worker_count_check),
(_("Networking-ovn database revision"),
self.ovn_db_revision_check),
(_("NIC Switch agent check kernel"),
self.nic_switch_agent_min_kernel_check),
(_("VLAN allocations valid segmentation ID check"),
@@ -283,30 +274,6 @@ class CoreChecks(base.BaseChecks):
upgradecheck.Code.SUCCESS,
_("The 'mtu' attribute of all networks are set."))
@staticmethod
def ovn_db_revision_check(checker):
if not cfg.CONF.database.connection:
return upgradecheck.Result(
upgradecheck.Code.WARNING,
_("Database connection string is not set. Check of "
"networking-ovn database revision can't be done."))
if not table_exists(OVN_ALEMBIC_TABLE_NAME):
return upgradecheck.Result(
upgradecheck.Code.SUCCESS,
_("Networking-ovn alembic version table don't exists in "
"the database yet."))
revisions = get_ovn_db_revisions()
if (LAST_NETWORKING_OVN_EXPAND_HEAD not in revisions or
LAST_NETWORKING_OVN_CONTRACT_HEAD not in revisions):
return upgradecheck.Result(
upgradecheck.Code.FAILURE,
_("Networking-ovn database tables are not up to date. "
"Please firts update networking-ovn to the latest version "
"from Train release."))
return upgradecheck.Result(
upgradecheck.Code.SUCCESS,
_("Networking-ovn database tables are up to date."))
@staticmethod
def nic_switch_agent_min_kernel_check(checker):
# TODO(adrianc): This was introduced in U release, consider removing

30
neutron/tests/unit/cmd/upgrade_checks/test_checks.py
View File

@@ -78,36 +78,6 @@ class TestChecks(base.BaseTestCase):
self.assertIn('net-uuid-a', result.details)
self.assertNotIn('net-uuid-b', result.details)
def test_ovn_db_revision_check_no_networking_ovn_installed(self):
with mock.patch.object(checks, "table_exists", return_value=False),\
mock.patch.object(
checks, "get_ovn_db_revisions") as get_ovn_db_revisions:
result = checks.CoreChecks.ovn_db_revision_check(mock.Mock())
self.assertEqual(Code.SUCCESS, result.code)
get_ovn_db_revisions.assert_not_called()
def test_ovn_db_revision_check_networking_ovn_latest_revision(self):
revisions = [
checks.LAST_NETWORKING_OVN_EXPAND_HEAD,
checks.LAST_NETWORKING_OVN_CONTRACT_HEAD]
with mock.patch.object(checks, "table_exists", return_value=True),\
mock.patch.object(
checks, "get_ovn_db_revisions",
return_value=revisions) as get_ovn_db_revisions:
result = checks.CoreChecks.ovn_db_revision_check(mock.Mock())
self.assertEqual(Code.SUCCESS, result.code)
get_ovn_db_revisions.assert_called_once_with()
def test_ovn_db_revision_check_networking_ovn_not_latest_revision(self):
revisions = ["some_older_revision"]
with mock.patch.object(checks, "table_exists", return_value=True),\
mock.patch.object(
checks, "get_ovn_db_revisions",
return_value=revisions) as get_ovn_db_revisions:
result = checks.CoreChecks.ovn_db_revision_check(mock.Mock())
self.assertEqual(Code.FAILURE, result.code)
get_ovn_db_revisions.assert_called_once_with()
def test_nic_switch_agent_min_kernel_check_no_nic_switch_agents(self):
with mock.patch.object(checks, "get_nic_switch_agents",
return_value=[]):