Merge "xenapi: Make dom0 serialization consistent."

2 files changed, 9 insertions, 4 deletions

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index ea6ed857c..2bf7429bd 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -2105,6 +2105,10 @@ class VmUtilsTestCase(test.TestCase):
             def call_plugin(session_self, service, command, kwargs):
                 self.kwargs = kwargs
 
+            def call_plugin_serialized(session_self, service, command, *args,
+                            **kwargs):
+                self.kwargs = kwargs
+
         def fake_dumps(thing):
             return thing
 
@@ -2119,7 +2123,7 @@ class VmUtilsTestCase(test.TestCase):
         session = FakeSession()
         vm_utils.upload_image(ctx, session, instance, "vmi uuids", "image id")
 
-        actual = self.kwargs['params']['properties']
+        actual = self.kwargs['properties']
         expected = dict(a=1, b=2, c='c', d='d',
                         auto_disk_config='auto disk config',
                         os_type='os type')
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index bb31a5327..3bfdd3dbe 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -16,6 +16,7 @@
 """Stubouts, mocks and fixtures for the test suite"""
 
 import contextlib
+import pickle
 import random
 import sys
 
@@ -169,7 +170,7 @@ class FakeSessionForVMTests(fake.SessionBase):
     def host_call_plugin(self, _1, _2, plugin, method, _5):
         if (plugin, method) == ('glance', 'download_vhd'):
             root_uuid = _make_fake_vdi()
-            return jsonutils.dumps(dict(root=dict(uuid=root_uuid)))
+            return pickle.dumps(dict(root=dict(uuid=root_uuid)))
         elif (plugin, method) == ("xenhost", "iptables_config"):
             return fake.as_json(out=self._fake_iptables_save_output,
                                 err='')
@@ -181,8 +182,8 @@ class FakeSessionForVMTests(fake.SessionBase):
         if (plugin, method) == ('glance', 'download_vhd'):
             root_uuid = _make_fake_vdi()
             swap_uuid = _make_fake_vdi()
-            return jsonutils.dumps(dict(root=dict(uuid=root_uuid),
-                                        swap=dict(uuid=swap_uuid)))
+            return pickle.dumps(dict(root=dict(uuid=root_uuid),
+                                     swap=dict(uuid=swap_uuid)))
         else:
             return (super(FakeSessionForVMTests, self).
                     host_call_plugin(_1, _2, plugin, method, _5))