Merge "Remove config import unused"
This commit is contained in:
commit
8f01e0b708
|
@ -13,15 +13,12 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from tempest import config
|
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.lib import exceptions as ex
|
from tempest.lib import exceptions as ex
|
||||||
from tempest import test
|
from tempest import test
|
||||||
|
|
||||||
from neutron_lbaas.tests.tempest.v2.api import base
|
from neutron_lbaas.tests.tempest.v2.api import base
|
||||||
|
|
||||||
CONF = config.CONF
|
|
||||||
|
|
||||||
|
|
||||||
class ListenersTestJSON(base.BaseTestCase):
|
class ListenersTestJSON(base.BaseTestCase):
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from tempest import config
|
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.lib.common.utils import test_utils
|
from tempest.lib.common.utils import test_utils
|
||||||
from tempest.lib import exceptions as ex
|
from tempest.lib import exceptions as ex
|
||||||
|
@ -23,9 +22,6 @@ from tempest import test
|
||||||
from neutron_lbaas.tests.tempest.v2.api import base
|
from neutron_lbaas.tests.tempest.v2.api import base
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
|
||||||
|
|
||||||
|
|
||||||
class LoadBalancersTestAdmin(base.BaseAdminTestCase):
|
class LoadBalancersTestAdmin(base.BaseAdminTestCase):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -13,16 +13,13 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from netaddr import IPAddress
|
import netaddr
|
||||||
from tempest import config
|
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.lib import exceptions as ex
|
from tempest.lib import exceptions as ex
|
||||||
from tempest import test
|
from tempest import test
|
||||||
|
|
||||||
from neutron_lbaas.tests.tempest.v2.api import base
|
from neutron_lbaas.tests.tempest.v2.api import base
|
||||||
|
|
||||||
CONF = config.CONF
|
|
||||||
|
|
||||||
|
|
||||||
class LoadBalancersTestJSON(base.BaseTestCase):
|
class LoadBalancersTestJSON(base.BaseTestCase):
|
||||||
|
|
||||||
|
@ -181,7 +178,7 @@ class LoadBalancersTestJSON(base.BaseTestCase):
|
||||||
vip_subnet_id=self.subnet['id'])
|
vip_subnet_id=self.subnet['id'])
|
||||||
self.addCleanup(self._delete_load_balancer, load_balancer['id'])
|
self.addCleanup(self._delete_load_balancer, load_balancer['id'])
|
||||||
load_balancer_ip_initial = load_balancer['vip_address']
|
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)
|
self.assertEqual(ip.version, 4)
|
||||||
load_balancer = self.load_balancers_client.get_load_balancer(
|
load_balancer = self.load_balancers_client.get_load_balancer(
|
||||||
load_balancer['id'])
|
load_balancer['id'])
|
||||||
|
|
Loading…
Reference in New Issue