Merge "api test: Check the correct extension"

neutron_lbaas/tests/tempest/v2/api/test_health_monitor_admin.py

@@ -39,7 +39,7 @@ class TestHealthMonitors(base.BaseAdminTestCase):
     @classmethod
     def resource_setup(cls):
         super(TestHealthMonitors, cls).resource_setup()
-        if not test.is_extension_enabled('lbaas', 'network'):
+        if not test.is_extension_enabled('lbaasv2', 'network'):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network-')

neutron_lbaas/tests/tempest/v2/api/test_health_monitors_non_admin.py

@@ -34,7 +34,7 @@ class TestHealthMonitors(base.BaseTestCase):
     @classmethod
     def resource_setup(cls):
         super(TestHealthMonitors, cls).resource_setup()
-        if not test.is_extension_enabled('lbaas', 'network'):
+        if not test.is_extension_enabled('lbaasv2', 'network'):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network-')

neutron_lbaas/tests/tempest/v2/api/test_listeners_admin.py

@@ -32,7 +32,7 @@ class ListenersTestJSON(base.BaseAdminTestCase):
     @classmethod
     def resource_setup(cls):
         super(ListenersTestJSON, cls).resource_setup()
-        if not test.is_extension_enabled('lbaas', 'network'):
+        if not test.is_extension_enabled('lbaasv2', 'network'):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network-')

neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py

@@ -36,7 +36,7 @@ class ListenersTestJSON(base.BaseTestCase):
     @classmethod
     def resource_setup(cls):
         super(ListenersTestJSON, cls).resource_setup()
-        if not test.is_extension_enabled('lbaas', 'network'):
+        if not test.is_extension_enabled('lbaasv2', 'network'):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network-')

neutron_lbaas/tests/tempest/v2/api/test_load_balancers_admin.py

@@ -38,7 +38,7 @@ class LoadBalancersTestAdmin(base.BaseAdminTestCase):
     @classmethod
     def resource_setup(cls):
         super(LoadBalancersTestAdmin, cls).resource_setup()
-        if not test.is_extension_enabled('lbaas', 'network'):
+        if not test.is_extension_enabled('lbaasv2', 'network'):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network')

neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py

@@ -37,7 +37,7 @@ class LoadBalancersTestJSON(base.BaseTestCase):
     @classmethod
     def resource_setup(cls):
         super(LoadBalancersTestJSON, cls).resource_setup()
-        if not test.is_extension_enabled('lbaas', 'network'):
+        if not test.is_extension_enabled('lbaasv2', 'network'):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network')

neutron_lbaas/tests/tempest/v2/api/test_members_admin.py

@@ -33,7 +33,7 @@ class MemberTestJSON(base.BaseAdminTestCase):
     @classmethod
     def resource_setup(cls):
         super(MemberTestJSON, cls).resource_setup()
-        if not test.is_extension_enabled("lbaas", "network"):
+        if not test.is_extension_enabled("lbaasv2", "network"):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network-')

neutron_lbaas/tests/tempest/v2/api/test_members_non_admin.py

@@ -38,7 +38,7 @@ class MemberTestJSON(base.BaseTestCase):
     @classmethod
     def resource_setup(cls):
         super(MemberTestJSON, cls).resource_setup()
-        if not test.is_extension_enabled("lbaas", "network"):
+        if not test.is_extension_enabled("lbaasv2", "network"):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network-')

neutron_lbaas/tests/tempest/v2/api/test_pools_admin.py

@@ -41,7 +41,7 @@ class TestPools(base.BaseAdminTestCase):
     @classmethod
     def resource_setup(cls):
         super(TestPools, cls).resource_setup()
-        if not test.is_extension_enabled('lbaas', 'network'):
+        if not test.is_extension_enabled('lbaasv2', 'network'):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network-')

neutron_lbaas/tests/tempest/v2/api/test_pools_non_admin.py

@@ -38,7 +38,7 @@ class TestPools(base.BaseTestCase):
     @classmethod
     def resource_setup(cls):
         super(TestPools, cls).resource_setup()
-        if not test.is_extension_enabled('lbaas', 'network'):
+        if not test.is_extension_enabled('lbaasv2', 'network'):
             msg = "lbaas extension not enabled."
             raise cls.skipException(msg)
         network_name = data_utils.rand_name('network-')