diff options
| -rw-r--r-- | nova/scheduler/client/report.py | 6 | ||||
| -rw-r--r-- | nova/tests/functional/test_report_client.py | 32 |
2 files changed, 35 insertions, 3 deletions
diff --git a/nova/scheduler/client/report.py b/nova/scheduler/client/report.py index 9b0185a958..51005164a9 100644 --- a/nova/scheduler/client/report.py +++ b/nova/scheduler/client/report.py @@ -1095,7 +1095,11 @@ class SchedulerReportClient(object): # @safe_connect, so we don't want to decorate this whole method with it @safe_connect def do_put(url, payload): - return self.put(url, payload, global_request_id=context.global_id) + # NOTE(vdrok): in microversion 1.26 it is allowed to have inventory + # records with reserved value equal to total + return self.put( + url, payload, global_request_id=context.global_id, + version=ALLOW_RESERVED_EQUAL_TOTAL_INVENTORY_VERSION) # If not different from what we've got, short out if not self._provider_tree.has_inventory_changed(rp_uuid, inv_data): diff --git a/nova/tests/functional/test_report_client.py b/nova/tests/functional/test_report_client.py index ff8fddafd9..1247cfcf6d 100644 --- a/nova/tests/functional/test_report_client.py +++ b/nova/tests/functional/test_report_client.py @@ -79,7 +79,7 @@ class VersionCheckingReportClient(report.SchedulerReportClient): class SchedulerReportClientTestBase(test.TestCase): - def _interceptor(self, app=None): + def _interceptor(self, app=None, latest_microversion=True): """Set up an intercepted placement API to test against. Use as e.g. @@ -88,6 +88,10 @@ class SchedulerReportClientTestBase(test.TestCase): ret = client.get_provider_tree_and_ensure_root(...) :param app: An optional wsgi app loader. + :param latest_microversion: If True (the default), API requests will + use the latest microversion if not + otherwise specified. If False, the base + microversion is the default. :return: Context manager, which in turn returns a direct SchedulerReportClient. """ @@ -102,7 +106,8 @@ class SchedulerReportClientTestBase(test.TestCase): self._set_client(client) return client - interceptor = ReportClientInterceptor(CONF, latest_microversion=True) + interceptor = ReportClientInterceptor( + CONF, latest_microversion=latest_microversion) if app: interceptor.app = app return interceptor @@ -505,6 +510,29 @@ class SchedulerReportClientTests(SchedulerReportClientTestBase): self.assertFalse(prov_tree.have_aggregates_changed( self.compute_uuid, [uuids.agg_disk_1, uuids.agg_disk_2])) + def test__set_inventory_reserved_eq_total(self): + with self._interceptor(latest_microversion=False): + # Create the provider + self.client._ensure_resource_provider(self.context, uuids.cn) + + # Make sure we can set reserved value equal to total + inv = { + fields.ResourceClass.SRIOV_NET_VF: { + 'total': 24, + 'reserved': 24, + 'min_unit': 1, + 'max_unit': 24, + 'step_size': 1, + 'allocation_ratio': 1.0, + }, + } + self.client._set_inventory_for_provider( + self.context, uuids.cn, inv) + self.assertEqual( + inv, + self.client._get_inventory( + self.context, uuids.cn)['inventories']) + def test__set_inventory_for_provider(self): """Tests for SchedulerReportClient._set_inventory_for_provider, NOT set_inventory_for_provider. |