Merge "quota: Fix incorrect keypair usage in show command"

Author: Zuul

openstackclient/common/quota.py

@@ -804,6 +804,10 @@ def take_action(
             info["usage"].update(volume_quota_info.pop("usage", {}))
             info["usage"].update(network_quota_info.pop("usage", {}))
 
+            # Keypair usage is tracked per-user rather than per-project.
+            # To avoid mislead return N/A
+            info["usage"]["key_pairs"] = "N/A"
+
         info.update(compute_quota_info)
         info.update(volume_quota_info)
         info.update(network_quota_info)

openstackclient/tests/functional/common/test_quota.py

@@ -253,7 +253,10 @@ def test_quota_show_usage_option(self):
             self.assertEqual(sorted(expected_headers), sorted(row_headers))
             resources.append(row['Resource'])
             for header in expected_headers[1:]:
-                self.assertIsInstance(row[header], int)
+                if row['Resource'] == 'key-pairs' and header == 'In Use':
+                    self.assertEqual(row[header], "N/A")
+                else:
+                    self.assertIsInstance(row[header], int)
         # Ensure that returned quota has network quota...
         self.assertIn("networks", resources)
         # ...and compute quota

openstackclient/tests/unit/common/test_quota.py

@@ -1220,6 +1220,22 @@ def test_quota_show__with_usage(self):
             details=True,
         )
 
+    def test_quota_show__keypairs_usage_is_always_na(self):
+        """Verify that key-pair usage is overridden to N/A for project views."""
+        arglist = [
+            '--usage',
+            self.projects[0].name,
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, [('usage', True)])
+
+        _, data = self.cmd.take_action(parsed_args)
+
+        keypair_row = [row for row in data if row[0] == 'key-pairs']
+
+        self.assertTrue(keypair_row, "key-pairs row was missing from output")
+        # Ensure the third column (In Use / Usage) is exactly "N/A"
+        self.assertEqual("N/A", keypair_row[0][2])
+
     def test_quota_show__no_project(self):
         arglist = []
         verifylist = [