From 7a0a41b90447a1b739d9da0f3498ca0916d0a315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Wed, 5 Jun 2019 23:06:39 +0200
Subject: [PATCH] Add conntrack helper to parent resource mapping

For policy to work router must map to the conntrack
helper service plug-in.

Related-Bug: #1823633
Change-Id: Ib4e0c412e1e20f5148c11a909c549413859e1bc9
---
 neutron_lib/plugins/constants.py                            | 1 +
 neutron_lib/services/constants.py                           | 3 ++-
 ...ack-helper-parent-resource-mapping-95a4a2cb6f6536fe.yaml | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/conntrack-helper-parent-resource-mapping-95a4a2cb6f6536fe.yaml

diff --git a/neutron_lib/plugins/constants.py b/neutron_lib/plugins/constants.py
index a67439cbb..6b6ca7e9b 100644
--- a/neutron_lib/plugins/constants.py
+++ b/neutron_lib/plugins/constants.py
@@ -26,3 +26,4 @@ LOG_API = "LOGGING"
 PORTFORWARDING = "PORTFORWARDING"
 FLOATINGIPPOOL = "FLOATINGIPPOOL"
 NETWORK_SEGMENT_RANGE = "NETWORK_SEGMENT_RANGE"
+CONNTRACKHELPER = "CONNTRACKHELPER"
diff --git a/neutron_lib/services/constants.py b/neutron_lib/services/constants.py
index cad5ac52e..5a5f374fe 100644
--- a/neutron_lib/services/constants.py
+++ b/neutron_lib/services/constants.py
@@ -25,5 +25,6 @@ from neutron_lib.plugins import constants as plugin_const
 # SERVICE_PLUGIN_NAME is the service plugin which introduced the resource and
 # registered the service plugin name in neutron-lib.
 EXT_PARENT_RESOURCE_MAPPING = {
-    l3.FLOATINGIP: plugin_const.L3
+    l3.FLOATINGIP: plugin_const.L3,
+    l3.ROUTER: plugin_const.CONNTRACKHELPER
 }
diff --git a/releasenotes/notes/conntrack-helper-parent-resource-mapping-95a4a2cb6f6536fe.yaml b/releasenotes/notes/conntrack-helper-parent-resource-mapping-95a4a2cb6f6536fe.yaml
new file mode 100644
index 000000000..88b43c20a
--- /dev/null
+++ b/releasenotes/notes/conntrack-helper-parent-resource-mapping-95a4a2cb6f6536fe.yaml
@@ -0,0 +1,6 @@
+---
+other:
+  - |
+    Parent resource mapping was added to ``EXT_PARENT_RESOURCE_MAPPING`` in
+    ``neutron_lib.services.constants`` for the ``l3-conntrack-helper``
+    extension.