Conductor version cannot be null in Rocky
This is a leftover of commit 6b995c07ed
Change-Id: Iff41fed4693270a1b8af092b56174f6db018f520
This commit is contained in:
parent
4f52b698dc
commit
99a330aa3c
|
@ -1183,17 +1183,6 @@ class Connection(api.Connection):
|
||||||
if not supported_versions:
|
if not supported_versions:
|
||||||
continue
|
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
|
# NOTE(rloo): we use model.version, not model, because we
|
||||||
# know that the object has a 'version' column
|
# know that the object has a 'version' column
|
||||||
# but we don't know whether the entire object is
|
# but we don't know whether the entire object is
|
||||||
|
|
|
@ -60,13 +60,6 @@ class UpgradingTestCase(base.DbTestCase):
|
||||||
self.assertEqual(v, conductor.version)
|
self.assertEqual(v, conductor.version)
|
||||||
self.assertTrue(self.dbapi.check_versions())
|
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):
|
def test_check_versions_conductor_old(self):
|
||||||
conductor = utils.create_test_conductor(version='1.0')
|
conductor = utils.create_test_conductor(version='1.0')
|
||||||
conductor = self.dbapi.get_conductor(conductor.hostname)
|
conductor = self.dbapi.get_conductor(conductor.hostname)
|
||||||
|
|
Loading…
Reference in New Issue