Browse Source

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

changes/03/715403/1
Zuul 1 year ago
committed by Gerrit Code Review
parent
commit
569b812c3b
  1. 4
      doc/api_samples/keypairs/v2.35/keypairs-list-resp.json
  2. 4
      doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json
  3. 2
      nova/api/openstack/compute/views/keypairs.py
  4. 2
      nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-resp.json.tpl
  5. 2
      nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json.tpl

4
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"
}
]
}
}

4
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"
}
]
}
}

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

@ -18,7 +18,7 @@ from nova.api.openstack import common
class ViewBuilder(common.ViewBuilder):
_collection_name = "keypairs"
_collection_name = 'os-keypairs'
def get_links(self, 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

@ -11,7 +11,7 @@
],
"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"
}
]

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

@ -11,7 +11,7 @@
],
"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"
}
]

Loading…
Cancel
Save