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

Author: Zuul

nova/tests/unit/virt/vmwareapi/fake.py

@@ -1225,12 +1225,7 @@ def __init__(self, protocol="https", host="localhost", trace=None):
         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"

nova/virt/vmwareapi/vmops.py

@@ -212,7 +212,7 @@ def _configure_config_drive(self, context, instance, vm_ref, dc_info,
                                 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 @@ def _fetch_image_as_file(self, context, vi, image_ds_loc):
             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,