From b5489e077fb28083e230d63d5eb231fd581c056b Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Mon, 9 Apr 2012 10:25:23 -0700 Subject: [PATCH] Fix floating ip examples and add pool parameter Change-Id: I3ff6b5ea8779e5ab71d21e3c2dbdc663f830e684 --- .../compute-api/src/ext/os-floating-ips.wadl | 18 ++++++++++-- .../src/ext/samples/allocate_floating_ip.json | 10 ------- .../samples/allocate_floating_ip_request.json | 3 ++ .../allocate_floating_ip_response.json | 9 ++++++ .../src/ext/samples/floating_ip_detail.json | 15 +++++----- .../src/ext/samples/list_floating_ips.json | 29 ++++++++++--------- 6 files changed, 50 insertions(+), 34 deletions(-) delete mode 100644 doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip.json create mode 100644 doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip_request.json create mode 100644 doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip_response.json diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-floating-ips.wadl b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-floating-ips.wadl index 25ab237391..5b8548b24a 100644 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-floating-ips.wadl +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-floating-ips.wadl @@ -54,14 +54,28 @@

Allocate a new floating IP address to a tenant or account.

 + + + +

+ Pool to allocate ip from. Will use default pool if not specified. +

+ + + + + + + + - + -

If there are no floating IPs available, the +

If there are no floating IPs available, the extension returns an error code 400 with a message indicating that no more floating IPs are available.

 diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip.json deleted file mode 100644 index 8906e5c38d..0000000000 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "floating_ip" : - { - "fixed_ip" : "10.0.0.3", - "id" : 1, - "instance_id" : 1, - "ip" : "10.6.0.0" - } -} - diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip_request.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip_request.json new file mode 100644 index 0000000000..fc6476862c --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip_request.json @@ -0,0 +1,3 @@ +{ + "pool": "nova" +} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip_response.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip_response.json new file mode 100644 index 0000000000..77990a462b --- /dev/null +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/allocate_floating_ip_response.json @@ -0,0 +1,9 @@ +{ + "floating_ip": { + "fixed_ip": null, + "id": 1, + "instance_id": null, + "ip": "10.6.0.1", + "pool": "nova" + } +} diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/floating_ip_detail.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/floating_ip_detail.json index 0b744c407d..f94614daf0 100644 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/floating_ip_detail.json +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/floating_ip_detail.json @@ -1,10 +1,9 @@ { - "floating_ip" : - { - "fixed_ip" : "10.0.0.3", - "id" : 1, - "instance_id" : 1, - "ip" : "10.6.0.0" - } + "floating_ip": { + "fixed_ip": "10.0.0.3, + "id": 1, + "instance_id": "20c8acc0-f747-4d71-a389-46d078ebf047", + "ip": "10.6.0.1", + "pool": "nova" + } } - diff --git a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/list_floating_ips.json b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/list_floating_ips.json index edc42377d6..fe410a977c 100644 --- a/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/list_floating_ips.json +++ b/doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/samples/list_floating_ips.json @@ -1,17 +1,18 @@ { - "floating_ips" : [ - { - "fixed_ip" : "10.0.0.3", - "id" : 1, - "instance_id" : 1, - "ip" : "10.6.0.0" - }, - { - "fixed_ip" : null, - "id" : 2, - "instance_id" : null, - "ip" : "10.6.0.1" - } + "floating_ips": [ + { + "fixed_ip": null, + "id": 1, + "instance_id": null, + "ip": "10.6.0.1", + "pool": "nova" + }, + { + "fixed_ip": null, + "id": 2, + "instance_id": null, + "ip": "10.6.0.2", + "pool": "nova" + } ] } -