From f9455cd94fd50f8c79fbdd50a6be3293cd66b1d8 Mon Sep 17 00:00:00 2001
From: Adit Sarfaty <asarfaty@vmware.com>
Date: Wed, 15 May 2019 15:34:39 +0300
Subject: [PATCH] Remove tests/tempest path from devstack and tox

Commit I3082962841d3b645f3cbd1a6b41fc7fb28dcf7e6 removed
octavia/tests/tempest directory
This patch removed other references to this path.

Change-Id: I665503aa4f69308ff31be53824b26faea13d2ad1
---
 devstack/plugin.sh | 20 --------------------
 devstack/settings  |  3 ---
 tox.ini            | 22 ----------------------
 3 files changed, 45 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a048ca05cd..db7bf57c46 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -428,16 +428,6 @@ function configure_lb_mgmt_sec_grp {
     iniset ${OCTAVIA_CONF} controller_worker amp_secgroup_list ${OCTAVIA_MGMT_SEC_GRP_ID}
 }
 
-function configure_octavia_tempest {
-    # Load the amp_boot_network_list to tempest.conf and copy to tree
-
-    # TODO (ptoohill): remove check when tempest structure merges
-    if ! [ $OCTAVIA_TEMPEST == 'disabled' ] ; then
-        iniset $TEMPEST_CONFIG controller_worker amp_boot_network_list [$1]
-        cp $TEMPEST_CONFIG $OCTAVIA_TEMPEST_DIR/etc
-    fi
-}
-
 function create_amphora_flavor {
     # Pass even if it exists to avoid race condition on multinode
     openstack flavor create --id auto --ram 1024 --disk ${OCTAVIA_AMP_IMAGE_SIZE:-2} --vcpus 1 --private m1.amphora -f value -c id || true
@@ -598,20 +588,10 @@ function octavia_init {
 
        create_octavia_accounts
 
-       # Adds service and endpoint
-       if is_service_enabled tempest; then
-           configure_octavia_tempest ${OCTAVIA_AMP_NETWORK_ID}
-       fi
-
        add_load-balancer_roles
    elif [ $OCTAVIA_NODE == 'api' ] ; then
        create_octavia_accounts
 
-       # Adds service and endpoint
-       if is_service_enabled tempest; then
-           configure_octavia_tempest ${OCTAVIA_AMP_NETWORK_ID}
-       fi
-
        add_load-balancer_roles
    fi
 
diff --git a/devstack/settings b/devstack/settings
index d4e2fc7b1c..f882fa7557 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -15,7 +15,6 @@ OCTAVIA_DHCLIENT_DIR=${OCTAVIA_DHCLIENT_DIR:-"/etc/dhcp/octavia"}
 OCTAVIA_DHCLIENT_CONF=${OCTAVIA_DHCLIENT_CONF:-${OCTAVIA_DHCLIENT_DIR}/dhclient.conf}
 OCTAVIA_CONF=${OCTAVIA_CONF:-${OCTAVIA_CONF_DIR}/octavia.conf}
 OCTAVIA_AUDIT_MAP=${OCTAVIA_AUDIT_MAP:-${OCTAVIA_CONF_DIR}/octavia_api_audit_map.conf}
-OCTAVIA_TEMPEST_DIR=${OCTAVIA_TEMPEST_DIR:-${OCTAVIA_DIR}/octavia/tests/tempest}
 OCTAVIA_RUN_DIR=${OCTAVIA_RUN_DIR:-"/var/run/octavia"}
 
 OCTAVIA_AMPHORA_DRIVER=${OCTAVIA_AMPHORA_DRIVER:-"amphora_haproxy_rest_driver"}
@@ -70,8 +69,6 @@ OCTAVIA_HOUSEKEEPER_ARGS=${OCTAVIA_HOUSEKEEPER_ARGS:-" --config-file $OCTAVIA_CO
 OCTAVIA_HEALTHMANAGER_ARGS=${OCTAVIA_HEALTHMANAGER_ARGS:-" --config-file $OCTAVIA_CONF"}
 OCTAVIA_DRIVER_AGENT_ARGS=${OCTAVIA_DRIVER_AGENT_ARGS:-" --config-file $OCTAVIA_CONF"}
 
-OCTAVIA_TEMPEST=${OCTAVIA_TEMPEST:-"disabled"}
-
 OCTAVIA_API="o-api"
 OCTAVIA_CONSUMER="o-cw"
 OCTAVIA_HOUSEKEEPER="o-hk"
diff --git a/tox.ini b/tox.ini
index 891c50e6b5..289d66d0b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -160,28 +160,6 @@ commands =
   rm -rf releasenotes/build
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
-# If you are running the tests locally you should set the env variable
-# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
-[testenv:apiv1]
-basepython = python3
-passenv = TEMPEST_CONFIG_DIR
-setenv =
- OS_TEST_PATH={toxinidir}/octavia/tests/tempest/v1/api
-commands =
-  stestr run --concurrency 1 {posargs}
-  stestr slowest
-
-# If you are running the tests locally you should set the env variable
-# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
-[testenv:scenario]
-basepython = python3
-passenv = TEMPEST_CONFIG_DIR
-setenv =
- OS_TEST_PATH={toxinidir}/octavia/tests/tempest/v1/scenario
-commands =
-  stestr run --concurrency 1 {posargs}
-  stestr slowest
-
 [testenv:lower-constraints]
 basepython = python3
 deps =