fix: properly check if endpoints are enabled

The existing functions to check for endpoints are wrong because they
just check for the service and not the endpoint. So if the service is
defined they will succeed but if there is no endpoint they won't. This
results in the quota code failing when setting quotas. Other places
fail in similar ways such as the limits code. This improves the checks
to actually check the endpoint instead of the service.

Partial-Bug: #2150251
Change-Id: I3bae6ada6a6025f1036b8b52319c67d5b28ba835
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>

Author: cardoe

openstackclient/common/clientmanager.py

@@ -156,11 +156,21 @@ def is_network_endpoint_enabled(self) -> bool:
         #                there is no Service Catalog, callers here are
         #                not expecting that so fold None into True to
         #                use Network API by default
-        return self.is_service_available('network') is not False
+        return (
+            self.is_service_available(
+                'network', self.region_name, self.interface
+            )
+            is not False
+        )
 
     def is_compute_endpoint_enabled(self) -> bool:
         """Check if Compute endpoint is enabled"""
-        return self.is_service_available('compute') is not False
+        return (
+            self.is_service_available(
+                'compute', self.region_name, self.interface
+            )
+            is not False
+        )
 
     # TODO(stephenfin): Drop volume_client argument in OSC 8.0 or later.
     def is_volume_endpoint_enabled(self, volume_client: Any = None) -> bool:
@@ -169,11 +179,26 @@ def is_volume_endpoint_enabled(self, volume_client: Any = None) -> bool:
         # Service Types Authority
         # https://service-types.openstack.org/service-types.json
         return (
-            self.is_service_available('block-storage') is not False
-            or self.is_service_available('volume') is not False
-            or self.is_service_available('volumev3') is not False
-            or self.is_service_available('volumev2') is not False
-            or self.is_service_available('block-store') is not False
+            self.is_service_available(
+                'block-storage', self.region_name, self.interface
+            )
+            is not False
+            or self.is_service_available(
+                'volume', self.region_name, self.interface
+            )
+            is not False
+            or self.is_service_available(
+                'volumev3', self.region_name, self.interface
+            )
+            is not False
+            or self.is_service_available(
+                'volumev2', self.region_name, self.interface
+            )
+            is not False
+            or self.is_service_available(
+                'block-store', self.region_name, self.interface
+            )
+            is not False
         )
 
 

requirements.txt

@@ -8,7 +8,7 @@ cryptography>=2.7 # BSD/Apache-2.0
 cliff>=4.13.0 # Apache-2.0
 iso8601>=0.1.11 # MIT
 openstacksdk>=4.12.0 # Apache-2.0
-osc-lib>=2.3.0 # Apache-2.0
+osc-lib>=4.6.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 python-keystoneclient>=3.22.0 # Apache-2.0
 python-cinderclient>=3.3.0 # Apache-2.0