From cb0d01db91a1f82b17117a7bb64e5dea3e6b3b28 Mon Sep 17 00:00:00 2001 From: Bence Romsics Date: Mon, 18 Feb 2019 14:32:23 +0100 Subject: [PATCH] Remove ml2's accidental dependency on l3 The accidental dependency was never in effect since the neutron side of the relevant changes was not merged yet. I think I made a mistake in https://review.openstack.org/631515. We added the 'router' extension as a dependency of the 'floatingip-autodelete-internal' extension. Which looks a perfectly reasonable thing to do at first sight. However since the 'external-net' extension was de-extensionalized and made part of the ml2 plugin, the 'floatingip-autodelete-internal' extension also had to be implemented by the ml2 plugin. This complicated setup practically made the l3 plugin a dependency of the ml2 plugin. (That's why unit tests started failing in patch set #3 of the neutron change.) Which of course is non-sense. So this change removes the dependency. The neutron side of this change still degrades gracefully even without the explicit dependency between the extensions, so I don't think we're losing anything by not having that dependency. Change-Id: I8825eaf4f46ea2639131e34f9b833af1de6ab1b4 Needed-By: https://review.openstack.org/624751 Partial-Bug: #1806032 Related-Change: https://review.openstack.org/631515 --- .../api/definitions/floatingip_autodelete_internal.py | 5 +---- .../floatingip-autodelete-internal-dep-8e544fad694d1275.yaml | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/floatingip-autodelete-internal-dep-8e544fad694d1275.yaml diff --git a/neutron_lib/api/definitions/floatingip_autodelete_internal.py b/neutron_lib/api/definitions/floatingip_autodelete_internal.py index 91d70d7b9..da3132acf 100644 --- a/neutron_lib/api/definitions/floatingip_autodelete_internal.py +++ b/neutron_lib/api/definitions/floatingip_autodelete_internal.py @@ -12,9 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron_lib.api.definitions import l3 - - ALIAS = 'floatingip-autodelete-internal' IS_SHIM_EXTENSION = True IS_STANDARD_ATTR_EXTENSION = False @@ -25,6 +22,6 @@ UPDATED_TIMESTAMP = '2019-01-24T00:00:00-00:00' RESOURCE_ATTRIBUTE_MAP = {} SUB_RESOURCE_ATTRIBUTE_MAP = {} ACTION_MAP = {} -REQUIRED_EXTENSIONS = [l3.ALIAS] +REQUIRED_EXTENSIONS = [] OPTIONAL_EXTENSIONS = [] ACTION_STATUS = {} diff --git a/releasenotes/notes/floatingip-autodelete-internal-dep-8e544fad694d1275.yaml b/releasenotes/notes/floatingip-autodelete-internal-dep-8e544fad694d1275.yaml new file mode 100644 index 000000000..1c1a196f3 --- /dev/null +++ b/releasenotes/notes/floatingip-autodelete-internal-dep-8e544fad694d1275.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + For technical reasons the ``floatingip-autodelete-internal`` extension + no longer requires the ``router`` extension.