Merge "Add qos rule type filtering"

2 files changed, 63 insertions, 0 deletions

diff --git a/openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py b/openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py
index 6b719cbe..4ead65cc 100644
--- a/openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py
+++ b/openstackclient/tests/functional/network/v2/test_network_qos_rule_type.py
@@ -21,6 +21,13 @@ class NetworkQosRuleTypeTests(common.NetworkTests):
 
     AVAILABLE_RULE_TYPES = ['dscp_marking',
                             'bandwidth_limit']
+    # NOTE(ralonsoh): this list was updated in Yoga (February 2022)
+    ALL_AVAILABLE_RULE_TYPES = ['dscp_marking',
+                                'bandwidth_limit',
+                                'minimum_bandwidth',
+                                'packet_rate_limit',
+                                'minimum_packet_rate',
+                                ]
 
     def setUp(self):
         super(NetworkQosRuleTypeTests, self).setUp()
@@ -36,6 +43,28 @@ class NetworkQosRuleTypeTests(common.NetworkTests):
         for rule_type in self.AVAILABLE_RULE_TYPES:
             self.assertIn(rule_type, [x['Type'] for x in cmd_output])
 
+    def test_qos_rule_type_list_all_supported(self):
+        if not self.is_extension_enabled('qos-rule-type-filter'):
+            self.skipTest('No "qos-rule-type-filter" extension present')
+
+        cmd_output = self.openstack(
+            'network qos rule type list --all-supported -f json',
+            parse_output=True
+        )
+        for rule_type in self.AVAILABLE_RULE_TYPES:
+            self.assertIn(rule_type, [x['Type'] for x in cmd_output])
+
+    def test_qos_rule_type_list_all_rules(self):
+        if not self.is_extension_enabled('qos-rule-type-filter'):
+            self.skipTest('No "qos-rule-type-filter" extension present')
+
+        cmd_output = self.openstack(
+            'network qos rule type list --all-rules -f json',
+            parse_output=True
+        )
+        for rule_type in self.ALL_AVAILABLE_RULE_TYPES:
+            self.assertIn(rule_type, [x['Type'] for x in cmd_output])
+
     def test_qos_rule_type_details(self):
         for rule_type in self.AVAILABLE_RULE_TYPES:
             cmd_output = self.openstack(
diff --git a/openstackclient/tests/unit/network/v2/test_network_qos_rule_type.py b/openstackclient/tests/unit/network/v2/test_network_qos_rule_type.py
index 08a83fab..3aae822e 100644
--- a/openstackclient/tests/unit/network/v2/test_network_qos_rule_type.py
+++ b/openstackclient/tests/unit/network/v2/test_network_qos_rule_type.py
@@ -115,3 +115,37 @@ class TestListNetworkQosRuleType(TestNetworkQosRuleType):
         self.network.qos_rule_types.assert_called_once_with(**{})
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
+
+    def test_qos_rule_type_list_all_supported(self):
+        arglist = [
+            '--all-supported'
+        ]
+        verifylist = [
+            ('all_supported', True),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network.qos_rule_types.assert_called_once_with(
+            **{'all_supported': True}
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))
+
+    def test_qos_rule_type_list_all_rules(self):
+        arglist = [
+            '--all-rules'
+        ]
+        verifylist = [
+            ('all_rules', True),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network.qos_rule_types.assert_called_once_with(
+            **{'all_rules': True}
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))