URLS in os-keypairs 'links' body are incorrect

[Stephen Finucane]

Similar to https://bugs.launchpad.net/nova/+bug/1864428, the URLs in the 'links' element of the response are incorrect. They read '/keypairs', not '/os-keypairs'. From the current api-ref (2020-03-06):

    {
        "keypairs": [
            {
                "keypair": {
                    "fingerprint": "7e:eb:ab:24:ba:d1:e1:88:ae:9a:fb:66:53:df:d3:bd",
                    "name": "keypair-5d935425-31d5-48a7-a0f1-e76e9813f2c3",
                    "type": "ssh",
                    "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkF3MX59OrlBs3dH5CU7lNmvpbrgZxSpyGjlnE8Flkirnc/Up22lpjznoxqeoTAwTW034k7Dz6aYIrZGmQwe2TkE084yqvlj45Dkyoj95fW/sZacm0cZNuL69EObEGHdprfGJQajrpz22NQoCD8TFB8Wv+8om9NH9Le6s+WPe98WC77KLw8qgfQsbIey+JawPWl4O67ZdL5xrypuRjfIPWjgy/VH85IXg/Z/GONZ2nxHgSShMkwqSFECAC5L3PHB+0+/12M/iikdatFSVGjpuHvkLOs3oe7m6HlOfluSJ85BzLWBbvva93qkGmLg4ZAc8rPh2O+YIsBUHNLLMM/oQp Generated-by-Nova\n"
                }
            }
        ],
        "keypairs_links": [
            {
                "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/keypairs?limit=1&marker=keypair-5d935425-31d5-48a7-a0f1-e76e9813f2c3",
                "rel": "next"
            }
        ]
    }

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/711662

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/train
Review: https://review.opendev.org/711895

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/stein
Review: https://review.opendev.org/711896

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/rocky
Review: https://review.opendev.org/711898

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/711662
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=f31efe0a0e3f194ca415ac41c225f63dbb69267b
Submitter: Zuul
Branch: master

commit f31efe0a0e3f194ca415ac41c225f63dbb69267b
Author: Stephen Finucane <email address hidden>
Date: Fri Mar 6 16:52:14 2020 +0000

    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).

    Change-Id: Ic04568caecc138e6016418f6878d031c4a0d3fb4
    Signed-off-by: Stephen Finucane <email address hidden>
    Closes-bug: #1866373

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/711895
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=93f903d7949194a3e00647d8a17b2d3bee3904e5
Submitter: Zuul
Branch: stable/train

commit 93f903d7949194a3e00647d8a17b2d3bee3904e5
Author: Stephen Finucane <email address hidden>
Date: Fri Mar 6 16:52:14 2020 +0000

    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 <email address hidden>
    Closes-bug: #1866373
    (cherry picked from commit f31efe0a0e3f194ca415ac41c225f63dbb69267b)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/711896
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=85052c055fb062f4a2ca7bb833f1cb344073b6de
Submitter: Zuul
Branch: stable/stein

commit 85052c055fb062f4a2ca7bb833f1cb344073b6de
Author: Stephen Finucane <email address hidden>
Date: Fri Mar 6 16:52:14 2020 +0000

    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).

    Change-Id: Ic04568caecc138e6016418f6878d031c4a0d3fb4
    Signed-off-by: Stephen Finucane <email address hidden>
    Closes-bug: #1866373
    (cherry picked from commit f31efe0a0e3f194ca415ac41c225f63dbb69267b)
    (cherry picked from commit 93f903d7949194a3e00647d8a17b2d3bee3904e5)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/711898
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=d8bd2392b225babf7a39ef16c82e79016db04a36
Submitter: Zuul
Branch: stable/rocky

commit d8bd2392b225babf7a39ef16c82e79016db04a36
Author: Stephen Finucane <email address hidden>
Date: Fri Mar 6 16:52:14 2020 +0000

    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).

    Change-Id: Ic04568caecc138e6016418f6878d031c4a0d3fb4
    Signed-off-by: Stephen Finucane <email address hidden>
    Closes-bug: #1866373
    (cherry picked from commit f31efe0a0e3f194ca415ac41c225f63dbb69267b)
    (cherry picked from commit 93f903d7949194a3e00647d8a17b2d3bee3904e5)
    (cherry picked from commit 85052c055fb062f4a2ca7bb833f1cb344073b6de)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/nova rocky-eol release.