x/stacktach
Code Issues Proposed changes

Adding flavor and image_meta to usage seed

Browse Source
This commit is contained in:
Andrew Melton 2013-11-21 12:15:06 -05:00
parent 1bd83f0ecd
commit d4aa78dfa7
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
util/usage_seed.py
View File

@ -84,6 +84,25 @@ def get_previous_period(time, period_length):
return start, end
# end yanked from reports/nova_usage_audit.py
inst_types = {}
def get_instance_type(type_id):
global inst_types
context = RequestContext('1', '1', is_admin=True)
if type_id in inst_types:
return inst_types[type_id]
else:
inst_type = sqlapi.model_query(context, novamodels.InstanceTypes)\
.filter_by(id=type_id).first()
inst_types[type_id] = inst_type
return inst_type
def get_metadata(instance_uuid):
context = RequestContext('1', '1', is_admin=True)
return sqlapi.instance_system_metadata_get(context, instance_uuid)
def _usage_for_instance(instance, task=None):
usage = {
@ -92,6 +111,15 @@ def _usage_for_instance(instance, task=None):
'instance_type_id': instance.get('instance_type_id'),
}
instance_type = get_instance_type(instance.get('instance_type_id'))
usage['instance_flavor_id'] = instance_type['flavorid']
metadata = get_metadata(instance['uuid'])
usage['os_architecture'] = metadata.get('image_org.openstack__1__architecture')
usage['os_distro'] = metadata.get('image_org.openstack__1__os_distro')
usage['os_version'] = metadata.get('image_org.openstack__1__os_version')
usage['rax_options'] = metadata.get('com.rackspace__1__options')
launched_at = instance.get('launched_at')
if launched_at is not None:
usage['launched_at'] = dt.dt_to_decimal(launched_at)