diff --git a/api-ref/source/servers.inc b/api-ref/source/servers.inc index df37a4a44ffa..8883f9af0ac9 100644 --- a/api-ref/source/servers.inc +++ b/api-ref/source/servers.inc @@ -1,5 +1,4 @@ .. -*- rst -*- -.. needs:example_verification .. needs:body_verification =================== @@ -388,6 +387,11 @@ Request .. literalinclude:: ../../doc/api_samples/servers/server-create-req.json :language: javascript +**Example Create Server With Networks(array) and Block Device Mapping V2 (v2.32)** + +.. literalinclude:: ../../doc/api_samples/servers/v2.32/server-create-req.json + :language: javascript + **Example Create Server With Automatic Networking (v2.37)** .. literalinclude:: ../../doc/api_samples/servers/v2.37/server-create-req.json @@ -755,25 +759,14 @@ Request - OS-DCF:diskConfig: OS-DCF:diskConfig - description: server_description -**Example Update server name (2.47)** +.. note:: You can specify parameters to update independently. + e.g. ``name`` only, ``description`` only, ``name`` and ``description``, etc. -.. literalinclude:: ../../doc/api_samples/servers/v2.47/server-update-req.json +**Example Update Server (2.63)** + +.. literalinclude:: ../../doc/api_samples/servers/v2.63/server-update-req.json :language: javascript -.. - TODO(sdague): split up the update examples to show them being used - separately. - - **Example Update server IP addresses: JSON request** - - .. literalinclude:: ../../doc/api_samples/servers/server-update-address-req.json - :language: javascript - - **Example Update server OS-DCF:diskConfig parameter: JSON request** - - .. literalinclude:: ../../doc/api_samples/servers/server-update-diskconfig-req.json - :language: javascript - Response -------- @@ -818,7 +811,7 @@ Response - tags: tags - trusted_image_certificates: server_trusted_image_certificates_resp -**Example Update server name (2.63)** +**Example Update Server (2.63)** .. literalinclude:: ../../doc/api_samples/servers/v2.63/server-update-resp.json :language: javascript diff --git a/doc/api_samples/os-hide-server-addresses/servers-details-resp.json b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json index e414e492246e..cfbf90ee8933 100644 --- a/doc/api_samples/os-hide-server-addresses/servers-details-resp.json +++ b/doc/api_samples/os-hide-server-addresses/servers-details-resp.json @@ -66,5 +66,11 @@ "updated": "2013-09-24T14:44:01Z", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/detail?limit=1&marker=a747eac1-e3ed-446c-935a-c2a2853f919c", + "rel": "next" + } ] } diff --git a/doc/api_samples/os-hide-server-addresses/servers-list-resp.json b/doc/api_samples/os-hide-server-addresses/servers-list-resp.json index 2e543f3e0bf0..9481378c2abf 100644 --- a/doc/api_samples/os-hide-server-addresses/servers-list-resp.json +++ b/doc/api_samples/os-hide-server-addresses/servers-list-resp.json @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers?limit=1&marker=b2a7068b-8aed-41a4-aa74-af8feb984bae", + "rel": "next" + } ] } \ No newline at end of file diff --git a/doc/api_samples/servers/servers-details-resp.json b/doc/api_samples/servers/servers-details-resp.json index 07c6fd3aaa7b..28a1e98efe12 100644 --- a/doc/api_samples/servers/servers-details-resp.json +++ b/doc/api_samples/servers/servers-details-resp.json @@ -79,5 +79,11 @@ "updated": "2013-09-03T04:01:32Z", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/detail?limit=1&marker=f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "rel": "next" + } ] } diff --git a/doc/api_samples/servers/servers-list-resp.json b/doc/api_samples/servers/servers-list-resp.json index f4b2ce3802d1..799ef9ba44b8 100644 --- a/doc/api_samples/servers/servers-list-resp.json +++ b/doc/api_samples/servers/servers-list-resp.json @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers?limit=1&marker=22c91117-08de-4894-9aa9-6ef382400985", + "rel": "next" + } ] } \ No newline at end of file diff --git a/doc/api_samples/servers/servers-list-status-resp.json b/doc/api_samples/servers/servers-list-status-resp.json new file mode 100644 index 000000000000..e418ec6bd48a --- /dev/null +++ b/doc/api_samples/servers/servers-list-status-resp.json @@ -0,0 +1,24 @@ +{ + "servers": [ + { + "id": "22c91117-08de-4894-9aa9-6ef382400985", + "links": [ + { + "href": "http://openstack.example.com/v2/6f70656e737461636b20342065766572/servers/22c91117-08de-4894-9aa9-6ef382400985", + "rel": "self" + }, + { + "href": "http://openstack.example.com/6f70656e737461636b20342065766572/servers/22c91117-08de-4894-9aa9-6ef382400985", + "rel": "bookmark" + } + ], + "name": "new-server-test" + } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers?limit=1&status=error&marker=22c91117-08de-4894-9aa9-6ef382400985", + "rel": "next" + } + ] +} diff --git a/doc/api_samples/servers/v2.16/servers-details-resp.json b/doc/api_samples/servers/v2.16/servers-details-resp.json index 125f8caaaa80..9fc17f6137b3 100644 --- a/doc/api_samples/servers/v2.16/servers-details-resp.json +++ b/doc/api_samples/servers/v2.16/servers-details-resp.json @@ -90,5 +90,11 @@ "updated": "2013-09-16T02:55:05Z", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/detail?limit=1&marker=a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", + "rel": "next" + } ] } diff --git a/doc/api_samples/servers/v2.16/servers-list-resp.json b/doc/api_samples/servers/v2.16/servers-list-resp.json index f4b2ce3802d1..799ef9ba44b8 100644 --- a/doc/api_samples/servers/v2.16/servers-list-resp.json +++ b/doc/api_samples/servers/v2.16/servers-list-resp.json @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers?limit=1&marker=22c91117-08de-4894-9aa9-6ef382400985", + "rel": "next" + } ] } \ No newline at end of file diff --git a/doc/api_samples/servers/v2.19/servers-details-resp.json b/doc/api_samples/servers/v2.19/servers-details-resp.json index db3905f7b07e..37f83b7dd354 100644 --- a/doc/api_samples/servers/v2.19/servers-details-resp.json +++ b/doc/api_samples/servers/v2.19/servers-details-resp.json @@ -91,5 +91,11 @@ "updated": "2015-12-07T19:54:49Z", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/detail?limit=1&marker=91965362-fd86-4543-8ce1-c17074d2984d", + "rel": "next" + } ] } diff --git a/doc/api_samples/servers/v2.19/servers-list-resp.json b/doc/api_samples/servers/v2.19/servers-list-resp.json index 60a707fb45d7..f6c9e18fad4b 100644 --- a/doc/api_samples/servers/v2.19/servers-list-resp.json +++ b/doc/api_samples/servers/v2.19/servers-list-resp.json @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers?limit=1&marker=22c91117-08de-4894-9aa9-6ef382400985", + "rel": "next" + } ] } \ No newline at end of file diff --git a/doc/api_samples/servers/v2.3/servers-details-resp.json b/doc/api_samples/servers/v2.3/servers-details-resp.json index ff88dd14ca0c..5e3876fd2c9d 100644 --- a/doc/api_samples/servers/v2.3/servers-details-resp.json +++ b/doc/api_samples/servers/v2.3/servers-details-resp.json @@ -88,5 +88,11 @@ "updated": "2013-09-03T04:01:32Z", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/detail?limit=1&marker=f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "rel": "next" + } ] } diff --git a/doc/api_samples/servers/v2.3/servers-list-resp.json b/doc/api_samples/servers/v2.3/servers-list-resp.json index f4b2ce3802d1..799ef9ba44b8 100644 --- a/doc/api_samples/servers/v2.3/servers-list-resp.json +++ b/doc/api_samples/servers/v2.3/servers-list-resp.json @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers?limit=1&marker=22c91117-08de-4894-9aa9-6ef382400985", + "rel": "next" + } ] } \ No newline at end of file diff --git a/doc/api_samples/servers/v2.47/server-update-req.json b/doc/api_samples/servers/v2.47/server-update-req.json index 56e1a8c56a65..1341355ce52b 100644 --- a/doc/api_samples/servers/v2.47/server-update-req.json +++ b/doc/api_samples/servers/v2.47/server-update-req.json @@ -3,6 +3,7 @@ "accessIPv4": "1.2.3.4", "accessIPv6": "80fe::", "OS-DCF:diskConfig": "AUTO", - "name" : "new-server-test" + "name": "new-server-test", + "description": "Sample description" } -} \ No newline at end of file +} diff --git a/doc/api_samples/servers/v2.47/server-update-resp.json b/doc/api_samples/servers/v2.47/server-update-resp.json index d2b2545f35aa..abf9e107d844 100644 --- a/doc/api_samples/servers/v2.47/server-update-resp.json +++ b/doc/api_samples/servers/v2.47/server-update-resp.json @@ -12,7 +12,7 @@ ] }, "created": "2012-12-02T02:11:57Z", - "description": null, + "description": "Sample description", "flavor": { "disk": 1, "ephemeral": 0, diff --git a/doc/api_samples/servers/v2.47/servers-details-resp.json b/doc/api_samples/servers/v2.47/servers-details-resp.json index 003bc65198e5..11ef8b69a78c 100644 --- a/doc/api_samples/servers/v2.47/servers-details-resp.json +++ b/doc/api_samples/servers/v2.47/servers-details-resp.json @@ -96,5 +96,11 @@ "updated": "2017-02-14T19:24:43Z", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/detail?limit=1&marker=764e369e-a874-4401-b7ce-43e4760888da", + "rel": "next" + } ] } diff --git a/doc/api_samples/servers/v2.47/servers-list-resp.json b/doc/api_samples/servers/v2.47/servers-list-resp.json index c197a33167f8..b46804510b77 100644 --- a/doc/api_samples/servers/v2.47/servers-list-resp.json +++ b/doc/api_samples/servers/v2.47/servers-list-resp.json @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers?limit=1&marker=6e3a87e6-a133-452e-86e1-a31291c1b1c8", + "rel": "next" + } ] } \ No newline at end of file diff --git a/doc/api_samples/servers/v2.52/servers-details-resp.json b/doc/api_samples/servers/v2.52/servers-details-resp.json index 8beef359845c..98285ddc0981 100644 --- a/doc/api_samples/servers/v2.52/servers-details-resp.json +++ b/doc/api_samples/servers/v2.52/servers-details-resp.json @@ -92,5 +92,11 @@ "updated": "2017-02-14T19:24:43Z", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/detail?limit=1&marker=764e369e-a874-4401-b7ce-43e4760888da", + "rel": "next" + } ] } diff --git a/doc/api_samples/servers/v2.52/servers-list-resp.json b/doc/api_samples/servers/v2.52/servers-list-resp.json index c197a33167f8..b46804510b77 100644 --- a/doc/api_samples/servers/v2.52/servers-list-resp.json +++ b/doc/api_samples/servers/v2.52/servers-list-resp.json @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers?limit=1&marker=6e3a87e6-a133-452e-86e1-a31291c1b1c8", + "rel": "next" + } ] } \ No newline at end of file diff --git a/doc/api_samples/servers/v2.63/server-update-req.json b/doc/api_samples/servers/v2.63/server-update-req.json index 56e1a8c56a65..1341355ce52b 100644 --- a/doc/api_samples/servers/v2.63/server-update-req.json +++ b/doc/api_samples/servers/v2.63/server-update-req.json @@ -3,6 +3,7 @@ "accessIPv4": "1.2.3.4", "accessIPv6": "80fe::", "OS-DCF:diskConfig": "AUTO", - "name" : "new-server-test" + "name": "new-server-test", + "description": "Sample description" } -} \ No newline at end of file +} diff --git a/doc/api_samples/servers/v2.63/server-update-resp.json b/doc/api_samples/servers/v2.63/server-update-resp.json index c4c769e16486..b247e1a75268 100644 --- a/doc/api_samples/servers/v2.63/server-update-resp.json +++ b/doc/api_samples/servers/v2.63/server-update-resp.json @@ -12,7 +12,7 @@ ] }, "created": "2012-12-02T02:11:57Z", - "description": null, + "description": "Sample description", "flavor": { "disk": 1, "ephemeral": 0, diff --git a/doc/api_samples/servers/v2.63/servers-details-resp.json b/doc/api_samples/servers/v2.63/servers-details-resp.json index 3cad50bbfe68..5ac4083dd504 100644 --- a/doc/api_samples/servers/v2.63/servers-details-resp.json +++ b/doc/api_samples/servers/v2.63/servers-details-resp.json @@ -91,5 +91,11 @@ "updated": "2017-10-10T15:49:09Z", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/detail?limit=1&marker=569f39f9-7c76-42a1-9c2d-8394e2638a6d", + "rel": "next" + } ] -} \ No newline at end of file +} diff --git a/doc/api_samples/servers/v2.9/servers-details-resp.json b/doc/api_samples/servers/v2.9/servers-details-resp.json index 4c9768dbe7b8..0ca874f33322 100644 --- a/doc/api_samples/servers/v2.9/servers-details-resp.json +++ b/doc/api_samples/servers/v2.9/servers-details-resp.json @@ -89,5 +89,11 @@ "user_id": "fake", "locked": false } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/detail?limit=1&marker=f5dc173b-6804-445a-a6d8-c705dad5b5eb", + "rel": "next" + } ] } diff --git a/doc/api_samples/servers/v2.9/servers-list-resp.json b/doc/api_samples/servers/v2.9/servers-list-resp.json index f4b2ce3802d1..799ef9ba44b8 100644 --- a/doc/api_samples/servers/v2.9/servers-list-resp.json +++ b/doc/api_samples/servers/v2.9/servers-list-resp.json @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers?limit=1&marker=22c91117-08de-4894-9aa9-6ef382400985", + "rel": "next" + } ] } \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl index e5ac026a9046..67c2bf1f368a 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl @@ -66,5 +66,11 @@ "updated": "%(isotime)s", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/detail?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl index f78d963d5d02..9cdb3aa64475 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-hide-server-addresses/servers-list-resp.json.tpl @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl index 766896fdd245..97317e2dad3d 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-details-resp.json.tpl @@ -75,5 +75,11 @@ "updated": "%(isotime)s", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/detail?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl index f78d963d5d02..9cdb3aa64475 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-resp.json.tpl @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-status-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-status-resp.json.tpl new file mode 100644 index 000000000000..6703ab0e8c07 --- /dev/null +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/servers-list-status-resp.json.tpl @@ -0,0 +1,24 @@ +{ + "servers": [ + { + "id": "%(id)s", + "links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/%(id)s", + "rel": "self" + }, + { + "href": "%(compute_endpoint)s/servers/%(id)s", + "rel": "bookmark" + } + ], + "name": "new-server-test" + } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers?limit=1&status=%(status)s&marker=%(id)s", + "rel": "next" + } + ] +} diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl index 771b13fc14de..c438205fd420 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-details-resp.json.tpl @@ -84,5 +84,11 @@ "user_id": "fake", "locked": false } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/detail?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-list-resp.json.tpl index f78d963d5d02..9cdb3aa64475 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.16/servers-list-resp.json.tpl @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl index c14a32ec3608..adb6de734cc4 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-details-resp.json.tpl @@ -85,5 +85,11 @@ "user_id": "fake", "locked": false } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/detail?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-list-resp.json.tpl index f78d963d5d02..9cdb3aa64475 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.19/servers-list-resp.json.tpl @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-details-resp.json.tpl index ecc8095a6a20..edb6ac463b1e 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-details-resp.json.tpl @@ -82,5 +82,11 @@ "updated": "%(isotime)s", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/detail?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-list-resp.json.tpl index f78d963d5d02..9cdb3aa64475 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.3/servers-list-resp.json.tpl @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-req.json.tpl index e34896621d2e..f1f436642fed 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-req.json.tpl @@ -3,6 +3,7 @@ "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", "OS-DCF:diskConfig": "AUTO", - "name" : "new-server-test" + "name": "new-server-test", + "description": "Sample description" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-resp.json.tpl index 76944a9ba7af..a297a767bd56 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/server-update-resp.json.tpl @@ -12,7 +12,7 @@ ] }, "created": "%(isotime)s", - "description": null, + "description": "Sample description", "flavor": { "disk": 1, "ephemeral": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl index 5c848bcd295b..dc2cc5db20f5 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-details-resp.json.tpl @@ -90,5 +90,11 @@ "updated": "%(isotime)s", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/detail?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-list-resp.json.tpl index f78d963d5d02..9cdb3aa64475 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.47/servers-list-resp.json.tpl @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-details-resp.json.tpl index 6bbcde9d2145..1135a590cbea 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-details-resp.json.tpl @@ -86,5 +86,11 @@ "updated": "%(isotime)s", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/detail?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-list-resp.json.tpl index f78d963d5d02..9cdb3aa64475 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.52/servers-list-resp.json.tpl @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-req.json.tpl index e34896621d2e..f1f436642fed 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-req.json.tpl @@ -3,6 +3,7 @@ "accessIPv4": "%(access_ip_v4)s", "accessIPv6": "%(access_ip_v6)s", "OS-DCF:diskConfig": "AUTO", - "name" : "new-server-test" + "name": "new-server-test", + "description": "Sample description" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl index fed78fd555d7..b415e59d7ae8 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/server-update-resp.json.tpl @@ -12,7 +12,7 @@ ] }, "created": "%(isotime)s", - "description": null, + "description": "Sample description", "flavor": { "disk": 1, "ephemeral": 0, diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl index 9a8872d36a38..43366e5a7773 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.63/servers-details-resp.json.tpl @@ -91,5 +91,11 @@ "updated": "%(isotime)s", "user_id": "fake" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/detail?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl index 341332c2d23a..9ad567291fe0 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-details-resp.json.tpl @@ -83,5 +83,11 @@ "user_id": "fake", "locked": false } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers/detail?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl index f78d963d5d02..9cdb3aa64475 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/servers/v2.9/servers-list-resp.json.tpl @@ -14,5 +14,11 @@ ], "name": "new-server-test" } + ], + "servers_links": [ + { + "href": "%(versioned_compute_endpoint)s/servers?limit=1&marker=%(id)s", + "rel": "next" + } ] } diff --git a/nova/tests/functional/api_sample_tests/test_servers.py b/nova/tests/functional/api_sample_tests/test_servers.py index 1d1bb8ca814a..c1e2212cbdd1 100644 --- a/nova/tests/functional/api_sample_tests/test_servers.py +++ b/nova/tests/functional/api_sample_tests/test_servers.py @@ -120,7 +120,7 @@ class ServersSampleJsonTest(ServersSampleBase): def test_servers_list(self): uuid = self._post_server() - response = self._do_get('servers') + response = self._do_get('servers?limit=1') subs = {'id': uuid} self._verify_response('servers-list-resp', subs, response, 200) @@ -128,7 +128,7 @@ class ServersSampleJsonTest(ServersSampleBase): self.stub_out('nova.db.block_device_mapping_get_all_by_instance_uuids', fakes.stub_bdm_get_all_by_instance_uuids) uuid = self.test_servers_post() - response = self._do_get('servers/detail') + response = self._do_get('servers/detail?limit=1') subs = {} subs['hostid'] = '[a-f0-9]+' subs['id'] = uuid @@ -288,7 +288,7 @@ class ServersSampleJson263Test(ServersSampleBase): def test_servers_details(self): uuid = self._post_server(use_common_server_api_samples=False) - response = self._do_get('servers/detail') + response = self._do_get('servers/detail?limit=1') subs = self.common_subs.copy() subs['id'] = uuid self._verify_response('servers-details-resp', subs, response, 200) @@ -621,9 +621,9 @@ class ServersSampleMultiStatusJsonTest(ServersSampleBase): def test_servers_list(self): uuid = self._post_server() - response = self._do_get('servers?status=active&status=error') - subs = {'id': uuid} - self._verify_response('servers-list-resp', subs, response, 200) + response = self._do_get('servers?limit=1&status=active&status=error') + subs = {'id': uuid, 'status': 'error'} + self._verify_response('servers-list-status-resp', subs, response, 200) class ServerTriggerCrashDumpJsonTest(ServersSampleBase):