diff --git a/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py index def12e884..9083984fd 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py @@ -13,15 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import exceptions as ex from tempest import test from neutron_lbaas.tests.tempest.v2.api import base -CONF = config.CONF - class ListenersTestJSON(base.BaseTestCase): diff --git a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_admin.py index 450457b4c..3ec65bd25 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_admin.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import exceptions as ex @@ -23,9 +22,6 @@ from tempest import test from neutron_lbaas.tests.tempest.v2.api import base -CONF = config.CONF - - class LoadBalancersTestAdmin(base.BaseAdminTestCase): """ diff --git a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py index dda4d54d0..a453b42cd 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py @@ -13,16 +13,13 @@ # License for the specific language governing permissions and limitations # under the License. -from netaddr import IPAddress -from tempest import config +import netaddr from tempest.lib.common.utils import data_utils from tempest.lib import exceptions as ex from tempest import test from neutron_lbaas.tests.tempest.v2.api import base -CONF = config.CONF - class LoadBalancersTestJSON(base.BaseTestCase): @@ -181,7 +178,7 @@ class LoadBalancersTestJSON(base.BaseTestCase): vip_subnet_id=self.subnet['id']) self.addCleanup(self._delete_load_balancer, load_balancer['id']) load_balancer_ip_initial = load_balancer['vip_address'] - ip = IPAddress(load_balancer_ip_initial) + ip = netaddr.IPAddress(load_balancer_ip_initial) self.assertEqual(ip.version, 4) load_balancer = self.load_balancers_client.get_load_balancer( load_balancer['id'])