mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
[aws|compute] descibe_images fixes
add virtualization_type to expected format in tests move request_id off imageSet and back to top level
This commit is contained in:
parent
74e4288549
commit
c15c4dbb2d
3 changed files with 19 additions and 15 deletions
|
@ -47,7 +47,7 @@ module Fog
|
|||
end
|
||||
else
|
||||
case name
|
||||
when 'name','requestId','architecture', 'description', 'imageId', 'imageLocation', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName','virtualizationType'
|
||||
when 'architecture', 'description', 'imageId', 'imageLocation', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'name', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName','virtualizationType'
|
||||
@image[name] = @value
|
||||
when 'isPublic'
|
||||
if @value == 'true'
|
||||
|
@ -60,6 +60,8 @@ module Fog
|
|||
@image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'tagSet' => {} }
|
||||
when 'productCode'
|
||||
@image['productCodes'] << @value
|
||||
when 'requestId'
|
||||
@response[name] = @value
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -35,6 +35,7 @@ module Fog
|
|||
# * 'ramdiskId'<~String> - Ramdisk id associated with image, if any
|
||||
# * 'rootDeviceName'<~String> - Root device name, e.g. /dev/sda1
|
||||
# * 'rootDeviceType'<~String> - Root device type, ebs or instance-store
|
||||
# * 'virtualizationType'<~String> - Type of virtualization
|
||||
def describe_images(filters = {})
|
||||
options = {}
|
||||
for key in ['ExecutableBy', 'ImageId', 'Owner']
|
||||
|
|
|
@ -14,7 +14,8 @@ Shindo.tests('AWS::Compute | image requests', ['aws']) do
|
|||
'productCodes' => [],
|
||||
'ramdiskId' => String,
|
||||
'rootDeviceType' => String,
|
||||
'tagSet' => {}
|
||||
'tagSet' => {},
|
||||
'virtualizationType' => String
|
||||
}],
|
||||
'requestId' => String,
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue