diff --git a/nova/tests/unit/virt/vmwareapi/fake.py b/nova/tests/unit/virt/vmwareapi/fake.py index d6aa1905aad5..55a8ee0a681a 100644 --- a/nova/tests/unit/virt/vmwareapi/fake.py +++ b/nova/tests/unit/virt/vmwareapi/fake.py @@ -1225,12 +1225,7 @@ class FakeVim(object): self.client = FakeClient() self.client.factory = FakeFactory() - transport = DataObject() - transport.cookiejar = "Fake-CookieJar" - options = DataObject() - options.transport = transport - - self.client.options = options + self.client.cookiejar = "Fake-CookieJar" service_content = self.client.factory.create('ns0:ServiceContent') service_content.propertyCollector = "PropCollector" diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py index 993a4ce24e64..c1c9d4421d78 100644 --- a/nova/virt/vmwareapi/vmops.py +++ b/nova/virt/vmwareapi/vmops.py @@ -212,7 +212,7 @@ class VMwareVMOps(object): datastore, injected_files, admin_password, network_info): 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) uploaded_iso_path = self._create_config_drive(context, instance, @@ -415,7 +415,7 @@ class VMwareVMOps(object): dc_path = vutil.get_inventory_path(session.vim, vi.dc_info.ref) host = self._session._host - cookies = session.vim.client.options.transport.cookiejar + cookies = session.vim.client.cookiejar images.fetch_image( context,