From 5df6e93b59e02d2b11359f0e8941fcd6292245c2 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Fri, 21 Jul 2023 08:19:12 +0000 Subject: [PATCH] Revert "Add "network" to the EXT_PARENT_RESOURCE_MAPPING" This reverts commit a0147209123542c4b237b3e3dddea880be27a5af. Reason for revert: It is not needed to have network in the EXT_PARENT_RESOURCE_MAPPING as we will keep NET_OWNER rules and use them for subnets and ports API. Please see [1] for more detailed explanation why it's better to keep NET_OWNER rules for those policies. [1] https://review.opendev.org/c/openstack/neutron/+/889153 Change-Id: Ia2cd6301e04ac502888ee2b8042ea8c19873a95a --- neutron_lib/services/constants.py | 2 -- .../network-in-parent-resource-mapping-0bc57f9bb54d1dc9.yaml | 5 ----- 2 files changed, 7 deletions(-) delete mode 100644 releasenotes/notes/network-in-parent-resource-mapping-0bc57f9bb54d1dc9.yaml diff --git a/neutron_lib/services/constants.py b/neutron_lib/services/constants.py index 78de39cad..7620d8df8 100644 --- a/neutron_lib/services/constants.py +++ b/neutron_lib/services/constants.py @@ -14,7 +14,6 @@ from neutron_lib.api.definitions import l3 from neutron_lib.api.definitions import local_ip -from neutron_lib.api.definitions import network from neutron_lib.api.definitions import qos from neutron_lib.plugins import constants as plugin_const @@ -32,5 +31,4 @@ EXT_PARENT_RESOURCE_MAPPING = { l3.ROUTER: plugin_const.CONNTRACKHELPER, local_ip.RESOURCE_NAME: plugin_const.LOCAL_IP, qos.POLICY: plugin_const.QOS, - network.RESOURCE_NAME: plugin_const.CORE, } diff --git a/releasenotes/notes/network-in-parent-resource-mapping-0bc57f9bb54d1dc9.yaml b/releasenotes/notes/network-in-parent-resource-mapping-0bc57f9bb54d1dc9.yaml deleted file mode 100644 index 18613ed73..000000000 --- a/releasenotes/notes/network-in-parent-resource-mapping-0bc57f9bb54d1dc9.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -other: - - | - Resource ``network`` was added to the ``EXT_PARENT_RESOURCE_MAPPING in - ``neutron_lib.services.constants``.