diff --git a/ceilometer/collector.py b/ceilometer/collector.py index 47a713ffb..1624a757e 100644 --- a/ceilometer/collector.py +++ b/ceilometer/collector.py @@ -26,6 +26,7 @@ from ceilometer.openstack.common import log from ceilometer.openstack.common.rpc import dispatcher as rpc_dispatcher from ceilometer.openstack.common.rpc import service as rpc_service from ceilometer.openstack.common import service as os_service +from ceilometer.openstack.common import units from ceilometer import service OPTS = [ @@ -70,7 +71,7 @@ class CollectorService(service.DispatchedService, rpc_service.Service): while self.udp_run: # NOTE(jd) Arbitrary limit of 64K because that ought to be # enough for anybody. - data, source = udp.recvfrom(64 * 1024) + data, source = udp.recvfrom(64 * units.Ki) try: sample = msgpack.loads(data) except Exception: diff --git a/ceilometer/compute/virt/hyperv/inspector.py b/ceilometer/compute/virt/hyperv/inspector.py index 568d814c6..01c0de366 100644 --- a/ceilometer/compute/virt/hyperv/inspector.py +++ b/ceilometer/compute/virt/hyperv/inspector.py @@ -21,6 +21,7 @@ from oslo.config import cfg from ceilometer.compute.virt.hyperv import utilsv2 from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.openstack.common import log +from ceilometer.openstack.common import units CONF = cfg.CONF LOG = log.getLogger(__name__) @@ -46,8 +47,7 @@ class HyperVInspector(virt_inspector.Inspector): cpu_percent_used = (cpu_clock_used / float(host_cpu_clock * cpu_count)) # Nanoseconds - cpu_time = (long(uptime * cpu_percent_used) * - 1000) + cpu_time = (long(uptime * cpu_percent_used) * units.k) return virt_inspector.CPUStats(number=cpu_count, time=cpu_time) @@ -77,9 +77,9 @@ class HyperVInspector(virt_inspector.Inspector): stats = virt_inspector.DiskStats( read_requests=0, # Return bytes - read_bytes=disk_metrics['read_mb'] * 1024, + read_bytes=disk_metrics['read_mb'] * units.Ki, write_requests=0, - write_bytes=disk_metrics['write_mb'] * 1024, + write_bytes=disk_metrics['write_mb'] * units.Ki, errors=0) yield (disk, stats) diff --git a/ceilometer/utils.py b/ceilometer/utils.py index f52f93466..d5c1704cf 100644 --- a/ceilometer/utils.py +++ b/ceilometer/utils.py @@ -23,6 +23,7 @@ import datetime import decimal from ceilometer.openstack.common import timeutils +from ceilometer.openstack.common import units def recursive_keypairs(d, separator=':'): @@ -73,7 +74,7 @@ def decimal_to_dt(dec): return None integer = int(dec) - micro = (dec - decimal.Decimal(integer)) * decimal.Decimal(1000000) + micro = (dec - decimal.Decimal(integer)) * decimal.Decimal(units.M) daittyme = datetime.datetime.utcfromtimestamp(integer) return daittyme.replace(microsecond=int(round(micro)))