Merge "tests: Handle missing extensions in network tests"

Author: Zuul

openstackclient/tests/functional/network/v2/test_network_agent.py

@@ -15,9 +15,15 @@
 from openstackclient.tests.functional.network.v2 import common
 
 
-class NetworkAgentTests(common.NetworkTests):
+class TestAgent(common.NetworkTests):
     """Functional tests for network agent"""
 
+    def setUp(self):
+        super().setUp()
+
+        if not self.is_extension_enabled("agent"):
+            self.skipTest("No agent extension present")
+
     def test_network_agent_list_show_set(self):
         """Test network agent list, set, show commands
 
@@ -79,9 +85,15 @@ def test_network_agent_list_show_set(self):
         )
 
 
-class NetworkAgentListTests(common.NetworkTests):
+class TestAgentList(common.NetworkTests):
     """Functional test for network agent"""
 
+    def setUp(self):
+        super().setUp()
+
+        if not self.is_extension_enabled("agent"):
+            self.skipTest("No agent extension present")
+
     def test_network_dhcp_agent_list(self):
         """Test network agent list"""
 

openstackclient/tests/functional/network/v2/test_network_meter.py

@@ -21,6 +21,12 @@
 class TestMeter(common.NetworkTests):
     """Functional tests for network meter"""
 
+    def setUp(self):
+        super().setUp()
+
+        if not self.is_extension_enabled("metering"):
+            self.skipTest("No metering extension present")
+
     # NOTE(dtroyer): Do not normalize the setup and teardown of the resource
     #                creation and deletion.  Little is gained when each test
     #                has its own needs and there are collisions when running

openstackclient/tests/functional/network/v2/test_network_meter_rule.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import unittest
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -27,6 +28,10 @@ class TestMeterRule(common.NetworkTests):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
+
+        if not cls.is_extension_enabled("metering"):
+            raise unittest.SkipTest("No metering extension present")
+
         if cls.haz_network:
             cls.METER_NAME = uuid.uuid4().hex
 
@@ -47,12 +52,6 @@ def tearDownClass(cls):
         finally:
             super().tearDownClass()
 
-    def setUp(self):
-        super().setUp()
-
-        if not self.is_extension_enabled("metering"):
-            self.skipTest("No metering extension present")
-
     def test_meter_rule_delete(self):
         """test create, delete"""
         json_output = self.openstack(

openstackclient/tests/functional/network/v2/test_network_qos_policy.py

@@ -21,6 +21,12 @@
 class NetworkQosPolicyTests(common.NetworkTests):
     """Functional tests for QoS policy"""
 
+    def setUp(self):
+        super().setUp()
+
+        if not self.is_extension_enabled("qos"):
+            self.skipTest("No qos extension present")
+
     def test_qos_rule_create_delete(self):
         # This is to check the output of qos policy delete
         policy_name = uuid.uuid4().hex

openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py

@@ -29,6 +29,12 @@ class NetworkQosRuleTypeTests(common.NetworkTests):
         'minimum_packet_rate',
     ]
 
+    def setUp(self):
+        super().setUp()
+
+        if not self.is_extension_enabled("qos"):
+            self.skipTest("No qos extension present")
+
     def test_qos_rule_type_list(self):
         cmd_output = self.openstack(
             'network qos rule type list -f json',