diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-30 02:41:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-30 02:41:02 +0000 |
| commit | 90de9055355322f0c49366fe3001fe6f3cbe4b03 (patch) | |
| tree | a86c5e9c6e111079dcb1900b9c34d5cfbadaa386 | |
| parent | d423c67efbe4f9452f81c5e7511798fbc5ff8527 (diff) | |
| parent | 7ea62897626546d330c3458bba4112f52882f313 (diff) | |
Merge "EC2 DescribeImageAttribute by kernel/ramdisk."
| -rw-r--r-- | nova/api/ec2/cloud.py | 16 | ||||
| -rw-r--r-- | nova/tests/api/ec2/test_cloud.py | 6 |
2 files changed, 22 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 8a9f5f158..e723176f2 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1389,10 +1389,26 @@ class CloudController(object): if result['rootDeviceName'] is None: result['rootDeviceName'] = block_device.DEFAULT_ROOT_DEV_NAME + def _kernel_attribute(image, result): + kernel_id = image['properties'].get('kernel_id') + if kernel_id: + result['kernel'] = { + 'value': ec2utils.image_ec2_id(kernel_id, 'aki') + } + + def _ramdisk_attribute(image, result): + ramdisk_id = image['properties'].get('ramdisk_id') + if ramdisk_id: + result['ramdisk'] = { + 'value': ec2utils.image_ec2_id(ramdisk_id, 'ari') + } + supported_attributes = { 'blockDeviceMapping': _block_device_mapping_attribute, 'launchPermission': _launch_permission_attribute, 'rootDeviceName': _root_device_name_attribute, + 'kernel': _kernel_attribute, + 'ramdisk': _ramdisk_attribute, } fn = supported_attributes.get(attribute) diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index ca2849cdd..04b73adc8 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -1336,6 +1336,12 @@ class CloudTestCase(test.TestCase): result = describe_image_attribute(self.context, 'ami-00000001', 'launchPermission') self.assertEqual([{'group': 'all'}], result['launchPermission']) + result = describe_image_attribute(self.context, 'ami-00000001', + 'kernel') + self.assertEqual('aki-00000001', result['kernel']['value']) + result = describe_image_attribute(self.context, 'ami-00000001', + 'ramdisk') + self.assertEqual('ari-00000001', result['ramdisk']['value']) def test_describe_image_attribute_root_device_name(self): describe_image_attribute = self.cloud.describe_image_attribute |