From 0081aaa38048539c2da9a6adfe0e0d7945d688df Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Mon, 7 Jan 2019 13:14:29 +0100
Subject: [PATCH] Remove hooks for dsvm-scenario-linuxbridge

This job is used only in stable/ocata branch so there is no need to
keep those hooks in master branch anymore.

Change-Id: I65f712934314122da0bb2f14d1e3fe9cbd5dd759
---
 neutron/tests/contrib/gate_hook.sh             | 18 ++++--------------
 neutron/tests/contrib/hooks/iptables_verify    |  4 ----
 .../contrib/hooks/linuxbridge_type_drivers     | 12 ------------
 3 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 neutron/tests/contrib/hooks/iptables_verify
 delete mode 100644 neutron/tests/contrib/hooks/linuxbridge_type_drivers

diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh
index a613cfd2a4f..78d1a730326 100644
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@@ -91,7 +91,7 @@ case $VENV in
     load_rc_hook dstat
     ;;
 
-"api"|"api-pecan"|"full-pecan"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
+"api"|"api-pecan"|"full-pecan"|"dsvm-scenario-ovs")
     # TODO(ihrachys) consider feeding result of ext-list into tempest.conf
     load_rc_hook api_all_extensions
     if [ "${FLAVOR}" = "dvrskip" ]; then
@@ -106,25 +106,15 @@ case $VENV in
     load_conf_hook vlan_provider
     load_conf_hook osprofiler
     load_conf_hook availability_zone
+    load_conf_hook tunnel_types
+    load_rc_hook log  # bug 1743463
+    load_conf_hook openvswitch_type_drivers
     if [[ "$VENV" =~ "dsvm-scenario" ]]; then
         load_rc_hook ubuntu_image
     fi
-    if [[ "$VENV" =~ "dsvm-scenario-linuxbridge" ]]; then
-        load_conf_hook iptables_verify
-    fi
     if [[ "$VENV" =~ "pecan" ]]; then
         load_conf_hook pecan
     fi
-    if [[ "$VENV" != "dsvm-scenario-linuxbridge" ]]; then
-        load_conf_hook tunnel_types
-        load_rc_hook log  # bug 1743463
-    fi
-    if [[ "$VENV" =~ "dsvm-scenario-linuxbridge" ]]; then
-        # linuxbridge doesn't support gre
-        load_conf_hook linuxbridge_type_drivers
-    else
-        load_conf_hook openvswitch_type_drivers
-    fi
     if [[ "$FLAVOR" = "dvrskip" ]]; then
         load_conf_hook disable_dvr
     fi
diff --git a/neutron/tests/contrib/hooks/iptables_verify b/neutron/tests/contrib/hooks/iptables_verify
deleted file mode 100644
index 72cbd1aeb57..00000000000
--- a/neutron/tests/contrib/hooks/iptables_verify
+++ /dev/null
@@ -1,4 +0,0 @@
-[[post-config|/etc/neutron/neutron.conf]]
-
-[AGENT]
-debug_iptables_rules=True
diff --git a/neutron/tests/contrib/hooks/linuxbridge_type_drivers b/neutron/tests/contrib/hooks/linuxbridge_type_drivers
deleted file mode 100644
index 87370ad5e38..00000000000
--- a/neutron/tests/contrib/hooks/linuxbridge_type_drivers
+++ /dev/null
@@ -1,12 +0,0 @@
-[[test-config|$TEMPEST_CONFIG]]
-
-[neutron_plugin_options]
-available_type_drivers=flat,vlan,local,vxlan
-
-[[post-config|/$NEUTRON_CORE_PLUGIN_CONF]]
-
-[ml2]
-type_drivers=flat,vlan,local,vxlan
-
-[ml2_type_vxlan]
-vni_ranges = 1:2000