From 7b277a1ba0ca2c602cf053163a8d1ed3c3aa9743 Mon Sep 17 00:00:00 2001 From: Henry Gessau Date: Thu, 3 Nov 2016 20:07:48 -0400 Subject: [PATCH] Remove last vestiges of oslo-incubator This is a community goal for Ocata. We're already not using any of the code, but there are some other files and references left over. Partial-Bug: #1639103 Change-Id: I2afd263ddc480e2512e3be77a03ffe5ae16e17a5 --- .pylintrc | 2 +- doc/source/devref/neutron_api.rst | 8 -------- neutron/common/cache_utils.py | 3 --- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.pylintrc b/.pylintrc index df88dbbc390..24686b991a4 100644 --- a/.pylintrc +++ b/.pylintrc @@ -102,7 +102,7 @@ ignore-iface-methods= [IMPORTS] # Deprecated modules which should not be used, separated by a comma deprecated-modules= -# should use openstack.common.jsonutils +# should use oslo_serialization.jsonutils json [TYPECHECK] diff --git a/doc/source/devref/neutron_api.rst b/doc/source/devref/neutron_api.rst index 7f96f82eb2c..62422bea162 100644 --- a/doc/source/devref/neutron_api.rst +++ b/doc/source/devref/neutron_api.rst @@ -34,14 +34,6 @@ that is explicitly marked to be consumed by other projects. That said, there are modules that other projects should definitely avoid relying on. -Specifically, no external repository should use anything located under -neutron.openstack.common.* import path. This code belongs to oslo-incubator -modules and is not meant to work for consumers other than neutron main tree -itself. (The only exception is made for advanced service repositories that are -tightly controlled by neutron community.) Long story short, if your repository -uses those modules, please switch to corresponding oslo libraries or use your -own copy of oslo-incubator files. - Breakages --------- diff --git a/neutron/common/cache_utils.py b/neutron/common/cache_utils.py index 9071be29bb1..4648fccf9e8 100644 --- a/neutron/common/cache_utils.py +++ b/neutron/common/cache_utils.py @@ -57,9 +57,6 @@ def _get_cache_region_for_legacy(url): if backend == 'memory': query = parsed.query - # NOTE(fangzhen): The following NOTE and code is from legacy - # oslo-incubator cache module. Previously reside in neutron at - # neutron/openstack/common/cache/cache.py:78 # NOTE(flaper87): We need the following hack # for python versions < 2.7.5. Previous versions # of python parsed query params just for 'known'