From e715f7f9688d797eabac1991a8934ab74ca64a42 Mon Sep 17 00:00:00 2001
From: Constantin Bugneac <constantin.bugneac@endava.com>
Date: Fri, 16 Oct 2015 16:08:10 +0100
Subject: [PATCH] Included 'block_device_mapping' in the output of module and
other missing attributes
---
cloud/amazon/ec2_ami_find.py | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/cloud/amazon/ec2_ami_find.py b/cloud/amazon/ec2_ami_find.py
index f5ed91baab5..3940bf0fc01 100644
--- a/cloud/amazon/ec2_ami_find.py
+++ b/cloud/amazon/ec2_ami_find.py
@@ -165,12 +165,32 @@ EXAMPLES = '''
try:
import boto.ec2
+ from boto.ec2.blockdevicemapping import BlockDeviceType, BlockDeviceMapping
HAS_BOTO=True
except ImportError:
HAS_BOTO=False
import json
+def get_block_device_mapping(image):
+ """
+ Retrieves block device mapping from AMI
+ """
+
+ bdm_dict = dict()
+ bdm = getattr(image,'block_device_mapping')
+ for device_name in bdm.keys():
+ bdm_dict[device_name] = {
+ 'size': bdm[device_name].size,
+ 'snapshot_id': bdm[device_name].snapshot_id,
+ 'volume_type': bdm[device_name].volume_type,
+ 'encrypted': bdm[device_name].encrypted,
+ 'delete_on_termination': bdm[device_name].delete_on_termination
+ }
+
+ return bdm_dict
+
+
def main():
argument_spec = ec2_argument_spec()
argument_spec.update(dict(
@@ -255,8 +275,12 @@ def main():
data = {
'ami_id': image.id,
'architecture': image.architecture,
+ 'block_device_mapping': get_block_device_mapping(image),
+ 'creationDate': image.creationDate,
'description': image.description,
+ 'hypervisor': image.hypervisor,
'is_public': image.is_public,
+ 'location': image.location,
'name': image.name,
'owner_id': image.owner_id,
'platform': image.platform,