Merge "Fix all invalid obj_make_compatible test case"

Author: Zuul

nova/tests/unit/objects/test_block_device.py

@@ -395,27 +395,35 @@ def test_obj_load_attr_instance(self, mock_inst_get_by_uuid):
     def test_obj_make_compatible_pre_1_17(self):
         values = {'source_type': 'volume', 'volume_id': 'fake-vol-id',
                   'destination_type': 'volume',
-                  'instance_uuid': uuids.instance}
+                  'instance_uuid': uuids.instance, 'tag': 'fake-tag'}
         bdm = objects.BlockDeviceMapping(context=self.context, **values)
-        primitive = bdm.obj_to_primitive(target_version='1.16')
+        data = lambda x: x['nova_object.data']
+        primitive = data(bdm.obj_to_primitive(target_version='1.17'))
+        self.assertIn('tag', primitive)
+        primitive = data(bdm.obj_to_primitive(target_version='1.16'))
         self.assertNotIn('tag', primitive)
+        self.assertIn('volume_id', primitive)
 
     def test_obj_make_compatible_pre_1_18(self):
         values = {'source_type': 'volume', 'volume_id': 'fake-vol-id',
                   'destination_type': 'volume',
                   'instance_uuid': uuids.instance,
                   'attachment_id': uuids.attachment_id}
         bdm = objects.BlockDeviceMapping(context=self.context, **values)
-        primitive = bdm.obj_to_primitive(target_version='1.17')
+        data = lambda x: x['nova_object.data']
+        primitive = data(bdm.obj_to_primitive(target_version='1.17'))
         self.assertNotIn('attachment_id', primitive)
+        self.assertIn('volume_id', primitive)
 
     def test_obj_make_compatible_pre_1_19(self):
         values = {'source_type': 'volume', 'volume_id': 'fake-vol-id',
                   'destination_type': 'volume',
                   'instance_uuid': uuids.instance, 'uuid': uuids.bdm}
         bdm = objects.BlockDeviceMapping(context=self.context, **values)
-        primitive = bdm.obj_to_primitive(target_version='1.18')
+        data = lambda x: x['nova_object.data']
+        primitive = data(bdm.obj_to_primitive(target_version='1.18'))
         self.assertNotIn('uuid', primitive)
+        self.assertIn('volume_id', primitive)
 
 
 class TestBlockDeviceMappingUUIDMigration(test.TestCase):

nova/tests/unit/objects/test_build_request.py

@@ -166,8 +166,11 @@ def test_from_db_object_set_deleted(self):
     def test_obj_make_compatible_pre_1_3(self):
         obj = fake_build_request.fake_req_obj(self.context)
         build_request_obj = objects.BuildRequest(self.context)
-        obj_primitive = obj.obj_to_primitive()
+        data = lambda x: x['nova_object.data']
+        obj_primitive = data(obj.obj_to_primitive())
+        self.assertIn('tags', obj_primitive)
         build_request_obj.obj_make_compatible(obj_primitive, '1.2')
+        self.assertIn('instance_uuid', obj_primitive)
         self.assertNotIn('tags', obj_primitive)
 
     def test_create_with_tags_set(self):

nova/tests/unit/objects/test_flavor.py

@@ -361,8 +361,11 @@ def test_description(self, mock_notify):
 
         # Test compatibility.
         flavor.description = 'flavor descriptions are not backward compatible'
-        flavor_primitive = flavor.obj_to_primitive()
+        data = lambda x: x['nova_object.data']
+        flavor_primitive = data(flavor.obj_to_primitive())
+        self.assertIn('description', flavor_primitive)
         flavor.obj_make_compatible(flavor_primitive, '1.1')
+        self.assertIn('name', flavor_primitive)
         self.assertNotIn('description', flavor_primitive)
 
 

nova/tests/unit/objects/test_instance_group.py

@@ -297,7 +297,8 @@ def test_get_hosts(self, mock_get_db, mock_il_get):
 
     def test_obj_make_compatible(self):
         obj = objects.InstanceGroup(self.context, **_INST_GROUP_OBJ_VALS)
-        obj_primitive = obj.obj_to_primitive()
+        data = lambda x: x['nova_object.data']
+        obj_primitive = data(obj.obj_to_primitive())
         self.assertNotIn('metadetails', obj_primitive)
         obj.obj_make_compatible(obj_primitive, '1.6')
         self.assertEqual({}, obj_primitive['metadetails'])

nova/tests/unit/objects/test_instance_numa_topology.py

@@ -195,8 +195,12 @@ def test_obj_make_compatible_numa_cell_pre_1_4(self):
         topo_obj = objects.InstanceNUMACell(
             cpuset_reserved=set([1, 2]))
         versions = ovo_base.obj_tree_get_versions('InstanceNUMACell')
-        primitive = topo_obj.obj_to_primitive(target_version='1.3',
-                                              version_manifest=versions)
+        data = lambda x: x['nova_object.data']
+        primitive = data(topo_obj.obj_to_primitive(target_version='1.4',
+                                                   version_manifest=versions))
+        self.assertIn('cpuset_reserved', primitive)
+        primitive = data(topo_obj.obj_to_primitive(target_version='1.3',
+                                                   version_manifest=versions))
         self.assertNotIn('cpuset_reserved', primitive)
 
 

nova/tests/unit/objects/test_network_request.py

@@ -133,7 +133,10 @@ def test_no_allocate(self):
     def test_obj_make_compatible_pre_1_2(self):
         net_req = objects.NetworkRequest()
         net_req.tag = 'foo'
-        primitive = net_req.obj_to_primitive(target_version='1.1')
+        data = lambda x: x['nova_object.data']
+        primitive = data(net_req.obj_to_primitive(target_version='1.2'))
+        self.assertIn('tag', primitive)
+        primitive = data(net_req.obj_to_primitive(target_version='1.1'))
         self.assertNotIn('tag', primitive)
 
 

nova/tests/unit/objects/test_virtual_interface.py

@@ -145,9 +145,10 @@ def test_obj_make_compatible_pre_1_1(self):
         vif.instance_uuid = uuids.instance
         vif.uuid = uuids.uuid
         vif.tag = 'fake-tag'
-
-        primitive = vif.obj_to_primitive(target_version='1.0')
+        data = lambda x: x['nova_object.data']
+        primitive = data(vif.obj_to_primitive(target_version='1.0'))
         self.assertNotIn('tag', primitive)
+        self.assertIn('uuid', primitive)
 
 
 class TestVirtualInterfaceObject(test_objects._LocalTest,