From 2d77118771c2c7e74a19348ec6d76e93461b4632 Mon Sep 17 00:00:00 2001
From: James Anziano <janzian@us.ibm.com>
Date: Mon, 24 Apr 2017 19:54:01 +0000
Subject: [PATCH] Enable segments plugin in gate

Change-Id: I821f7c07f21a10c8a8d2b3c7e79da205b805d525
---
 devstack/lib/segments                          | 7 +++++++
 devstack/plugin.sh                             | 4 ++++
 neutron/tests/contrib/gate_hook.sh             | 1 +
 neutron/tests/contrib/hooks/api_all_extensions | 1 +
 neutron/tests/contrib/hooks/segments           | 1 +
 5 files changed, 14 insertions(+)
 create mode 100644 devstack/lib/segments
 create mode 100644 neutron/tests/contrib/hooks/segments

diff --git a/devstack/lib/segments b/devstack/lib/segments
new file mode 100644
index 00000000000..5ef3172b950
--- /dev/null
+++ b/devstack/lib/segments
@@ -0,0 +1,7 @@
+function configure_segments_service_plugin {
+    neutron_service_plugin_class_add segments
+}
+
+function configure_segments_extension {
+    configure_segments_service_plugin
+}
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cfa8097bdf7..0d4ce8d01b6 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -7,6 +7,7 @@ source $LIBDIR/l2_agent_sriovnicswitch
 source $LIBDIR/ml2
 source $LIBDIR/qos
 source $LIBDIR/ovs
+source $LIBDIR/segments
 source $LIBDIR/trunk
 
 Q_BUILD_OVS_FROM_GIT=$(trueorfalse False Q_BUILD_OVS_FROM_GIT)
@@ -30,6 +31,9 @@ if [[ "$1" == "stack" ]]; then
             if is_service_enabled q-dns neutron-dns; then
                 configure_dns_extension
             fi
+            if is_service_enabled neutron-segments; then
+                configure_segments_extension
+            fi
             if [[ "$NEUTRON_AGENT" == "openvswitch" ]] && \
                [[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
                 remove_ovs_packages
diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh
index 885cd954217..58cc8b0d849 100644
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@@ -98,6 +98,7 @@ case $VENV in
     load_conf_hook quotas
     load_rc_hook dns
     load_rc_hook qos
+    load_rc_hook segments
     load_rc_hook trunk
     load_conf_hook vlan_provider
     load_conf_hook type_drivers
diff --git a/neutron/tests/contrib/hooks/api_all_extensions b/neutron/tests/contrib/hooks/api_all_extensions
index b891fdcee05..da8dbfd2c0f 100644
--- a/neutron/tests/contrib/hooks/api_all_extensions
+++ b/neutron/tests/contrib/hooks/api_all_extensions
@@ -33,6 +33,7 @@ NETWORK_API_EXTENSIONS+=",rbac-policies"
 NETWORK_API_EXTENSIONS+=",router"
 NETWORK_API_EXTENSIONS+=",router_availability_zone"
 NETWORK_API_EXTENSIONS+=",security-group"
+NETWORK_API_EXTENSIONS+=",segment"
 NETWORK_API_EXTENSIONS+=",service-type"
 NETWORK_API_EXTENSIONS+=",sorting"
 NETWORK_API_EXTENSIONS+=",standard-attr-description"
diff --git a/neutron/tests/contrib/hooks/segments b/neutron/tests/contrib/hooks/segments
new file mode 100644
index 00000000000..81e5f110531
--- /dev/null
+++ b/neutron/tests/contrib/hooks/segments
@@ -0,0 +1 @@
+enable_service neutron-segments