diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-23 12:29:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-23 12:29:35 +0000 |
| commit | 35ded83a91b6889123e519a8e1833926fa33080c (patch) | |
| tree | f811a1cb41b289af16d38cb87a05962e663c14e8 /ironic/api/controllers/v1/conductor.py | |
| parent | f7caa625c72801e3c2b53be9e7014ef3f968501f (diff) | |
| parent | 0785477a6304bf9280dde503cdd18a467ddced13 (diff) | |
| download | ironic-12.1.3.tar.gz | |
Merge "Do not ignore 'fields' query parameter when building next url" into stable/stein12.1.3
Diffstat (limited to 'ironic/api/controllers/v1/conductor.py')
| -rw-r--r-- | ironic/api/controllers/v1/conductor.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ironic/api/controllers/v1/conductor.py b/ironic/api/controllers/v1/conductor.py index b405e3e10..f71bbc60b 100644 --- a/ironic/api/controllers/v1/conductor.py +++ b/ironic/api/controllers/v1/conductor.py @@ -140,7 +140,8 @@ class ConductorCollection(collection.Collection): collection = ConductorCollection() collection.conductors = [Conductor.convert_with_links(c, fields=fields) for c in conductors] - collection.next = collection.get_next(limit, url=url, **kwargs) + collection.next = collection.get_next(limit, url=url, fields=fields, + **kwargs) for conductor in collection.conductors: conductor.sanitize(fields) |