Merge "Add --router-routes option to quota commands"

Author: Zuul

openstackclient/common/quota.py

@@ -71,6 +71,7 @@
     'subnet': 'subnets',
     'port': 'ports',
     'router': 'routers',
+    'router_route': 'router-routes',
     'rbac_policy': 'rbac-policies',
     'subnetpool': 'subnetpools',
 }
@@ -79,6 +80,7 @@
     'floating_ips',
     'networks',
     'rbac_policies',
+    'router_routes',
     'routers',
     'ports',
     'security_group_rules',
@@ -439,6 +441,7 @@ def _list_quota_network(
             'networks',
             'ports',
             'rbac_policies',
+            'router_routes',
             'routers',
             'security_groups',
             'security_group_rules',
@@ -451,6 +454,7 @@ def _list_quota_network(
             'Networks',
             'Ports',
             'RBAC Policies',
+            'Router Routes',
             'Routers',
             'Security Groups',
             'Security Group Rules',

openstackclient/tests/unit/common/test_quota.py

@@ -68,6 +68,7 @@ class TestQuotaList(TestQuota):
         'Networks',
         'Ports',
         'RBAC Policies',
+        'Router Routes',
         'Routers',
         'Security Groups',
         'Security Group Rules',
@@ -134,6 +135,10 @@ def setUp(self):
             self.network_quotas[0].networks,
             self.network_quotas[0].ports,
             self.network_quotas[0].rbac_policies,
+            # TODO(ralonsoh): restore once [1] is merged and released.
+            # [1]https://review.opendev.org/c/openstack/openstacksdk/+/991063
+            # self.network_quotas[0].router_routes,
+            getattr(self.network_quotas[0], 'router_routes', ''),
             self.network_quotas[0].routers,
             self.network_quotas[0].security_groups,
             self.network_quotas[0].security_group_rules,
@@ -948,6 +953,7 @@ class TestQuotaShow(TestQuota):
         'pools': {'limit': 0, 'reserved': 0, 'used': 0},
         'ports': {'limit': 0, 'reserved': 0, 'used': 0},
         'rbac_policies': {'limit': 0, 'reserved': 0, 'used': 0},
+        'router_routes': {'limit': 0, 'reserved': 0, 'used': 0},
         'routers': {'limit': 0, 'reserved': 0, 'used': 0},
         'security_group_rules': {'limit': 0, 'reserved': 0, 'used': 0},
         'security_groups': {'limit': 0, 'reserved': 0, 'used': 0},
@@ -1146,6 +1152,7 @@ def test_quota_show__with_network_and_usage(self):
                 ('pools', 0, 0, 0),
                 ('ports', 0, 0, 0),
                 ('rbac_policies', 0, 0, 0),
+                ('router_routes', 0, 0, 0),
                 ('routers', 0, 0, 0),
                 ('security_group_rules', 9, 5, 7),
                 ('security_groups', 0, 0, 0),

releasenotes/notes/add-router-routes-quota-option-c4d5e6f789012345.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Added ``--router-routes`` option to the ``quota set`` command and
+    ``router_routes`` to the ``quota show`` and ``quota list --network``
+    output. This exposes the new Neutron ``router_route`` per-project
+    quota that controls the total number of extra routes across all
+    routers in a project.