deb-ceilometer/ceilometer/nova_client.py
Eoghan Glynn 7e595e8f28 Use libvirt num_cpu for CPU utilization calculation.
Previously we used the vcpus count for the corresponding flavor,
but this can be incorrect if the instance type was deleted and
re-created with a different number of cores after the instance
was booted.

Also the total number of CPUs on-host is dropped from the formula
as this is not relevant to the CPU util for the instance.

Change-Id: I23e2ad30696f11f413fd1570fe85c3a12fb0bf1e
2012-11-14 14:39:13 +00:00

71 lines
2.3 KiB
Python

# -*- encoding: utf-8 -*-
#
# Author: John Tran <jhtran@att.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 os
from functools import wraps
from novaclient.v1_1 import client as nova_client
import ceilometer.service
from ceilometer.openstack.common import cfg, log
LOG = log.getLogger(__name__)
def logged(func):
@wraps(func)
def with_logging(*args, **kwargs):
try:
return func(*args, **kwargs)
except Exception, e:
LOG.exception(e)
raise
return with_logging
class Client(object):
def __init__(self):
"""Returns nova client"""
conf = cfg.CONF
tenant = conf.os_tenant_id and conf.os_tenant_id or conf.os_tenant_name
self.nova_client = nova_client.Client(username=cfg.CONF.os_username,
api_key=cfg.CONF.os_password,
project_id=tenant,
auth_url=cfg.CONF.os_auth_url,
no_cache=True)
def _with_flavor(self, instances):
flavors = dict((f.id, f) for f in self.nova_client.flavors.list())
for instance in instances:
fid = instance.flavor['id']
instance.flavor['name'] = flavors[fid].name
return instances
@logged
def instance_get_all_by_host(self, hostname):
"""Returns list of instances on particular host"""
search_opts = {'host': hostname, 'all_tenants': True}
return self._with_flavor(self.nova_client.servers.list(
detailed=True,
search_opts=search_opts))
@logged
def floating_ip_get_all(self):
"""Returns all floating ips"""
return self.nova_client.floating_ips.list()