Refactored usage generation
This commit is contained in:
parent
f8434ec194
commit
ea4193eb06
@ -107,17 +107,7 @@ if __name__ == '__main__':
|
|||||||
end)
|
end)
|
||||||
print "%s instances" % len(instances)
|
print "%s instances" % len(instances)
|
||||||
for instance_ref in instances:
|
for instance_ref in instances:
|
||||||
usage_info = dict(
|
usage_info = utils.usage_from_instance(instance_ref,
|
||||||
tenant_id=instance_ref['project_id'],
|
|
||||||
user_id=instance_ref['user_id'],
|
|
||||||
instance_id=instance_ref['id'],
|
|
||||||
instance_type=instance_ref['instance_type']['name'],
|
|
||||||
instance_type_id=instance_ref['instance_type_id'],
|
|
||||||
display_name=instance_ref['display_name'],
|
|
||||||
created_at=str(instance_ref['created_at']),
|
|
||||||
launched_at=str(instance_ref['launched_at']) \
|
|
||||||
if instance_ref['launched_at'] else '',
|
|
||||||
image_ref=instance_ref['image_ref'],
|
|
||||||
audit_period_begining=str(begin),
|
audit_period_begining=str(begin),
|
||||||
audit_period_ending=str(end))
|
audit_period_ending=str(end))
|
||||||
notifier_api.notify('compute.%s' % FLAGS.host,
|
notifier_api.notify('compute.%s' % FLAGS.host,
|
||||||
|
@ -279,6 +279,22 @@ EASIER_PASSWORD_SYMBOLS = ('23456789' # Removed: 0, 1
|
|||||||
'ABCDEFGHJKLMNPQRSTUVWXYZ') # Removed: I, O
|
'ABCDEFGHJKLMNPQRSTUVWXYZ') # Removed: I, O
|
||||||
|
|
||||||
|
|
||||||
|
def usage_from_instance(instance_ref, **kw):
|
||||||
|
usage_info = dict(
|
||||||
|
tenant_id=instance_ref['project_id'],
|
||||||
|
user_id=instance_ref['user_id'],
|
||||||
|
instance_id=instance_ref['id'],
|
||||||
|
instance_type=instance_ref['instance_type']['name'],
|
||||||
|
instance_type_id=instance_ref['instance_type_id'],
|
||||||
|
display_name=instance_ref['display_name'],
|
||||||
|
created_at=str(instance_ref['created_at']),
|
||||||
|
launched_at=str(instance_ref['launched_at']) \
|
||||||
|
if instance_ref['launched_at'] else '',
|
||||||
|
image_ref=instance_ref['image_ref'])
|
||||||
|
usage_info.update(kw)
|
||||||
|
return usage_info
|
||||||
|
|
||||||
|
|
||||||
def generate_password(length=20, symbols=DEFAULT_PASSWORD_SYMBOLS):
|
def generate_password(length=20, symbols=DEFAULT_PASSWORD_SYMBOLS):
|
||||||
"""Generate a random password from the supplied symbols.
|
"""Generate a random password from the supplied symbols.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user