0a60aae852
Module novaclient.v1_1 is used as implementation of V1.1, V2 and V3. Since future development(microversioning) will be done across V2, implementation should be done in appropriate module(to prevent misleading). Despite the fact that implementation for all versions are equal, discover method for contrib path worked only for v1.1. This patch fixes this bug and modifies shell tests to check all versions. Change-Id: Ib6798f4dfe177586302141f522dc593560ce6a5b
93 lines
2.7 KiB
Python
93 lines
2.7 KiB
Python
# Copyright 2012 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
"""
|
|
Hypervisors interface (1.1 extension).
|
|
"""
|
|
|
|
from six.moves.urllib import parse
|
|
|
|
from novaclient import base
|
|
|
|
|
|
class Hypervisor(base.Resource):
|
|
NAME_ATTR = 'hypervisor_hostname'
|
|
|
|
def __repr__(self):
|
|
return "<Hypervisor: %s>" % self.id
|
|
|
|
|
|
class HypervisorManager(base.ManagerWithFind):
|
|
resource_class = Hypervisor
|
|
|
|
def list(self, detailed=True):
|
|
"""
|
|
Get a list of hypervisors.
|
|
"""
|
|
detail = ""
|
|
if detailed:
|
|
detail = "/detail"
|
|
return self._list('/os-hypervisors%s' % detail, 'hypervisors')
|
|
|
|
def search(self, hypervisor_match, servers=False):
|
|
"""
|
|
Get a list of matching hypervisors.
|
|
|
|
:param servers: If True, server information is also retrieved.
|
|
"""
|
|
target = 'servers' if servers else 'search'
|
|
url = ('/os-hypervisors/%s/%s' %
|
|
(parse.quote(hypervisor_match, safe=''), target))
|
|
return self._list(url, 'hypervisors')
|
|
|
|
def get(self, hypervisor):
|
|
"""
|
|
Get a specific hypervisor.
|
|
"""
|
|
return self._get("/os-hypervisors/%s" % base.getid(hypervisor),
|
|
"hypervisor")
|
|
|
|
def uptime(self, hypervisor):
|
|
"""
|
|
Get the uptime for a specific hypervisor.
|
|
"""
|
|
return self._get("/os-hypervisors/%s/uptime" % base.getid(hypervisor),
|
|
"hypervisor")
|
|
|
|
def statistics(self):
|
|
"""
|
|
Get hypervisor statistics over all compute nodes.
|
|
|
|
Kept for backwards compatibility, new code should call
|
|
hypervisor_stats.statistics() instead of hypervisors.statistics()
|
|
"""
|
|
return self.api.hypervisor_stats.statistics()
|
|
|
|
|
|
class HypervisorStats(base.Resource):
|
|
def __repr__(self):
|
|
return ("<HypervisorStats: %d Hypervisor%s>" %
|
|
(self.count, "s" if self.count != 1 else ""))
|
|
|
|
|
|
class HypervisorStatsManager(base.Manager):
|
|
resource_class = HypervisorStats
|
|
|
|
def statistics(self):
|
|
"""
|
|
Get hypervisor statistics over all compute nodes.
|
|
"""
|
|
return self._get("/os-hypervisors/statistics", "hypervisor_statistics")
|