From 92651a125caec474af60040e4eaf48e5e85005fe Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 28 Nov 2024 17:46:13 +0100 Subject: [PATCH] Fix cinder client initialization vimconn_openstack This commit changes the setup of cinder client version, trying first version v3 if the service exists, instead of the default client which was v2. Change-Id: I9c63a0d3a5fa44597d633cc5db79ae0a783c66ff Signed-off-by: garciadeblas --- .../osm_rovim_openstack/vimconn_openstack.py | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py index 7b27e251..e9d40620 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py @@ -327,17 +327,19 @@ class vimconnector(vimconn.VimConnector): ) sess = session.Session(auth=auth, verify=self.verify) - # addedd region_name to keystone, nova, neutron and cinder to support distributed cloud for Wind River + # added region_name to keystone, nova, neutron and cinder to support distributed cloud for Wind River # Titanium cloud and StarlingX region_name = self.config.get("region_name") if self.api_version3: + self.logger.debug(f"Using Keystone client v3 for VIM {self.id}") self.keystone = ksClient_v3.Client( session=sess, endpoint_type=self.endpoint_type, region_name=region_name, ) else: + self.logger.debug(f"Using Keystone client v2 for VIM {self.id}") self.keystone = ksClient_v2.Client( session=sess, endpoint_type=self.endpoint_type ) @@ -369,7 +371,18 @@ class vimconnector(vimconn.VimConnector): region_name=region_name, ) - if sess.get_all_version_data(service_type="volumev2"): + if sess.get_all_version_data(service_type="volumev3"): + self.logger.debug(f"Using Cinder client v3 for VIM {self.id}") + self.cinder = self.session["cinder"] = cClient.Client( + 3, + session=sess, + endpoint_type=self.endpoint_type, + region_name=region_name, + ) + elif sess.get_all_version_data(service_type="volumev2"): + self.logger.debug( + f"Service type volumev3 not found. Using Cinder client v2 for VIM {self.id}" + ) self.cinder = self.session["cinder"] = cClient.Client( 2, session=sess, @@ -377,6 +390,9 @@ class vimconnector(vimconn.VimConnector): region_name=region_name, ) else: + self.logger.debug( + f"Service type not found. Using Cinder client v3 for VIM {self.id}" + ) self.cinder = self.session["cinder"] = cClient.Client( 3, session=sess, -- 2.25.1