diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-21 18:07:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-21 18:07:05 +0000 |
| commit | 1e742df03848f727fc8248de3438f6ac39d7f2ff (patch) | |
| tree | 0a46d71dacc727c002f3aec9345a753b8052a617 /nova/api | |
| parent | e205037a43478438470257fe5baab05df353612d (diff) | |
| parent | 52fd1536a897a24ba07b5f4459edb15e581b7adc (diff) | |
Merge "Add instance_id in Usage API response."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/simple_tenant_usage.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py index 0179ea75b..7879cf381 100644 --- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py +++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py @@ -44,9 +44,9 @@ def make_usage(elem): server_usages = xmlutil.SubTemplateElement(elem, 'server_usages') server_usage = xmlutil.SubTemplateElement(server_usages, 'server_usage', selector='server_usages') - for subelem_tag in ('name', 'hours', 'memory_mb', 'local_gb', 'vcpus', - 'tenant_id', 'flavor', 'started_at', 'ended_at', - 'state', 'uptime'): + for subelem_tag in ('instance_id', 'name', 'hours', 'memory_mb', + 'local_gb', 'vcpus', 'tenant_id', 'flavor', + 'started_at', 'ended_at', 'state', 'uptime'): subelem = xmlutil.SubTemplateElement(server_usage, subelem_tag) subelem.text = subelem_tag @@ -133,6 +133,7 @@ class SimpleTenantUsageController(object): flavor = flavors[flavor_type] + info['instance_id'] = instance['uuid'] info['name'] = instance['display_name'] info['memory_mb'] = flavor['memory_mb'] |