From 99a330aa3cc2a0446a07a6613eff9226e0008ba9 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 14 Feb 2018 16:31:07 +0100 Subject: [PATCH] Conductor version cannot be null in Rocky This is a leftover of commit 6b995c07edcc1a4db4e869009541e82ad4943d31 Change-Id: Iff41fed4693270a1b8af092b56174f6db018f520 --- ironic/db/sqlalchemy/api.py | 11 ----------- ironic/tests/unit/db/test_api.py | 7 ------- 2 files changed, 18 deletions(-) diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py index 6327c1aa2f..9f23a778b0 100644 --- a/ironic/db/sqlalchemy/api.py +++ b/ironic/db/sqlalchemy/api.py @@ -1183,17 +1183,6 @@ class Connection(api.Connection): if not supported_versions: continue - # TODO(rloo). Because we forgot to set the version of - # conductors in Pike, we allow the Conductor version to - # be null now (Queens). In Rocky, it cannot be null, - # and this 'if...' can be deleted then. - if model.__name__ == 'Conductor': - query = model_query(model.version).filter( - model.version.notin_(supported_versions)) - if query.count(): - return False - continue - # NOTE(rloo): we use model.version, not model, because we # know that the object has a 'version' column # but we don't know whether the entire object is diff --git a/ironic/tests/unit/db/test_api.py b/ironic/tests/unit/db/test_api.py index 508d787122..5f024dd3e8 100644 --- a/ironic/tests/unit/db/test_api.py +++ b/ironic/tests/unit/db/test_api.py @@ -60,13 +60,6 @@ class UpgradingTestCase(base.DbTestCase): self.assertEqual(v, conductor.version) self.assertTrue(self.dbapi.check_versions()) - def test_check_versions_conductor_no_version(self): - # works in Queens only - conductor = utils.create_test_conductor(version=None) - conductor = self.dbapi.get_conductor(conductor.hostname) - self.assertIsNone(conductor.version) - self.assertTrue(self.dbapi.check_versions()) - def test_check_versions_conductor_old(self): conductor = utils.create_test_conductor(version='1.0') conductor = self.dbapi.get_conductor(conductor.hostname)