8806ac9e41
This change removes NovaObjectDictCompat from the ComputeNode object. The only changes needed were changing dict syntax over to either use dot syntax or getattr/setattr. In cases where the dict function update() was used, the update dictionary was unchanged, but was not passed into a new update helper function that applies the updates using setattr() on the given kwargs. Change-Id: Iba5303d23492db55f46df8b8f6b3dbae5b4971c1 Partially-Implements: bp rm-object-dict-compat-newton
98 lines
3.6 KiB
Python
98 lines
3.6 KiB
Python
# Copyright (c) 2012 NTT DOCOMO, INC.
|
|
# Copyright (c) 2011-2014 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.
|
|
|
|
"""
|
|
Ironic host manager.
|
|
|
|
This host manager will consume all cpu's, disk space, and
|
|
ram from a host / node as it is supporting Baremetal hosts, which can not be
|
|
subdivided into multiple instances.
|
|
"""
|
|
from nova.compute import hv_type
|
|
import nova.conf
|
|
from nova.scheduler import host_manager
|
|
|
|
CONF = nova.conf.CONF
|
|
|
|
|
|
class IronicNodeState(host_manager.HostState):
|
|
"""Mutable and immutable information tracked for a host.
|
|
This is an attempt to remove the ad-hoc data structures
|
|
previously used and lock down access.
|
|
"""
|
|
|
|
def _update_from_compute_node(self, compute):
|
|
"""Update information about a host from a ComputeNode object."""
|
|
self.vcpus_total = compute.vcpus
|
|
self.vcpus_used = compute.vcpus_used
|
|
|
|
self.free_ram_mb = compute.free_ram_mb
|
|
self.total_usable_ram_mb = compute.memory_mb
|
|
self.free_disk_mb = compute.free_disk_gb * 1024
|
|
|
|
self.stats = compute.stats or {}
|
|
|
|
self.total_usable_disk_gb = compute.local_gb
|
|
self.hypervisor_type = compute.hypervisor_type
|
|
self.hypervisor_version = compute.hypervisor_version
|
|
self.hypervisor_hostname = compute.hypervisor_hostname
|
|
self.cpu_info = compute.cpu_info
|
|
if compute.supported_hv_specs:
|
|
self.supported_instances = [spec.to_list() for spec
|
|
in compute.supported_hv_specs]
|
|
else:
|
|
self.supported_instances = []
|
|
|
|
# update allocation ratios given by the ComputeNode object
|
|
self.cpu_allocation_ratio = compute.cpu_allocation_ratio
|
|
self.ram_allocation_ratio = compute.ram_allocation_ratio
|
|
self.disk_allocation_ratio = compute.disk_allocation_ratio
|
|
|
|
self.updated = compute.updated_at
|
|
|
|
def _locked_consume_from_request(self, spec_obj):
|
|
"""Consume nodes entire resources regardless of instance request."""
|
|
self.free_ram_mb = 0
|
|
self.free_disk_mb = 0
|
|
self.vcpus_used = self.vcpus_total
|
|
|
|
|
|
class IronicHostManager(host_manager.HostManager):
|
|
"""Ironic HostManager class."""
|
|
|
|
def _load_filters(self):
|
|
if CONF.scheduler_use_baremetal_filters:
|
|
return CONF.baremetal_scheduler_default_filters
|
|
return super(IronicHostManager, self)._load_filters()
|
|
|
|
def host_state_cls(self, host, node, **kwargs):
|
|
"""Factory function/property to create a new HostState."""
|
|
compute = kwargs.get('compute')
|
|
get_ht = lambda c: (c.hypervisor_type if 'hypervisor_type' in c
|
|
else None)
|
|
if compute and get_ht(compute) == hv_type.IRONIC:
|
|
return IronicNodeState(host, node)
|
|
else:
|
|
return host_manager.HostState(host, node)
|
|
|
|
def _init_instance_info(self):
|
|
"""Ironic hosts should not pass instance info."""
|
|
pass
|
|
|
|
def _get_instance_info(self, context, compute):
|
|
"""Ironic hosts should not pass instance info."""
|
|
return {}
|