2757977c33
compute.virt.inspector:Inspector.inspect_instances has been introduced
on Dec 4, 2012, by commit 40a3874c38,
but not used at that time[1], and even for current code[2]. This patch
removes those code and corresponding test code.
1. https://launchpad.net/ceilometer/grizzly/grizzly-2/+download/ceilometer-2013.1%7Eg2.tar.gz
2. $ grep inspect_instances ceilometer -r | grep -v 'pyc matches' | grep -v 'ceilometer/tests/'
ceilometer/compute/virt/inspector.py:150: def inspect_instances(self):
ceilometer/compute/virt/hyperv/inspector.py:36: def inspect_instances(self):
ceilometer/compute/virt/libvirt/inspector.py:120: def inspect_instances(self):
ceilometer/compute/virt/xenapi/inspector.py:114: def inspect_instances(self):
Change-Id: I37c7b63e756fb9f92a4031b5c324702dd85b9fff
Closes-Bug: #1397485
81 lines
2.9 KiB
Python
81 lines
2.9 KiB
Python
# Copyright 2013 Cloudbase Solutions Srl
|
|
#
|
|
# Author: Claudiu Belu <cbelu@cloudbasesolutions.com>
|
|
# Alessandro Pilotti <apilotti@cloudbasesolutions.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.
|
|
"""Implementation of Inspector abstraction for Hyper-V"""
|
|
|
|
from oslo.config import cfg
|
|
from oslo.utils import units
|
|
|
|
from ceilometer.compute.pollsters import util
|
|
from ceilometer.compute.virt.hyperv import utilsv2
|
|
from ceilometer.compute.virt import inspector as virt_inspector
|
|
from ceilometer.openstack.common import log
|
|
|
|
|
|
CONF = cfg.CONF
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
class HyperVInspector(virt_inspector.Inspector):
|
|
|
|
def __init__(self):
|
|
super(HyperVInspector, self).__init__()
|
|
self._utils = utilsv2.UtilsV2()
|
|
|
|
def inspect_cpus(self, instance):
|
|
instance_name = util.instance_name(instance)
|
|
(cpu_clock_used,
|
|
cpu_count, uptime) = self._utils.get_cpu_metrics(instance_name)
|
|
host_cpu_clock, host_cpu_count = self._utils.get_host_cpu_info()
|
|
|
|
cpu_percent_used = (cpu_clock_used /
|
|
float(host_cpu_clock * cpu_count))
|
|
# Nanoseconds
|
|
cpu_time = (long(uptime * cpu_percent_used) * units.k)
|
|
|
|
return virt_inspector.CPUStats(number=cpu_count, time=cpu_time)
|
|
|
|
def inspect_vnics(self, instance):
|
|
instance_name = util.instance_name(instance)
|
|
for vnic_metrics in self._utils.get_vnic_metrics(instance_name):
|
|
interface = virt_inspector.Interface(
|
|
name=vnic_metrics["element_name"],
|
|
mac=vnic_metrics["address"],
|
|
fref=None,
|
|
parameters=None)
|
|
|
|
stats = virt_inspector.InterfaceStats(
|
|
rx_bytes=vnic_metrics['rx_mb'] * units.Mi,
|
|
rx_packets=0,
|
|
tx_bytes=vnic_metrics['tx_mb'] * units.Mi,
|
|
tx_packets=0)
|
|
|
|
yield (interface, stats)
|
|
|
|
def inspect_disks(self, instance):
|
|
instance_name = util.instance_name(instance)
|
|
for disk_metrics in self._utils.get_disk_metrics(instance_name):
|
|
disk = virt_inspector.Disk(device=disk_metrics['instance_id'])
|
|
stats = virt_inspector.DiskStats(
|
|
read_requests=0,
|
|
# Return bytes
|
|
read_bytes=disk_metrics['read_mb'] * units.Mi,
|
|
write_requests=0,
|
|
write_bytes=disk_metrics['write_mb'] * units.Mi,
|
|
errors=0)
|
|
|
|
yield (disk, stats)
|