From bc0fdbc7e97b0216f26a20c35a9f53b271f10b14 Mon Sep 17 00:00:00 2001 From: Hemna Date: Wed, 10 Feb 2021 16:31:30 -0500 Subject: [PATCH] vmware: Use cookiejar from oslo.vmware client directly With changing the SOAP library backing oslo.vmware [1], the cookiejar of a session must be accessed differently. Therefore, oslo.vmware introduced a property on the client to abstract this change away. This commit uses the new place to access the attribute. [1] https://specs.openstack.org/openstack/oslo-specs/specs/victoria/oslo-vmware-soap-library-switch.html Change-Id: I8e3167debf9e378fe87c95974df2df94cf21bbd7 --- cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py | 2 +- cinder/volume/drivers/vmware/vmdk.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py b/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py index 4f784f3b1d9..cae4666722c 100644 --- a/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py +++ b/cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py @@ -2685,7 +2685,7 @@ class VMwareVcVmdkDriverTestCase(test.TestCase): ds_name, upload_file_path) vops.get_entity_name.assert_called_once_with(dc_ref) - cookies = session.vim.client.options.transport.cookiejar + cookies = session.vim.client.cookiejar if use_temp_image: mock_open.assert_called_once_with('/tmp/foo', 'rb') download_file.assert_called_once_with( diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py index 196ed6de9d9..833de20990e 100644 --- a/cinder/volume/drivers/vmware/vmdk.py +++ b/cinder/volume/drivers/vmware/vmdk.py @@ -990,7 +990,7 @@ class VMwareVcVmdkDriver(driver.VolumeDriver): port = self.configuration.vmware_host_port ca_file = self.configuration.vmware_ca_file insecure = self.configuration.vmware_insecure - cookies = self.session.vim.client.options.transport.cookiejar + cookies = self.session.vim.client.cookiejar dc_name = self.volumeops.get_entity_name(dc_ref) LOG.debug("Copying image: %(image_id)s to %(path)s.",