Skip to content

Commit

Permalink
Merge e35ddaa into 0a3ea6b
Browse files Browse the repository at this point in the history
  • Loading branch information
kula1922 committed Aug 11, 2014
2 parents 0a3ea6b + e35ddaa commit b74b722
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/ralph/util/api_pricing.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,11 @@ def get_virtual_usages(parent_venture_name=None):
if not memory:
memory = system.memory
yield {
'name': device.name,
'device_id': device.id,
'venture_id': device.venture_id,
'service_ci_uid': device.service.uid if device.service else None,
'environment': device.device_environment,
'hypervisor_id': device.parent.id,
'virtual_cores': cores or 0,
'virtual_memory': memory or 0,
'virtual_disk': disk or 0,
Expand Down

0 comments on commit b74b722

Please sign in to comment.