3f76f9cfdb
The nova CDM builder code and notification handling code had some inefficiencies when it came to looking up a hypevisor to get details. The general pattern used before was: 1. get the minimal hypervisor information by hypervisor_hostname 2. make another query to get the hypervisor details by id In the notifications case, it was actually three calls because the first is listing hyprvisors to filter client-side by service host. This change collapses 1 and 2 above into a single API call to get the hypervisor by hypervisor_hostname with details which will include the service (compute) host information which is what get_compute_node_by_id() was being used for. Now that nothing is using get_compute_node_by_id it is removed. There is more work we could do in get_compute_node_by_hostname if the compute API allowed filtering hypervisors by service host so a TODO is left for that. One final thing: the TODO in get_compute_node_by_hostname about there being more than one hypervisor per compute service host for vmware vcenter is not accurate - nova's vcenter driver hasn't supported a host:node 1:M topology like that since the Liberty release [1]. The only in-tree driver in nova that supports 1:M is the ironic baremetal driver, so the comment is updated. [1] Ifc17c5049e3ed29c8dd130339207907b00433960 Depends-On: https://review.opendev.org/661785/ Change-Id: I5e0e88d7b2dd1a69117ab03e0e66851c687606da
118 lines
4.3 KiB
Python
118 lines
4.3 KiB
Python
# -*- encoding: utf-8 -*-
|
|
# Copyright (c) 2016 b<>com
|
|
#
|
|
# Authors: Vincent FRANCOISE <vincent.francoise@b-com.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 mock
|
|
|
|
from watcher.common import nova_helper
|
|
from watcher.decision_engine.model.collector import nova
|
|
from watcher.tests import base
|
|
from watcher.tests import conf_fixture
|
|
|
|
|
|
class TestNovaClusterDataModelCollector(base.TestCase):
|
|
|
|
def setUp(self):
|
|
super(TestNovaClusterDataModelCollector, self).setUp()
|
|
self.useFixture(conf_fixture.ConfReloadFixture())
|
|
|
|
@mock.patch('keystoneclient.v3.client.Client', mock.Mock())
|
|
@mock.patch.object(nova_helper, 'NovaHelper')
|
|
def test_nova_cdmc_execute(self, m_nova_helper_cls):
|
|
m_nova_helper = mock.Mock(name="nova_helper")
|
|
m_nova_helper_cls.return_value = m_nova_helper
|
|
m_nova_helper.get_service.return_value = mock.Mock(
|
|
id=1355,
|
|
host='test_hostname',
|
|
binary='nova-compute',
|
|
status='enabled',
|
|
state='up',
|
|
disabled_reason='',
|
|
)
|
|
minimal_node = dict(
|
|
id=1337,
|
|
hypervisor_hostname='test_hostname',
|
|
state='TEST_STATE',
|
|
status='TEST_STATUS',
|
|
)
|
|
minimal_node_with_servers = dict(
|
|
servers=[
|
|
{'name': 'fake_instance',
|
|
'uuid': 'ef500f7e-dac8-470f-960c-169486fce71b'}
|
|
],
|
|
**minimal_node
|
|
)
|
|
fake_compute_node = mock.Mock(
|
|
service={'id': 123, 'host': 'test_hostname',
|
|
'disabled_reason': ''},
|
|
memory_mb=333,
|
|
free_disk_gb=222,
|
|
local_gb=111,
|
|
vcpus=4,
|
|
servers=None, # Don't let the mock return a value for servers.
|
|
**minimal_node
|
|
)
|
|
fake_detailed_node = mock.Mock(
|
|
service={'id': 123, 'host': 'test_hostname',
|
|
'disabled_reason': ''},
|
|
memory_mb=333,
|
|
free_disk_gb=222,
|
|
local_gb=111,
|
|
vcpus=4,
|
|
**minimal_node_with_servers)
|
|
fake_instance = mock.Mock(
|
|
id='ef500f7e-dac8-470f-960c-169486fce71b',
|
|
human_id='fake_instance',
|
|
flavor={'ram': 333, 'disk': 222, 'vcpus': 4, 'id': 1},
|
|
metadata={'hi': 'hello'},
|
|
tenant_id='ff560f7e-dbc8-771f-960c-164482fce21b',
|
|
)
|
|
setattr(fake_instance, 'OS-EXT-STS:vm_state', 'VM_STATE')
|
|
# Returns the hypervisors with details (service) but no servers.
|
|
m_nova_helper.get_compute_node_list.return_value = [fake_compute_node]
|
|
# Returns the hypervisor with servers and details (service).
|
|
m_nova_helper.get_compute_node_by_name.return_value = [
|
|
fake_detailed_node]
|
|
# Returns the hypervisor with details (service) but no servers.
|
|
m_nova_helper.get_instance_list.return_value = [fake_instance]
|
|
|
|
m_config = mock.Mock()
|
|
m_osc = mock.Mock()
|
|
|
|
nova_cdmc = nova.NovaClusterDataModelCollector(
|
|
config=m_config, osc=m_osc)
|
|
|
|
nova_cdmc.get_audit_scope_handler([])
|
|
model = nova_cdmc.execute()
|
|
|
|
compute_nodes = model.get_all_compute_nodes()
|
|
instances = model.get_all_instances()
|
|
|
|
self.assertEqual(1, len(compute_nodes))
|
|
self.assertEqual(1, len(instances))
|
|
|
|
node = list(compute_nodes.values())[0]
|
|
instance = list(instances.values())[0]
|
|
|
|
self.assertEqual(node.uuid, 'test_hostname')
|
|
self.assertEqual(instance.uuid, 'ef500f7e-dac8-470f-960c-169486fce71b')
|
|
|
|
m_nova_helper.get_compute_node_by_name.assert_called_once_with(
|
|
minimal_node['hypervisor_hostname'], servers=True, detailed=True)
|
|
m_nova_helper.get_instance_list.assert_called_once_with(
|
|
{'host': fake_compute_node.service['host']})
|