From fbdf59085cf734d8da1c9f4d34b60480e481736e Mon Sep 17 00:00:00 2001
From: John Kung <john.kung@windriver.com>
Date: Sun, 10 Feb 2019 09:23:27 -0500
Subject: [PATCH] Update neutron helm override to enable network_segment_ranges

This update depends on the update for the docker neutron image which
is part of patch set 19 (or newer supporting the service plugin
'network_segment_range') of
   https://review.openstack.org/#/c/624708/

Helm override the default vxlan_group, vni_range which are set by:
  github.com/openstack/openstack-helm/blob/master/neutron/values.yaml

Tests Performed:
    Containers:
        Verified network_segment_range feature is enabled when the
        docker image with the available functionality is loaded.

        Verified impact when network_segment_range is set and upstream
        feature not available; thus this update Must go in only after
        the docker neutron image has been updated to support the
        service_plugin.

        Setup lab, launched instances and confirmed data (provider)
        network reachability on vxlan and vlan.

Change-Id: I2cb76f5cb956c46258481c331a580f979035bb0d
Story: 2004455
Task: 28324
Signed-off-by: John Kung <john.kung@windriver.com>
---
 sysinv/sysinv/centos/build_srpm.data            | 2 +-
 sysinv/sysinv/sysinv/sysinv/common/constants.py | 6 +++++-
 sysinv/sysinv/sysinv/sysinv/helm/neutron.py     | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data
index 2d590250af..6164e638b9 100644
--- a/sysinv/sysinv/centos/build_srpm.data
+++ b/sysinv/sysinv/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="sysinv"
-TIS_PATCH_VER=300
+TIS_PATCH_VER=301
diff --git a/sysinv/sysinv/sysinv/sysinv/common/constants.py b/sysinv/sysinv/sysinv/sysinv/common/constants.py
index 81be0293fa..1e773ff561 100644
--- a/sysinv/sysinv/sysinv/sysinv/common/constants.py
+++ b/sysinv/sysinv/sysinv/sysinv/common/constants.py
@@ -1015,6 +1015,9 @@ SERVICE_PARAM_NETWORK_ML2_EXT_DRIVERS = \
 SERVICE_PARAM_NETWORK_ML2_TENANT_TYPES = \
     ['vlan', 'vxlan']
 
+# service plugin for neutron network segment range feature
+NEUTRON_PLUGIN_NETWORK_SEGMENT_RANGE = 'network_segment_range'
+
 # a subset of Neutron service plugins that are supported
 SERVICE_PARAM_NETWORK_DEFAULT_SERVICE_PLUGINS = \
     ['odl-router',
@@ -1023,7 +1026,8 @@ SERVICE_PARAM_NETWORK_DEFAULT_SERVICE_PLUGINS = \
      'networking_odl.l3.l3_odl_v2:OpenDaylightL3RouterPlugin',
      'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin',
      'networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin',
-     'router']
+     'router',
+     NEUTRON_PLUGIN_NETWORK_SEGMENT_RANGE]
 
 # Neutron service plugins for SDN
 SERVICE_PLUGINS_SDN = \
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
index bda7e26aa8..1a4517a0af 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
@@ -282,7 +282,8 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
                 'lock_path': '/var/run/neutron/lock',
                 'log_format': '[%(name)s] %(message)s',
                 'policy_file': '/etc/neutron/policy.json',
-                'service_plugins': 'router',
+                'service_plugins':
+                    'router' + ',' + constants.NEUTRON_PLUGIN_NETWORK_SEGMENT_RANGE,
                 'dns_domain': 'openstacklocal',
                 'enable_new_agents': False,
                 'allow_automatic_dhcp_failover': True,
@@ -320,6 +321,10 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
             'securitygroup': {
                 'firewall_driver': 'noop',
             },
+            'ml2_type_vxlan': {
+                'vni_ranges': '',
+                'vxlan_group': '',
+            },
         }
         LOG.info("_get_neutron_ml2_config=%s" % ml2_config)
         return ml2_config