From f4c4b0f20a796caf2133f6029ca3455382cd50ad Mon Sep 17 00:00:00 2001
From: German Eichberger <German.eichberger@rackspace.com>
Date: Tue, 12 Sep 2017 15:18:46 -0600
Subject: [PATCH] Adds IPinIP protocol

Neutron doesn't support the IP-in-IP protocol by name in
security group rules. With this change a user can now
declare the IP-in-IP protocol by using the name 'ipip'

Note: This doesn't fix an underlying problem
with the Neutron protocol number validator, but
serves as a work around for users wanting to use
the IP-in-IP protocol.

Partial-bug: #1716045

Change-Id: I18e5e42b687e12b64f5a9c523a912c8dd1afa9d2
---
 neutron_lib/constants.py                                     | 3 +++
 releasenotes/notes/add-ipinip-protocol-ab9287f9b698f34c.yaml | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/add-ipinip-protocol-ab9287f9b698f34c.yaml

diff --git a/neutron_lib/constants.py b/neutron_lib/constants.py
index 8e4bbedee..c5da96098 100644
--- a/neutron_lib/constants.py
+++ b/neutron_lib/constants.py
@@ -133,6 +133,7 @@ PROTO_NAME_ESP = 'esp'
 PROTO_NAME_GRE = 'gre'
 PROTO_NAME_ICMP = 'icmp'
 PROTO_NAME_IGMP = 'igmp'
+PROTO_NAME_IPIP = 'ipip'
 PROTO_NAME_IPV6_ENCAP = 'ipv6-encap'
 PROTO_NAME_IPV6_FRAG = 'ipv6-frag'
 PROTO_NAME_IPV6_ICMP = 'ipv6-icmp'
@@ -158,6 +159,7 @@ PROTO_NUM_ESP = 50
 PROTO_NUM_GRE = 47
 PROTO_NUM_ICMP = 1
 PROTO_NUM_IGMP = 2
+PROTO_NUM_IPIP = 4
 PROTO_NUM_IPV6_ENCAP = 41
 PROTO_NUM_IPV6_FRAG = 44
 PROTO_NUM_IPV6_ICMP = 58
@@ -180,6 +182,7 @@ IP_PROTOCOL_MAP = {PROTO_NAME_AH: PROTO_NUM_AH,
                    PROTO_NAME_GRE: PROTO_NUM_GRE,
                    PROTO_NAME_ICMP: PROTO_NUM_ICMP,
                    PROTO_NAME_IGMP: PROTO_NUM_IGMP,
+                   PROTO_NAME_IPIP: PROTO_NUM_IPIP,
                    PROTO_NAME_IPV6_ENCAP: PROTO_NUM_IPV6_ENCAP,
                    PROTO_NAME_IPV6_FRAG: PROTO_NUM_IPV6_FRAG,
                    PROTO_NAME_IPV6_ICMP: PROTO_NUM_IPV6_ICMP,
diff --git a/releasenotes/notes/add-ipinip-protocol-ab9287f9b698f34c.yaml b/releasenotes/notes/add-ipinip-protocol-ab9287f9b698f34c.yaml
new file mode 100644
index 000000000..4a1374c5b
--- /dev/null
+++ b/releasenotes/notes/add-ipinip-protocol-ab9287f9b698f34c.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds the IP-in-IP protocol under the name ``ipip`` to the
+    list of protocols supported in security group rules.