openstack
/
os-brick
Code Issues Proposed changes

Merge "vmware: Use cookiejar from oslo.vmware client directly"

This commit is contained in:
Zuul 2021-05-21 17:21:18 +00:00 committed by Gerrit Code Review
parent 30c0d286fe 985a49bec1
commit f154ad4adc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_brick/initiator/connectors/vmware.py
View File

@ -261,7 +261,7 @@ class VmdkConnector(initiator_connector.InitiatorConnector):
with open(tmp_file_path, "rb") as tmp_file:
dc_name = session.invoke_api(
vim_util, 'get_object_property', session.vim, dc_ref, 'name')
cookies = session.vim.client.options.transport.cookiejar
cookies = session.vim.client.cookiejar
cacerts = self._ca_file if self._ca_file else not self._insecure
self._upload_vmdk(
tmp_file, self._ip, self._port, dc_name, dstore.name, cookies,

2
os_brick/tests/initiator/connectors/test_vmware.py
View File

@ -270,7 +270,7 @@ class VmdkConnectorTestCase(test_connector.ConnectorTestCase):
exp_rel_path = '%s/foo.vmdk' % tmp_folder_path
upload_vmdk.assert_called_once_with(
tmp_file, self._connector._ip, self._connector._port, dc_name,
ds_name, session.vim.client.options.transport.cookiejar,
ds_name, session.vim.client.cookiejar,
exp_rel_path, units.Gi, self._connector._ca_file,
self._connector._timeout)