openstack/cloudkitty
Code Issues Proposed changes

Merge "Update fields of CSV reports."

Browse Source
This commit is contained in:
Zuul
2018-01-03 10:10:21 +00:00
committed by Gerrit Code Review
parent 7be18da2a6 e225fad711
commit bd57091b88
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cloudkitty/writer/csv_map.py
View File

@@ -39,12 +39,11 @@ class CSVMapped(csv_base.BaseCSVBackend):
('UserId', 'desc:user_id'), ('UserId', 'desc:user_id'),
('ProjectId', 'desc:project_id'), ('ProjectId', 'desc:project_id'),
('ItemName', 'desc:name'), ('ItemName', 'desc:name'),
('ItemFlavor', 'desc:flavor'), ('ItemFlavor', 'desc:flavor_name'),
('ItemFlavorId', 'desc:flavor_id'),
('AvailabilityZone', 'desc:availability_zone'), ('AvailabilityZone', 'desc:availability_zone'),
('Service', self._trans_service), ('Service', self._trans_service),
('ItemDescription', 'rating:description'),
('UsageQuantity', 'vol:qty'), ('UsageQuantity', 'vol:qty'),
('RateId', 'rating:rate_id'),
('RateValue', 'rating:price'), ('RateValue', 'rating:price'),
('Cost', self._trans_calc_cost), ('Cost', self._trans_calc_cost),
('user:*', 'desc:metadata:*')]) ('user:*', 'desc:metadata:*')])
@@ -136,8 +135,7 @@ class CSVMapped(csv_base.BaseCSVBackend):
"""Context dependent resource id transformation function. """Context dependent resource id transformation function.
""" """
if context == 'compute': return report_data['desc'].get('resource_id')
return report_data['desc'].get('instance_id')
def _trans_calc_cost(self, context, report_data): def _trans_calc_cost(self, context, report_data):
"""Cost calculation function. """Cost calculation function.