03c803b5ce
Currently we are querying the latest real time sample from vSphere and creating a sample out of it, in ceilometer. The sampling interval of real time samples in vSphere is 20 s. However, the interval at which the various pollsters are run is by default 600 s (10 mins). This CL attempts to improve the accuracy of the sample by averaging the samples over the pollster interval. Change-Id: Id75fe87840b82d7c7d3e4fae9b2fc982e22ea1d7 Implements: blueprint vmware-vcenter-server Closes-Bug: 1295500
114 lines
3.9 KiB
Python
114 lines
3.9 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 eNovance <licensing@enovance.com>
|
|
# Copyright © 2012 Red Hat, Inc
|
|
#
|
|
# Author: Julien Danjou <julien@danjou.info>
|
|
# Author: Eoghan Glynn <eglynn@redhat.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import time
|
|
|
|
import mock
|
|
import six
|
|
|
|
from ceilometer.compute import manager
|
|
from ceilometer.compute.pollsters import cpu
|
|
from ceilometer.compute.virt import inspector as virt_inspector
|
|
from ceilometer.tests.compute.pollsters import base
|
|
|
|
|
|
class TestCPUPollster(base.TestPollsterBase):
|
|
|
|
def setUp(self):
|
|
super(TestCPUPollster, self).setUp()
|
|
|
|
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
|
def test_get_samples(self):
|
|
next_value = iter((
|
|
virt_inspector.CPUStats(time=1 * (10 ** 6), number=2),
|
|
virt_inspector.CPUStats(time=3 * (10 ** 6), number=2),
|
|
# cpu_time resets on instance restart
|
|
virt_inspector.CPUStats(time=2 * (10 ** 6), number=2),
|
|
))
|
|
|
|
def inspect_cpus(name):
|
|
return six.next(next_value)
|
|
|
|
self.inspector.inspect_cpus = mock.Mock(side_effect=inspect_cpus)
|
|
|
|
mgr = manager.AgentManager()
|
|
pollster = cpu.CPUPollster()
|
|
|
|
def _verify_cpu_metering(expected_time):
|
|
cache = {}
|
|
samples = list(pollster.get_samples(mgr, cache, [self.instance]))
|
|
self.assertEqual(1, len(samples))
|
|
self.assertEqual(set(['cpu']), set([s.name for s in samples]))
|
|
self.assertEqual(expected_time, samples[0].volume)
|
|
self.assertEqual(2, samples[0].resource_metadata.get('cpu_number'))
|
|
# ensure elapsed time between polling cycles is non-zero
|
|
time.sleep(0.001)
|
|
|
|
_verify_cpu_metering(1 * (10 ** 6))
|
|
_verify_cpu_metering(3 * (10 ** 6))
|
|
_verify_cpu_metering(2 * (10 ** 6))
|
|
|
|
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
|
def test_get_samples_no_caching(self):
|
|
cpu_stats = virt_inspector.CPUStats(time=1 * (10 ** 6), number=2)
|
|
self.inspector.inspect_cpus = mock.Mock(return_value=cpu_stats)
|
|
|
|
mgr = manager.AgentManager()
|
|
pollster = cpu.CPUPollster()
|
|
|
|
cache = {}
|
|
samples = list(pollster.get_samples(mgr, cache, [self.instance]))
|
|
self.assertEqual(1, len(samples))
|
|
self.assertEqual(10 ** 6, samples[0].volume)
|
|
self.assertEqual(0, len(cache))
|
|
|
|
|
|
class TestCPUUtilPollster(base.TestPollsterBase):
|
|
|
|
def setUp(self):
|
|
super(TestCPUUtilPollster, self).setUp()
|
|
|
|
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
|
def test_get_samples(self):
|
|
next_value = iter((
|
|
virt_inspector.CPUUtilStats(util=40),
|
|
virt_inspector.CPUUtilStats(util=60),
|
|
))
|
|
|
|
def inspect_cpu_util(name, duration):
|
|
return six.next(next_value)
|
|
|
|
self.inspector.inspect_cpu_util = \
|
|
mock.Mock(side_effect=inspect_cpu_util)
|
|
|
|
mgr = manager.AgentManager()
|
|
pollster = cpu.CPUUtilPollster()
|
|
|
|
def _verify_cpu_util_metering(expected_util):
|
|
cache = {}
|
|
samples = list(pollster.get_samples(mgr, cache, [self.instance]))
|
|
self.assertEqual(1, len(samples))
|
|
self.assertEqual(set(['cpu_util']),
|
|
set([s.name for s in samples]))
|
|
self.assertEqual(expected_util, samples[0].volume)
|
|
|
|
_verify_cpu_util_metering(40)
|
|
_verify_cpu_util_metering(60)
|