From 45c2752f2ce08b314012eff044b01aa7d626b43d Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Tue, 22 Oct 2019 17:53:20 -0400 Subject: [PATCH] Add functional regression test for bug 1849409 Change I1aa3ca6cc70cef65d24dec1e7db9491c9b73f7ab in Queens, which was backported through to Newton, introduced a regression when listing deleted servers with a marker because it assumes that if BuildRequestList.get_by_filters does not raise MarkerNotFound that the marker was found among the build requests and does not account for that get_by_filters method short-circuiting if filtering servers with deleted/cleaned/limit=0. The API code then nulls out the marker which means you'll continue to get the marker instance back in the results even though you shouldn't, and that can cause an infinite loop in some client-side tooling like nova's CLI: nova list --deleted --limit -1 This adds a functional recreate test for the regression which will be updated when the bug is fixed. Change-Id: I324193129acb6ac739133c7e76920762a8987a84 Related-Bug: #1849409 --- .../regressions/test_bug_1849409.py | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 nova/tests/functional/regressions/test_bug_1849409.py diff --git a/nova/tests/functional/regressions/test_bug_1849409.py b/nova/tests/functional/regressions/test_bug_1849409.py new file mode 100644 index 000000000000..4b41c7ae934f --- /dev/null +++ b/nova/tests/functional/regressions/test_bug_1849409.py @@ -0,0 +1,64 @@ +# 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. + +from nova import test +from nova.tests import fixtures as nova_fixtures +from nova.tests.functional import fixtures as func_fixtures +from nova.tests.functional import integrated_helpers +from nova.tests.unit.image import fake as fake_image + + +class ListDeletedServersWithMarker(test.TestCase, + integrated_helpers.InstanceHelperMixin): + """Regression test for bug 1849409 introduced in Queens where listing + deleted servers with a marker returns the wrong results because the marker + is nulled out if BuildRequestList.get_by_filters does not raise + MarkerNotFound, but that does not mean the marker was found in the build + request list. + """ + def setUp(self): + super(ListDeletedServersWithMarker, self).setUp() + # Start standard fixtures. + self.useFixture(func_fixtures.PlacementFixture()) + self.useFixture(nova_fixtures.NeutronFixture(self)) + fake_image.stub_out_image_service(self) + self.addCleanup(fake_image.FakeImageService_reset) + # Start nova services. + self.api = self.useFixture(nova_fixtures.OSAPIFixture( + api_version='v2.1')).admin_api + self.start_service('conductor') + self.start_service('scheduler') + self.start_service('compute') + + def test_list_deleted_servers_with_marker(self): + # Create a server. + server = self._build_minimal_create_server_request( + self.api, 'test_list_deleted_servers_with_marker', + image_uuid=fake_image.get_valid_image_id()) + server = self.api.post_server({'server': server}) + server = self._wait_for_state_change(self.api, server, 'ACTIVE') + # Now delete the server and wait for it to be gone. + self.api.delete_server(server['id']) + self._wait_until_deleted(server) + # List deleted servers, we should get the one back. + servers = self.api.get_servers(detail=False, + search_opts={'deleted': True}) + self.assertEqual(1, len(servers), servers) + self.assertEqual(server['id'], servers[0]['id']) + # Now list deleted servers with a marker which should not return the + # marker instance. + servers = self.api.get_servers(detail=False, + search_opts={'deleted': True, + 'marker': server['id']}) + # FIXME(mriedem): This is bug 1849409 where the marker param is not + # honored correctly when using deleted=True. + self.assertEqual(1, len(servers), servers)