Merge "Switch to tempest.common.utils.is_extension_enabled"

neutron/tests/tempest/api/base.py

@@ -17,6 +17,7 @@ import functools
 import math
 
 import netaddr
+from tempest.common import utils as tutils
 from tempest.lib.common.utils import data_utils
 from tempest.lib import exceptions as lib_exc
 from tempest import test
@@ -77,7 +78,7 @@ class BaseNetworkTest(test.BaseTestCase):
         if cls._ip_version == 6 and not CONF.network_feature_enabled.ipv6:
             raise cls.skipException("IPv6 Tests are disabled.")
         for req_ext in getattr(cls, 'required_extensions', []):
-            if not test.is_extension_enabled(req_ext, 'network'):
+            if not tutils.is_extension_enabled(req_ext, 'network'):
                 msg = "%s extension not enabled." % req_ext
                 raise cls.skipException(msg)
 
@@ -558,7 +559,7 @@ def require_qos_rule_type(rule_type):
 def _require_sorting(f):
     @functools.wraps(f)
     def inner(self, *args, **kwargs):
-        if not test.is_extension_enabled("sorting", "network"):
+        if not tutils.is_extension_enabled("sorting", "network"):
             self.skipTest('Sorting feature is required')
         return f(self, *args, **kwargs)
     return inner
@@ -567,7 +568,7 @@ def _require_sorting(f):
 def _require_pagination(f):
     @functools.wraps(f)
     def inner(self, *args, **kwargs):
-        if not test.is_extension_enabled("pagination", "network"):
+        if not tutils.is_extension_enabled("pagination", "network"):
             self.skipTest('Pagination feature is required')
         return f(self, *args, **kwargs)
     return inner

neutron/tests/tempest/api/test_extensions.py

@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.common import utils
 from tempest.lib import decorators
-from tempest import test
 
 from neutron.tests.tempest.api import base
 
@@ -22,7 +22,7 @@ class ExtensionsTest(base.BaseNetworkTest):
         body = self.client.list_extensions()
         extensions = {ext_['alias'] for ext_ in body['extensions']}
         self.assertNotEmpty(extensions, "Extension list returned is empty")
-        ext_enabled = test.is_extension_enabled(ext, "network")
+        ext_enabled = utils.is_extension_enabled(ext, "network")
         if ext_enabled:
             self.assertIn(ext, extensions)
         else:

neutron/tests/tempest/api/test_networks.py

@@ -15,7 +15,6 @@
 
 from tempest.common import utils
 from tempest.lib import decorators
-from tempest import test
 import testtools
 
 from neutron.tests.tempest.api import base
@@ -46,13 +45,13 @@ class NetworksTestJSON(base.BaseNetworkTest):
         body = self.client.show_network(self.network['id'])
         network = body['network']
         fields = ['id', 'name']
-        if test.is_extension_enabled('net-mtu', 'network'):
+        if utils.is_extension_enabled('net-mtu', 'network'):
             fields.append('mtu')
         for key in fields:
             self.assertEqual(network[key], self.network[key])
         project_id = self.client.tenant_id
         self.assertEqual(project_id, network['tenant_id'])
-        if test.is_extension_enabled('project-id', 'network'):
+        if utils.is_extension_enabled('project-id', 'network'):
             self.assertEqual(project_id, network['project_id'])
 
     @decorators.idempotent_id('26f2b7a5-2cd1-4f3a-b11f-ad259b099b11')