diff --git a/nova/scheduler/client/report.py b/nova/scheduler/client/report.py index 6fa51694069c..70a4d46be2c2 100644 --- a/nova/scheduler/client/report.py +++ b/nova/scheduler/client/report.py @@ -22,6 +22,4 @@ class SchedulerReportClient(object): :param compute_node: updated nova.objects.ComputeNode to report """ - if not compute_node.update_inventory(): - compute_node.create_inventory() compute_node.save() diff --git a/nova/tests/unit/scheduler/test_client.py b/nova/tests/unit/scheduler/test_client.py index 6080adb9eace..ee85978f42f8 100644 --- a/nova/tests/unit/scheduler/test_client.py +++ b/nova/tests/unit/scheduler/test_client.py @@ -38,10 +38,7 @@ class SchedulerReportClientTestCase(test.NoDBTestCase): self.client = scheduler_report_client.SchedulerReportClient() @mock.patch.object(objects.ComputeNode, 'save') - @mock.patch.object(objects.ComputeNode, 'create_inventory') - @mock.patch.object(objects.ComputeNode, 'update_inventory') - def test_update_resource_stats_saves(self, mock_update, - mock_create, mock_save): + def test_update_resource_stats_saves(self, mock_save): cn = objects.ComputeNode(context=self.context) cn.host = 'fakehost' cn.hypervisor_hostname = 'fakenode' @@ -50,29 +47,8 @@ class SchedulerReportClientTestCase(test.NoDBTestCase): "product_id": "foo", "count": 1, "a": "b"}]) - mock_update.return_value = True self.client.update_resource_stats(cn) mock_save.assert_called_once_with() - mock_update.assert_called_once_with() - self.assertFalse(mock_create.called) - - @mock.patch.object(objects.ComputeNode, 'save') - @mock.patch.object(objects.ComputeNode, 'create_inventory') - @mock.patch.object(objects.ComputeNode, 'update_inventory') - def test_update_resource_stats_creates(self, mock_update, - mock_create, mock_save): - cn = objects.ComputeNode(context=self.context) - cn.host = 'fakehost' - cn.hypervisor_hostname = 'fakenode' - cn.pci_device_pools = pci_device_pool.from_pci_stats( - [{"vendor_id": "foo", - "product_id": "foo", - "count": 1, - "a": "b"}]) - mock_update.return_value = False - self.client.update_resource_stats(cn) - mock_save.assert_called_once_with() - mock_create.assert_called_once_with() class SchedulerQueryClientTestCase(test.NoDBTestCase):