From 4569c310760db7b755e9cc382e54ebfd4aaa648a Mon Sep 17 00:00:00 2001 From: Kevin_Zheng Date: Fri, 16 Oct 2015 10:28:07 +0800 Subject: [PATCH] Merge scheduler-hints section of compute v2.1 API doc to servers section The v2.1 compute API doc now contains servers section, the scheduler-hints section should be merged into the servers section. Change-Id: Ia88b77c8bdc4f06565807bdb91441da121fea29c Closes-Bug: #1506698 --- api-ref/src/docbkx/ch_compute-v2.1.xml | 10 -- .../all_extensions/server-post-req.json | 3 + .../scheduler-hints-post-req.json | 10 -- .../scheduler-hints-post-resp.json | 16 -- .../src/wadls/compute-api/src/v2.1/common.ent | 12 ++ .../v2.1/wadl/os-scheduler-hints-v2.1.wadl | 168 ------------------ 6 files changed, 15 insertions(+), 204 deletions(-) delete mode 100644 api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-scheduler-hints/scheduler-hints-post-req.json delete mode 100644 api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json delete mode 100644 api-ref/src/wadls/compute-api/src/v2.1/wadl/os-scheduler-hints-v2.1.wadl diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml index af1fd5852..b9c8554ec 100644 --- a/api-ref/src/docbkx/ch_compute-v2.1.xml +++ b/api-ref/src/docbkx/ch_compute-v2.1.xml @@ -785,16 +785,6 @@ href="../wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl" xmlns:wadl="http://wadl.dev.java.net/2009/02"/> -
- Scheduler hints (os-scheduler-hints) - - Creates a server with scheduler hints that are passed directly to the - scheduler. - - -
Security groups (os-security-groups) diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-req.json index 284192f69..06105e87a 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-req.json @@ -5,6 +5,9 @@ "flavorRef": "http://openstack.example.com/flavors/1", "metadata": { "My Server Name": "Apache1" + }, + "os:scheduler_hints": { + "same_host": "48e6a9f6-30af-47e0-bc04-acaed113bb4e" } } } diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-scheduler-hints/scheduler-hints-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-scheduler-hints/scheduler-hints-post-req.json deleted file mode 100644 index 2cf64ed7c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-scheduler-hints/scheduler-hints-post-req.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "server": { - "name": "new-server-test", - "imageRef": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", - "flavorRef": "http://openstack.example.com/openstack/flavors/1" - }, - "os:scheduler_hints": { - "same_host": "48e6a9f6-30af-47e0-bc04-acaed113bb4e" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json deleted file mode 100644 index fb7703c09..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-scheduler-hints/scheduler-hints-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "erQXgJ8NBDD4", - "id": "4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", - "links": [ - { - "href": "http://openstack.example.com/v2.1/servers/4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/4c8b1df3-46f7-4555-98d8-cdb869aaf9ad", - "rel": "bookmark" - } - ] - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/common.ent b/api-ref/src/wadls/compute-api/src/v2.1/common.ent index d63688fa4..8f8079256 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/common.ent +++ b/api-ref/src/wadls/compute-api/src/v2.1/common.ent @@ -420,6 +420,18 @@ Key pair name. + + + + + The dictionary of data to send to the scheduler. + Alternatively, you can specify OS-SCH-HNT:scheduler_hints + as the string. + + '> - - - %common; - - %common_project; -]> - - - - - - - - - - - - Creates a server with scheduler hints that are passed directly - to the scheduler. - - - The os:scheduler_hints parameter can be set at - boot time. For details, see Scheduling. - - - - - - - - - - - The name of the security group. If blank, the - server is created in the "default" security group. - - - - - - - Configuration information or scripts to use upon - launch. Must be Base64 encoded. - - - - - - - The availability zone in which to launch the server. - - - - - - Server. - - - - - The image reference for the desired image - for your server instance. - Specify as an ID or full - URL. - - - - - The flavor reference for the desired flavor - for your server instance. - Specify as an ID or full - URL. - - - - - - The name for your created server. - - - - - - - Metadata key and value pairs. The maximum size of - the metadata key and value is 255 bytes each. - - - - - - - File path and contents (text only) to inject into - the server at launch. The maximum size of the file - path data is 255 bytes. The maximum limit refers - to the number of bytes in the decoded data and not - the number of characters in the encoded data. - - - - - - - The dictionary of data to send to the scheduler. - Alternatively, you can specify OS-SCH-HNT:scheduler_hints - as the string. - - - - - - - - - - - - - -