From 10b8243dc4802408212a4717fd5e12120127c367 Mon Sep 17 00:00:00 2001
From: Michael Still <mikal@stillhq.com>
Date: Tue, 16 Feb 2016 12:03:13 +1100
Subject: [PATCH] Cleanup unused conf variables

I noticed in nova that we had a lot of unused conf variables. I
wondered if this was a thing in other projects as well. Turns out
it is.

Change-Id: I641cee523068ec6824ae5243208a8ffd68331f5c
---
 neutron/tests/api/admin/test_shared_network_extension.py | 4 ----
 neutron/tests/api/test_address_scopes.py                 | 2 --
 neutron/tests/api/test_extension_driver_port_security.py | 2 --
 neutron/tests/api/test_qos.py                            | 3 ---
 neutron/tests/api/test_subnetpools.py                    | 2 --
 neutron/tests/api/test_subnetpools_negative.py           | 3 +--
 6 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/neutron/tests/api/admin/test_shared_network_extension.py b/neutron/tests/api/admin/test_shared_network_extension.py
index 0bdaf43f28f..8f107e37f38 100644
--- a/neutron/tests/api/admin/test_shared_network_extension.py
+++ b/neutron/tests/api/admin/test_shared_network_extension.py
@@ -22,10 +22,6 @@ from tempest_lib import exceptions as lib_exc
 import testtools
 
 from neutron.tests.api import base
-from neutron.tests.tempest import config
-
-
-CONF = config.CONF
 
 
 class SharedNetworksTest(base.BaseAdminNetworkTest):
diff --git a/neutron/tests/api/test_address_scopes.py b/neutron/tests/api/test_address_scopes.py
index b9d8934d160..1b78ca0e399 100644
--- a/neutron/tests/api/test_address_scopes.py
+++ b/neutron/tests/api/test_address_scopes.py
@@ -17,10 +17,8 @@ from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
-from neutron.tests.tempest import config
 
 
-CONF = config.CONF
 ADDRESS_SCOPE_NAME = 'smoke-address-scope'
 
 
diff --git a/neutron/tests/api/test_extension_driver_port_security.py b/neutron/tests/api/test_extension_driver_port_security.py
index 91f84cef095..4a01403583d 100644
--- a/neutron/tests/api/test_extension_driver_port_security.py
+++ b/neutron/tests/api/test_extension_driver_port_security.py
@@ -19,9 +19,7 @@ from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 from neutron.tests.api import base_security_groups as base_security
-from neutron.tests.tempest import config
 
-CONF = config.CONF
 FAKE_IP = '10.0.0.1'
 FAKE_MAC = '00:25:64:e8:19:dd'
 
diff --git a/neutron/tests/api/test_qos.py b/neutron/tests/api/test_qos.py
index 566b79c63ea..27784532a39 100644
--- a/neutron/tests/api/test_qos.py
+++ b/neutron/tests/api/test_qos.py
@@ -18,9 +18,6 @@ import testtools
 
 from neutron.services.qos import qos_consts
 from neutron.tests.api import base
-from neutron.tests.tempest import config
-
-CONF = config.CONF
 
 
 class QosTestJSON(base.BaseAdminNetworkTest):
diff --git a/neutron/tests/api/test_subnetpools.py b/neutron/tests/api/test_subnetpools.py
index 7beef94fd38..c758897b62d 100644
--- a/neutron/tests/api/test_subnetpools.py
+++ b/neutron/tests/api/test_subnetpools.py
@@ -17,9 +17,7 @@ from tempest import test
 from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base
-from neutron.tests.tempest import config
 
-CONF = config.CONF
 SUBNETPOOL_NAME = 'smoke-subnetpool'
 SUBNET_NAME = 'smoke-subnet'
 
diff --git a/neutron/tests/api/test_subnetpools_negative.py b/neutron/tests/api/test_subnetpools_negative.py
index 80d33749d10..c47544138a6 100644
--- a/neutron/tests/api/test_subnetpools_negative.py
+++ b/neutron/tests/api/test_subnetpools_negative.py
@@ -21,9 +21,8 @@ from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import test_subnetpools
-from neutron.tests.tempest import config
 
-CONF = config.CONF
+
 SUBNETPOOL_NAME = 'smoke-subnetpool'