b54e97e300
Precursor-to: BP decoupled-source-sink-discoverable-resources Add the concept of per-AgentManager resource discovery extensions loaded via stevedore entry points. The extensions are loaded from a single namespace: ceilometer.discover shared by all agents. An agent may have a list of per-agent default discovery extensions associated with it on creation. This is used by the compute agent, which currently uses a single discovery extension for all matching pipelines. The per-pipeline statically configured resources remain in place to potentially override the per-agent discovered resources - these will be augmented by per-pipeline discovery in a subsequent patch. Recast the compute agent's interrogation of the nova servers API in the form of a discovery extension. Unify the pollster abstraction used by the central and compute agents (which had previously diverged along with the introduction of per-pipeline resources). Unify the polling task logic used by the central and compute agents (so that the compute agent now iterates over each pollster for all local instances, as opposed to interating over all pollsters for each local instance). Change-Id: I625df47231a1dbf7ef721c297701799b224ce67e
82 lines
2.9 KiB
Python
82 lines
2.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(len(samples), 1)
|
|
self.assertEqual(set([s.name for s in samples]),
|
|
set(['cpu']))
|
|
self.assertEqual(samples[0].volume, expected_time)
|
|
self.assertEqual(samples[0].resource_metadata.get('cpu_number'), 2)
|
|
# 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(len(samples), 1)
|
|
self.assertEqual(samples[0].volume, 10 ** 6)
|
|
self.assertEqual(len(cache), 0)
|