Merge "vmware: Use cookiejar from oslo.vmware client directly"
This commit is contained in:
commit
a7dd1f8881
|
@ -1225,12 +1225,7 @@ class FakeVim(object):
|
||||||
self.client = FakeClient()
|
self.client = FakeClient()
|
||||||
self.client.factory = FakeFactory()
|
self.client.factory = FakeFactory()
|
||||||
|
|
||||||
transport = DataObject()
|
self.client.cookiejar = "Fake-CookieJar"
|
||||||
transport.cookiejar = "Fake-CookieJar"
|
|
||||||
options = DataObject()
|
|
||||||
options.transport = transport
|
|
||||||
|
|
||||||
self.client.options = options
|
|
||||||
|
|
||||||
service_content = self.client.factory.create('ns0:ServiceContent')
|
service_content = self.client.factory.create('ns0:ServiceContent')
|
||||||
service_content.propertyCollector = "PropCollector"
|
service_content.propertyCollector = "PropCollector"
|
||||||
|
|
|
@ -212,7 +212,7 @@ class VMwareVMOps(object):
|
||||||
datastore, injected_files, admin_password,
|
datastore, injected_files, admin_password,
|
||||||
network_info):
|
network_info):
|
||||||
session_vim = self._session.vim
|
session_vim = self._session.vim
|
||||||
cookies = session_vim.client.options.transport.cookiejar
|
cookies = session_vim.client.cookiejar
|
||||||
dc_path = vutil.get_inventory_path(session_vim, dc_info.ref)
|
dc_path = vutil.get_inventory_path(session_vim, dc_info.ref)
|
||||||
uploaded_iso_path = self._create_config_drive(context,
|
uploaded_iso_path = self._create_config_drive(context,
|
||||||
instance,
|
instance,
|
||||||
|
@ -415,7 +415,7 @@ class VMwareVMOps(object):
|
||||||
dc_path = vutil.get_inventory_path(session.vim, vi.dc_info.ref)
|
dc_path = vutil.get_inventory_path(session.vim, vi.dc_info.ref)
|
||||||
|
|
||||||
host = self._session._host
|
host = self._session._host
|
||||||
cookies = session.vim.client.options.transport.cookiejar
|
cookies = session.vim.client.cookiejar
|
||||||
|
|
||||||
images.fetch_image(
|
images.fetch_image(
|
||||||
context,
|
context,
|
||||||
|
|
Loading…
Reference in New Issue