diff --git a/neutron_fwaas/tests/tempest_plugin/tests/scenario/manager.py b/neutron_fwaas/tests/tempest_plugin/tests/scenario/manager.py index d520a176b..d6ff590b9 100644 --- a/neutron_fwaas/tests/tempest_plugin/tests/scenario/manager.py +++ b/neutron_fwaas/tests/tempest_plugin/tests/scenario/manager.py @@ -14,11 +14,11 @@ # License for the specific language governing permissions and limitations # under the License. +import json import subprocess import netaddr from oslo_log import log -from oslo_serialization import jsonutils from oslo_utils import netutils from tempest.common import compute @@ -472,7 +472,7 @@ class ScenarioTest(tempest.test.BaseTestCase): bdm = image_props.get('block_device_mapping') if bdm: - bdm = jsonutils.loads(bdm) + bdm = json.loads(bdm) if bdm and 'snapshot_id' in bdm[0]: snapshot_id = bdm[0]['snapshot_id'] self.addCleanup( diff --git a/requirements.txt b/requirements.txt index 0133391c2..a4e19e543 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,6 @@ oslo.config>=5.1.0 # Apache-2.0 oslo.db>=4.27.0 # Apache-2.0 oslo.log>=3.30.0 # Apache-2.0 oslo.messaging>=5.29.0 # Apache-2.0 -oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.service>=1.24.0 # Apache-2.0 oslo.utils>=3.31.0 # Apache-2.0 oslo.privsep>=1.23.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 931bf3b0c..ac69e9672 100644 --- a/tox.ini +++ b/tox.ini @@ -94,7 +94,8 @@ commands = python setup.py build_sphinx # H106: Do not put vim configuration in source files # H203: Use assertIs(Not)None to check for None # H904: Delay string interpolations at logging calls -ignore = E125,E126,E128,E129,E265,H404,H405,N530 +# N521: jsonutils.loads must be used instead of json.loads +ignore = E125,E126,E128,E129,E265,H404,H405,N530,N521 enable-extensions=H106,H203,H904 show-source = true exclude = .venv,.git,.tox,dist,doc,*lib/python*,.tmp,*egg,build,tools,.ropeproject,rally-scenarios