openstack
/
nova
Code Issues Proposed changes

Merge "Fix os-keypairs pagination links" into stable/rocky

This commit is contained in:
Zuul 2020-03-19 19:34:20 +00:00 committed by Gerrit Code Review
parent 18032072d4 d8bd2392b2
commit 569b812c3b
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/api_samples/keypairs/v2.35/keypairs-list-resp.json
View File

@ -11,8 +11,8 @@
], ],
"keypairs_links": [ "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" "rel": "next"
} }
] ]
} }

4
doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json
View File

@ -11,8 +11,8 @@
], ],
"keypairs_links": [ "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" "rel": "next"
} }
] ]
} }

2
nova/api/openstack/compute/views/keypairs.py
View File

@ -18,7 +18,7 @@ from nova.api.openstack import common
class ViewBuilder(common.ViewBuilder): class ViewBuilder(common.ViewBuilder):
_collection_name = "keypairs" _collection_name = 'os-keypairs'
def get_links(self, request, keypairs): def get_links(self, request, keypairs):
return self._get_collection_links(request, keypairs, return self._get_collection_links(request, keypairs,

2
nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-resp.json.tpl
View File

@ -11,7 +11,7 @@
], ],
"keypairs_links": [ "keypairs_links": [
{ {
"href": "%(versioned_compute_endpoint)s/keypairs?limit=1&marker=%(keypair_name)s", "href": "%(versioned_compute_endpoint)s/os-keypairs?limit=1&marker=%(keypair_name)s",
"rel": "next" "rel": "next"
} }
] ]

2
nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json.tpl
View File

@ -11,7 +11,7 @@
], ],
"keypairs_links": [ "keypairs_links": [
{ {
"href": "%(versioned_compute_endpoint)s/keypairs?limit=1&marker=%(keypair_name)s&user_id=user2", "href": "%(versioned_compute_endpoint)s/os-keypairs?limit=1&marker=%(keypair_name)s&user_id=user2",
"rel": "next" "rel": "next"
} }
] ]