Merge "Fix showing network quotas for a project"

1 files changed, 7 insertions, 4 deletions

diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py
index 480abbd9..f208948e 100644
--- a/openstackclient/common/quota.py
+++ b/openstackclient/common/quota.py
@@ -188,10 +188,13 @@ class ShowQuota(command.ShowOne):
     def get_network_quota(self, parsed_args):
         if parsed_args.quota_class or parsed_args.default:
             return {}
-        service_catalog = self.app.client_manager.auth_ref.service_catalog
-        if 'network' in service_catalog.get_endpoints():
-            network_client = self.app.client_manager.network
-            return network_client.show_quota(parsed_args.project)['quota']
+        if self.app.client_manager.is_network_endpoint_enabled():
+            identity_client = self.app.client_manager.identity
+            project = utils.find_resource(
+                identity_client.projects,
+                parsed_args.project,
+                ).id
+            return self.app.client_manager.network.get_quota(project)
         else:
             return {}