diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-26 04:17:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-26 04:17:25 +0000 |
| commit | 8353d1db1d4bf6f8e32901b733aa0e11bd82df0d (patch) | |
| tree | a24d0416751acf8622f15fb40df40ed326739a51 | |
| parent | 4583c562462de8e0a0f7bcfe43a667205d00c10c (diff) | |
| parent | 3d3a263789c5cc49899d63d18f9233c981f5b894 (diff) | |
| download | nova-8353d1db1d4bf6f8e32901b733aa0e11bd82df0d.tar.gz | |
Merge "Exclude build request marker from server listing" into stable/pike
| -rw-r--r-- | nova/objects/build_request.py | 5 | ||||
| -rw-r--r-- | nova/tests/functional/db/test_build_request.py | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/nova/objects/build_request.py b/nova/objects/build_request.py index 6553dc4598..d5f30bf6da 100644 --- a/nova/objects/build_request.py +++ b/nova/objects/build_request.py @@ -447,7 +447,10 @@ class BuildRequestList(base.ObjectListBase, base.NovaObject): if marker: for i, build_req in enumerate(sorted_build_reqs): if build_req.instance.uuid == marker: - marker_index = i + # The marker is the last seen item in the last page, so + # we increment the index to the next item immediately + # after the marker so the marker is not returned. + marker_index = i + 1 break else: raise exception.MarkerNotFound(marker=marker) diff --git a/nova/tests/functional/db/test_build_request.py b/nova/tests/functional/db/test_build_request.py index e34109cd89..71e9091fd2 100644 --- a/nova/tests/functional/db/test_build_request.py +++ b/nova/tests/functional/db/test_build_request.py @@ -520,11 +520,14 @@ class BuildRequestListTestCase(test.NoDBTestCase): sort_dirs=['asc']) self.assertIsInstance(req_list, objects.BuildRequestList) - self.assertEqual(2, len(req_list)) - for i, req in enumerate(reqs[1:]): - self.assertEqual(req.instance_uuid, req_list[i].instance_uuid) - objects.base.obj_equal_prims(req.instance, - req_list[i].instance) + self.assertEqual(1, len(req_list)) + req = req_list[0] + expected_req = reqs[2] + # The returned build request should be the last one in the reqs list + # since the marker is the 2nd item in the list (of 3). + self.assertEqual(expected_req.instance_uuid, req.instance_uuid) + objects.base.obj_equal_prims(expected_req.instance, + req.instance) def test_get_by_filters_marker_not_found(self): self._create_req() @@ -565,7 +568,7 @@ class BuildRequestListTestCase(test.NoDBTestCase): self.assertIsInstance(req_list, objects.BuildRequestList) self.assertEqual(2, len(req_list)) - for i, req in enumerate(reqs[1:3]): + for i, req in enumerate(reqs[2:]): self.assertEqual(req.instance_uuid, req_list[i].instance_uuid) objects.base.obj_equal_prims(req.instance, req_list[i].instance) @@ -585,8 +588,8 @@ class BuildRequestListTestCase(test.NoDBTestCase): sort_keys=['id'], sort_dirs=['asc']) self.assertIsInstance(req_list, objects.BuildRequestList) - self.assertEqual(3, len(req_list)) - for i, req in enumerate(reqs[1:]): + self.assertEqual(2, len(req_list)) + for i, req in enumerate(reqs[2:]): self.assertEqual(req.instance_uuid, req_list[i].instance_uuid) objects.base.obj_equal_prims(req.instance, req_list[i].instance) |