Eric Fried
570ad36992
There were a bunch of report client methods around updating inventory to placement which were only being used in the non-update_provider_tree code paths of the resource tracker's update routine. Those code paths had already been retrofitted to produce a placement-shaped inventory object. update_from_provider_tree gives us another way to flush these inventory changes. This patch simply takes the inventory object produced by the get_inventory() and update_compute_node() code paths and updates the provider tree object in the same fashion as update_provider_tree does. So now all three code paths can commonly invoke update_from_provider_tree. And we can get rid of a ton of redundant code in the report client. This includes the former incarnation of set_inventory_for_provider; so we rename the artist formerly known as _set_inventory_for_provider to match its brethren, set_traits_for_provider and set_aggregates_for_provider. Change-Id: I1a305847f0310c8d4babd5a625e4cc7bffe5b086
81 lines
3.2 KiB
Python
81 lines
3.2 KiB
Python
# Copyright (c) 2014 Red Hat, Inc.
|
|
# 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.
|
|
|
|
import mock
|
|
import oslo_messaging as messaging
|
|
from oslo_utils.fixture import uuidsentinel as uuids
|
|
|
|
from nova import objects
|
|
from nova.scheduler import client as scheduler_client
|
|
from nova.scheduler.client import query as scheduler_query_client
|
|
from nova import test
|
|
"""Tests for Scheduler Client."""
|
|
|
|
|
|
class SchedulerClientTestCase(test.NoDBTestCase):
|
|
|
|
def setUp(self):
|
|
super(SchedulerClientTestCase, self).setUp()
|
|
self.client = scheduler_client.SchedulerClient()
|
|
|
|
def test_constructor(self):
|
|
self.assertIsNotNone(self.client.queryclient)
|
|
self.assertIsNotNone(self.client.reportclient)
|
|
|
|
@mock.patch.object(scheduler_query_client.SchedulerQueryClient,
|
|
'select_destinations')
|
|
def test_select_destinations(self, mock_select_destinations):
|
|
fake_spec = objects.RequestSpec()
|
|
fake_spec.instance_uuid = uuids.instance
|
|
|
|
self.client.select_destinations('ctxt', fake_spec,
|
|
[fake_spec.instance_uuid])
|
|
|
|
mock_select_destinations.assert_called_once_with('ctxt', fake_spec,
|
|
[fake_spec.instance_uuid], False, False)
|
|
|
|
@mock.patch.object(scheduler_query_client.SchedulerQueryClient,
|
|
'select_destinations',
|
|
side_effect=messaging.MessagingTimeout())
|
|
def test_select_destinations_timeout(self, mock_select_destinations):
|
|
# check if the scheduler service times out properly
|
|
fake_spec = objects.RequestSpec()
|
|
fake_spec.instance_uuid = uuids.instance
|
|
fake_args = ['ctxt', fake_spec, [fake_spec.instance_uuid], False,
|
|
False]
|
|
self.assertRaises(messaging.MessagingTimeout,
|
|
self.client.select_destinations, *fake_args)
|
|
mock_select_destinations.assert_called_once_with(*fake_args)
|
|
|
|
@mock.patch.object(scheduler_query_client.SchedulerQueryClient,
|
|
'update_aggregates')
|
|
def test_update_aggregates(self, mock_update_aggs):
|
|
aggregates = [objects.Aggregate(id=1)]
|
|
self.client.update_aggregates(
|
|
context='context',
|
|
aggregates=aggregates)
|
|
mock_update_aggs.assert_called_once_with(
|
|
'context', aggregates)
|
|
|
|
@mock.patch.object(scheduler_query_client.SchedulerQueryClient,
|
|
'delete_aggregate')
|
|
def test_delete_aggregate(self, mock_delete_agg):
|
|
aggregate = objects.Aggregate(id=1)
|
|
self.client.delete_aggregate(
|
|
context='context',
|
|
aggregate=aggregate)
|
|
mock_delete_agg.assert_called_once_with(
|
|
'context', aggregate)
|