diff options
author | Zuul <zuul@review.openstack.org> | 2018-07-18 12:24:18 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-07-18 12:24:19 +0000 |
commit | eb4f65a7951e921b1cd8d05713e144e72f2f254f (patch) | |
tree | 6817240f81acc188b0e299e46b3d8a4a5e419548 /nova/tests/unit/objects/test_request_spec.py | |
parent | 98d09d519f71e6179497e02704449fb05b97ba55 (diff) | |
parent | 51248a4c01ec388c31b633cd95e90207d4b831d2 (diff) | |
download | nova-eb4f65a7951e921b1cd8d05713e144e72f2f254f.tar.gz |
Merge "objects: Add RequestSpec.network_metadata"
Diffstat (limited to 'nova/tests/unit/objects/test_request_spec.py')
-rw-r--r-- | nova/tests/unit/objects/test_request_spec.py | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/nova/tests/unit/objects/test_request_spec.py b/nova/tests/unit/objects/test_request_spec.py index 9852232f55..770f6b9d86 100644 --- a/nova/tests/unit/objects/test_request_spec.py +++ b/nova/tests/unit/objects/test_request_spec.py @@ -299,7 +299,7 @@ class _TestRequestSpecObject(object): spec = objects.RequestSpec.from_primitives(ctxt, spec_dict, filt_props) mock_limits.assert_called_once_with({}) # Make sure that all fields are set using that helper method - skip = ['id', 'security_groups'] + skip = ['id', 'security_groups', 'network_metadata'] for field in [f for f in spec.obj_fields if f not in skip]: self.assertTrue(spec.obj_attr_is_set(field), 'Field: %s is not set' % field) @@ -329,7 +329,8 @@ class _TestRequestSpecObject(object): filter_properties, instance_group, instance.availability_zone, objects.SecurityGroupList()) # Make sure that all fields are set using that helper method - for field in [f for f in spec.obj_fields if f != 'id']: + skip = ['id', 'network_metadata'] + for field in [f for f in spec.obj_fields if f not in skip]: self.assertTrue(spec.obj_attr_is_set(field), 'Field: %s is not set' % field) # just making sure that the context is set by the method @@ -542,7 +543,7 @@ class _TestRequestSpecObject(object): # object fields for field in ['image', 'numa_topology', 'pci_requests', 'flavor', - 'limits']: + 'limits', 'network_metadata']: self.assertEqual( getattr(req_obj, field).obj_to_primitive(), getattr(serialized_obj, field).obj_to_primitive()) @@ -641,6 +642,18 @@ class _TestRequestSpecObject(object): self.assertNotIn('user_id', primitive) self.assertIn('project_id', primitive) + def test_compat_network_metadata(self): + network_metadata = objects.NetworkMetadata(physnets=set(), + tunneled=False) + req_obj = objects.RequestSpec(network_metadata=network_metadata, + user_id=fakes.FAKE_USER_ID) + versions = ovo_base.obj_tree_get_versions('RequestSpec') + primitive = req_obj.obj_to_primitive(target_version='1.9', + version_manifest=versions) + primitive = primitive['nova_object.data'] + self.assertNotIn('network_metadata', primitive) + self.assertIn('user_id', primitive) + def test_default_requested_destination(self): req_obj = objects.RequestSpec() self.assertIsNone(req_obj.requested_destination) @@ -652,6 +665,13 @@ class _TestRequestSpecObject(object): objects.SecurityGroupList) self.assertIn('security_groups', req_obj) + def test_network_requests_load(self): + req_obj = objects.RequestSpec() + self.assertNotIn('network_metadata', req_obj) + self.assertIsInstance(req_obj.network_metadata, + objects.NetworkMetadata) + self.assertIn('network_metadata', req_obj) + def test_destination_aggregates_default(self): destination = objects.Destination() self.assertIsNone(destination.aggregates) |