From a65ea33824edc570e04acf994cea26edf874bf48 Mon Sep 17 00:00:00 2001
From: Balazs Gibizer <balazs.gibizer@est.tech>
Date: Wed, 21 Jul 2021 12:20:22 +0200
Subject: [PATCH] Bump oslo.db to 10.0.0

This makes it possible to partially revert
If48dd949ec4d69a09c87178f16d56a2517e21fd8 as one of the warning silenced
there now fixed in oslo.db.

Change-Id: I0051c0f8694699865bc16636953908d60ba456d2
---
 lower-constraints.txt       |  2 +-
 nova/tests/fixtures/nova.py | 10 ----------
 requirements.txt            |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 59448edd41..f42d383e54 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -71,7 +71,7 @@ oslo.cache==1.26.0
 oslo.concurrency==4.4.0
 oslo.config==8.6.0
 oslo.context==3.1.1
-oslo.db==4.44.0
+oslo.db==10.0.0
 oslo.i18n==5.0.1
 oslo.log==4.4.0
 oslo.messaging==10.3.0
diff --git a/nova/tests/fixtures/nova.py b/nova/tests/fixtures/nova.py
index f7e4a68d5b..aec2bce08b 100644
--- a/nova/tests/fixtures/nova.py
+++ b/nova/tests/fixtures/nova.py
@@ -770,16 +770,6 @@ class WarningsFixture(fixtures.Fixture):
             'error', message='Evaluating non-mapped column expression',
             category=sqla_exc.SAWarning)
 
-        # NOTE(stephenfin): Disable the annoying "TypeDecorator foo will not
-        # produce a cache key because the ``cache_ok`` flag is not set to True"
-        # warning. It's fixed in oslo.db 10.0.0 but not before.
-        # TODO(stephenfin): Remove once we bump oslo.db in lower-constraints to
-        # 10.0.0
-        warnings.filterwarnings(
-            'ignore',
-            message=r'TypeDecorator SoftDeleteInteger\(\) will not produce .*',
-            category=sqla_exc.SAWarning)
-
         # TODO(stephenfin): Remove once we fix this is oslo.db 10.0.1 or so
         warnings.filterwarnings(
             'ignore',
diff --git a/requirements.txt b/requirements.txt
index e822c73bab..8b76d3e9d9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -40,7 +40,7 @@ oslo.reports>=1.18.0 # Apache-2.0
 oslo.serialization>=4.1.0 # Apache-2.0
 oslo.upgradecheck>=1.3.0
 oslo.utils>=4.8.0 # Apache-2.0
-oslo.db>=4.44.0 # Apache-2.0
+oslo.db>=10.0.0 # Apache-2.0
 oslo.rootwrap>=5.8.0 # Apache-2.0
 oslo.messaging>=10.3.0 # Apache-2.0
 oslo.policy>=3.7.0 # Apache-2.0