openstack/openstacksdk
Code Issues Proposed changes

Merge "config: Handle interface list in CloudRegion.get_all_version_data"

Browse Source
This commit is contained in:
Zuul
2025-06-10 19:36:24 +00:00
committed by Gerrit Code Review
parent 15fbf2d868 7c1e42b417
commit 5e0c5334a3
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
openstack/config/cloud_region.py
View File

@@ -909,22 +909,36 @@ class CloudRegion:
def get_all_version_data( def get_all_version_data(
self, service_type: str self, service_type: str
) -> list[discover.VersionData]: ) -> list[discover.VersionData]:
"""Retrieve version data for the given service.
:param service_type: The service to fetch version data for.
:returns: A `~keystoneauth1.discover.VersionData` object containing the
version data for the requested service.
"""
# Seriously. Don't think about the existential crisis # Seriously. Don't think about the existential crisis
# that is the next line. You'll wind up in cthulhu's lair. # that is the next line. You'll wind up in cthulhu's lair.
service_type = self.get_service_type(service_type) service_type = self.get_service_type(service_type)
region_name = self.get_region_name(service_type) region_name = self.get_region_name(service_type)
assert region_name is not None # narrow type
interface = self.get_interface(service_type)
assert interface is not None # narrow type
interfaces = interface if isinstance(interface, list) else [interface]
versions = self.get_session().get_all_version_data( versions = self.get_session().get_all_version_data(
service_type=service_type, service_type=service_type,
interface=self.get_interface(service_type), interface=interface,
region_name=region_name, region_name=region_name,
) )
region_versions = versions.get(region_name, {}) # type: ignore region_versions = versions.get(region_name, {})
interface_versions = region_versions.get( for interface in interfaces:
self.get_interface(service_type), # type: ignore interface_versions = region_versions.get(interface, {})
{}, service_version_data = interface_versions.get(service_type)
) if service_version_data is not None:
return interface_versions.get(service_type, []) return service_version_data
return []
def _get_endpoint_from_catalog( def _get_endpoint_from_catalog(
self, self,

2
openstack/connection.py
View File

@@ -134,8 +134,8 @@ construct a Connection with the ``CONF`` object and an authenticated Session.
.. code-block:: python .. code-block:: python
from keystoneauth1 import loading as ks_loading from keystoneauth1 import loading as ks_loading
from oslo_config import cfg
from openstack import connection from openstack import connection
from oslo_config import cfg
CONF = cfg.CONF CONF = cfg.CONF