Skip to content

Commit

Permalink
get only security group names for instance details
Browse files Browse the repository at this point in the history
  • Loading branch information
cosmin committed Jul 16, 2012
1 parent 2d84612 commit 98e10b6
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions ec2audit/app.py
Expand Up @@ -33,9 +33,7 @@ def instance_data(i):
for key in vpc_only:
data[key] = i.__dict__[key]

data['security_groups'] = NaturalOrderDict()
for group in i.groups:
data['security_groups'][group.id] = group.name
data['security_groups'] = sorted([g.name for g in i.groups])

if i.block_device_mapping:
data['volumes'] = NaturalOrderDict()
Expand All @@ -48,6 +46,15 @@ def instance_data(i):

return name, data

def get_ec2_instances(econ):
instances = NaturalOrderDict()
for res in econ.get_all_instances():
for i in res.instances:
name, data = instance_data(i)
instances[name] = data

return instances

def volume_data(vol):
data = NaturalOrderDict()

Expand All @@ -60,15 +67,6 @@ def volume_data(vol):

return vol.id, data

def get_ec2_instances(econ):
instances = NaturalOrderDict()
for res in econ.get_all_instances():
for i in res.instances:
name, data = instance_data(i)
instances[name] = data

return instances

def instance_relevant_volume(vol):
return NaturalOrderDict(id=vol['id'], size=vol['size'])

Expand Down

0 comments on commit 98e10b6

Please sign in to comment.