openstack/oslo.versionedobjects
Code Issues Proposed changes

Merge "Add flavor fields to Instance object"

Browse Source
This commit is contained in:
Jenkins
2015-01-30 06:00:08 +00:00
committed by Gerrit Code Review
parent 8a45eee77b ad50b78126
commit 013269bf22
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nova/tests/unit/objects/test_objects.py
View File

@@ -1115,8 +1115,8 @@ object_data = {
'AggregateList': '1.2-4b02a285b8612bfb86a96ff80052fb0a',
'BandwidthUsage': '1.2-a9d7c2ba54995e48ce38688c51c9416d',
'BandwidthUsageList': '1.2-5b564cbfd5ae6e106443c086938e7602',
'BlockDeviceMapping': '1.5-9968ffe513e7672484b0f528b034cd0f',
'BlockDeviceMappingList': '1.6-ee2ed2eb3f3f2f54d573ccea0ff2eeaa',
'BlockDeviceMapping': '1.6-9968ffe513e7672484b0f528b034cd0f',
'BlockDeviceMappingList': '1.7-b67dc6a04cff2cdb53e6f25e146da456',
'ComputeNode': '1.10-70202a38b858977837b313d94475a26b',
'ComputeNodeList': '1.10-4ae1f844c247029fbcdb5fdccbe9e619',
'DNSDomain': '1.0-5bdc288d7c3b723ce86ede998fd5c9ba',
@@ -1124,14 +1124,14 @@ object_data = {
'EC2InstanceMapping': '1.0-627baaf4b12c9067200979bdc4558a99',
'EC2SnapshotMapping': '1.0-26cf315be1f8abab4289d4147671c836',
'EC2VolumeMapping': '1.0-2f8c3bf077c65a425294ec2b361c9143',
'FixedIP': '1.7-2472964d39e50da67202109eb85cd173',
'FixedIPList': '1.7-125de790b58cfb8c84ffc8c34db4a81e',
'FixedIP': '1.8-2472964d39e50da67202109eb85cd173',
'FixedIPList': '1.8-6cfaa5b6dd27e9eb8fcf8462dea06077',
'Flavor': '1.1-096cfd023c35d07542cf732fb29b45e4',
'FlavorList': '1.1-a3d5551267cb8f62ff38ded125900721',
'FloatingIP': '1.6-27eb68b7c9c620dd5f0561b5a3be0e82',
'FloatingIPList': '1.7-f376f63ed99243f9d90841b7f6732bbf',
'HVSpec': '1.0-c4d8377cc4fe519930e60c1d8265a142',
'Instance': '1.17-972cae223db35e88bb184bdf8c197229',
'Instance': '1.18-7827a9e9846a75f3038bd556e6f530d3',
'InstanceAction': '1.1-6b1d0a6dbd522b5a83c20757ec659663',
'InstanceActionEvent': '1.1-42dbdba74bd06e0619ca75cd3397cd1b',
'InstanceActionEventList': '1.0-1d5cc958171d6ce07383c2ad6208318e',
@@ -1142,7 +1142,7 @@ object_data = {
'InstanceGroup': '1.9-95ece99f092e8f4f88327cdbb44162c9',
'InstanceGroupList': '1.6-c6b78f3c9d9080d33c08667e80589817',
'InstanceInfoCache': '1.5-ef64b604498bfa505a8c93747a9d8b2f',
'InstanceList': '1.13-179093360c48747a41694cc2f326d75d',
'InstanceList': '1.14-fe7f3266de1475454b939dee36a2ebcc',
'InstanceNUMACell': '1.2-5d2dfa36e9ecca9b63f24bf3bc958ea4',
'InstanceNUMATopology': '1.1-86b95d263c4c68411d44c6741b8d2bb0',
'InstancePCIRequest': '1.1-e082d174f4643e5756ba098c47c1510f',
@@ -1183,18 +1183,19 @@ object_data = {
object_relationships = {
'BlockDeviceMapping': {'Instance': '1.17'},
'BlockDeviceMapping': {'Instance': '1.18'},
'ComputeNode': {'PciDevicePoolList': '1.0'},
'FixedIP': {'Instance': '1.17', 'Network': '1.2',
'FixedIP': {'Instance': '1.18', 'Network': '1.2',
'VirtualInterface': '1.0',
'FloatingIPList': '1.7'},
'FloatingIP': {'FixedIP': '1.7'},
'FloatingIP': {'FixedIP': '1.8'},
'Instance': {'InstanceFault': '1.2',
'InstanceInfoCache': '1.5',
'InstanceNUMATopology': '1.1',
'PciDeviceList': '1.1',
'TagList': '1.0',
'SecurityGroupList': '1.0',
'Flavor': '1.1',
'InstancePCIRequests': '1.1'},
'InstanceNUMACell': {'VirtCPUTopology': '1.0'},
'MyObj': {'MyOwnedObject': '1.0'},

3
nova/utils.py
View File

@@ -1089,8 +1089,7 @@ def get_image_from_system_metadata(system_meta):
continue
properties[key] = value
if properties:
image_meta['properties'] = properties
image_meta['properties'] = properties
return image_meta