diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2020-03-06 16:52:14 +0000 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2020-03-10 15:39:14 +0000 |
| commit | 93f903d7949194a3e00647d8a17b2d3bee3904e5 (patch) | |
| tree | a144b430712a4723433659f1296769b7a49b4881 /doc | |
| parent | 8c36c0ac8e52dc2c41ac979ff606302e90ff5721 (diff) | |
| download | nova-93f903d7949194a3e00647d8a17b2d3bee3904e5.tar.gz | |
Fix os-keypairs pagination links
The API URL is '/os-keypairs', not '/keypairs'. Attempting to use these
pagination links as-is will result in a HTTP 404 (Not Found).
Conflicts:
nova/api/openstack/compute/views/keypairs.py
NOTE(stephenfin): Conflict due to absence of change
I2820143b7b5b6f74a6c3ca67a5c9d0980e3e9a86, which we don't want to
backport.
Change-Id: Ic04568caecc138e6016418f6878d031c4a0d3fb4
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Closes-bug: #1866373
(cherry picked from commit f31efe0a0e3f194ca415ac41c225f63dbb69267b)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api_samples/keypairs/v2.35/keypairs-list-resp.json | 4 | ||||
| -rw-r--r-- | doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-list-resp.json b/doc/api_samples/keypairs/v2.35/keypairs-list-resp.json index 69c8ec4f14..786a0b6ce2 100644 --- a/doc/api_samples/keypairs/v2.35/keypairs-list-resp.json +++ b/doc/api_samples/keypairs/v2.35/keypairs-list-resp.json @@ -11,8 +11,8 @@ ], "keypairs_links": [ { - "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/keypairs?limit=1&marker=keypair-5d935425-31d5-48a7-a0f1-e76e9813f2c3", + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-keypairs?limit=1&marker=keypair-5d935425-31d5-48a7-a0f1-e76e9813f2c3", "rel": "next" } ] -}
\ No newline at end of file +} diff --git a/doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json b/doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json index 3c75f9ef62..e9a5e9318b 100644 --- a/doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json +++ b/doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json @@ -11,8 +11,8 @@ ], "keypairs_links": [ { - "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/keypairs?limit=1&marker=keypair-5d935425-31d5-48a7-a0f1-e76e9813f2c3&user_id=user2", + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-keypairs?limit=1&marker=keypair-5d935425-31d5-48a7-a0f1-e76e9813f2c3&user_id=user2", "rel": "next" } ] -}
\ No newline at end of file +} |