x/stacktach
Code Issues Proposed changes

Merge pull request #137 from ramielrowe/master

Browse Source 
More safe population from image_meta
This commit is contained in:
Andrew Melton
2013-06-27 10:19:41 -07:00
parent 240a920ea3 08c8d7ee4b
commit 19f854b068
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
stacktach/views.py
View File

@@ -193,10 +193,12 @@ def _process_usage_for_new_launch(raw, body):
usage.launched_at = utils.str_time_to_unix(payload['launched_at']) usage.launched_at = utils.str_time_to_unix(payload['launched_at'])
usage.tenant = payload['tenant_id'] usage.tenant = payload['tenant_id']
usage.rax_options = payload['image_meta']['com.rackspace__1__options'] image_meta = payload.get('image_meta', {})
usage.os_architecture = payload['image_meta']['org.openstack__1__architecture'] usage.rax_options = image_meta.get('com.rackspace__1__options', '')
usage.os_version = payload['image_meta']['org.openstack__1__os_version'] usage.os_architecture = image_meta.get('org.openstack__1__architecture',
usage.os_distro = payload['image_meta']['org.openstack__1__os_distro'] '')
usage.os_version = image_meta.get('org.openstack__1__os_version', '')
usage.os_distro = image_meta.get('org.openstack__1__os_distro', '')
STACKDB.save(usage) STACKDB.save(usage)
@@ -224,10 +226,12 @@ def _process_usage_for_updates(raw, body):
usage.instance_type_id = payload['new_instance_type_id'] usage.instance_type_id = payload['new_instance_type_id']
usage.tenant = payload['tenant_id'] usage.tenant = payload['tenant_id']
usage.rax_options = payload['image_meta']['com.rackspace__1__options'] image_meta = payload.get('image_meta', {})
usage.os_architecture = payload['image_meta']['org.openstack__1__architecture'] usage.rax_options = image_meta.get('com.rackspace__1__options', '')
usage.os_version = payload['image_meta']['org.openstack__1__os_version'] usage.os_architecture = image_meta.get('org.openstack__1__architecture',
usage.os_distro = payload['image_meta']['org.openstack__1__os_distro'] '')
usage.os_version = image_meta.get('org.openstack__1__os_version', '')
usage.os_distro = image_meta.get('org.openstack__1__os_distro', '')
STACKDB.save(usage) STACKDB.save(usage)
@@ -273,10 +277,12 @@ def _process_exists(raw, body):
values['usage'] = usage values['usage'] = usage
values['raw'] = raw values['raw'] = raw
values['tenant'] = payload['tenant_id'] values['tenant'] = payload['tenant_id']
values['rax_options'] = payload['image_meta']['com.rackspace__1__options'] image_meta = payload.get('image_meta', {})
values['os_architecture'] = payload['image_meta']['org.openstack__1__architecture'] usage.rax_options = image_meta.get('com.rackspace__1__options', '')
values['os_version'] = payload['image_meta']['org.openstack__1__os_version'] usage.os_architecture = image_meta.get('org.openstack__1__architecture',
values['os_distro'] = payload['image_meta']['org.openstack__1__os_distro'] '')
usage.os_version = image_meta.get('org.openstack__1__os_version', '')
usage.os_distro = image_meta.get('org.openstack__1__os_distro', '')
deleted_at = payload.get('deleted_at') deleted_at = payload.get('deleted_at')
if deleted_at and deleted_at != '': if deleted_at and deleted_at != '':