openstack/cloudkitty
Code Issues Proposed changes

Merge "Delete the magic number"

Browse Source
This commit is contained in:
Jenkins
2016-12-13 12:48:44 +00:00
committed by Gerrit Code Review
parent 5f949d6899 7336f8a9e2
commit 0f90e9a6ea
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cloudkitty/collector/ceilometer.py
View File

@@ -15,9 +15,12 @@
#
# @author: Stéphane Albert
#
import decimal
from ceilometerclient import client as cclient
from keystoneauth1 import loading as ks_loading
from oslo_config import cfg
from oslo_utils import units
from cloudkitty import collector
from cloudkitty import utils as ck_utils
@@ -198,7 +201,7 @@ class CeilometerCollector(collector.BaseCollector):
image)
image = self._cacher.get_resource_detail('image',
image_id)
image_size_mb = image_stats.max / 1048576.0
image_size_mb = decimal.Decimal(image_stats.max) / units.Mi
image_data.append(self.t_cloudkitty.format_item(image,
'MB',
image_size_mb))
@@ -262,7 +265,7 @@ class CeilometerCollector(collector.BaseCollector):
tap)
tap = self._cacher.get_resource_detail('network.tap',
tap_id)
tap_bw_mb = tap_stat.max / 1000000.0
tap_bw_mb = decimal.Decimal(tap_stat.max) / units.M
bw_data.append(self.t_cloudkitty.format_item(tap,
'MB',
tap_bw_mb))

7
cloudkitty/collector/gnocchi.py
View File

@@ -18,6 +18,7 @@ import decimal
from gnocchiclient import client as gclient
from keystoneauth1 import loading as ks_loading
from oslo_config import cfg
from oslo_utils import units
from cloudkitty import collector
@@ -279,9 +280,11 @@ class GnocchiCollector(collector.BaseCollector):
resource_data.pop('metrics', None)
# Convert network.bw.in, network.bw.out and image unit to MB
if resource.get('type') == 'instance_network_interface':
resource_data[qty] = resource_data[qty] / 1000000.0
resource_data[qty] = (
decimal.Decimal(resource_data[qty]) / units.M)
elif resource.get('type') == 'image':
resource_data[qty] = resource_data[qty] / 1048576.0
resource_data[qty] = (
decimal.Decimal(resource_data[qty]) / units.Mi)
data = self.t_cloudkitty.format_item(
resource_data,
unit,