Skip to content

Commit

Permalink
Merge "api-ref: fix addFloatingIp action docs"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Nov 11, 2016
2 parents bc2a5d8 + 0f26e68 commit f21ba22
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
5 changes: 3 additions & 2 deletions api-ref/source/parameters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -806,10 +806,11 @@ addFixedIp:
type: string
addFloatingIp:
description: |
The action.
The action. Contains required floating IP ``address`` and optional
``fixed_address``.
in: body
required: true
type: string
type: object
address:
description: |
The floating IP address.
Expand Down
7 changes: 3 additions & 4 deletions api-ref/source/servers-actions.inc
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,10 @@ Request
- address: address
- fixed_address: fixed_address

.. TODO(gmann) Need to create the sample file for this action.
**Example Add (Associate) Floating Ip (addFloatingIp Action): JSON request**
**Example Add (Associate) Floating Ip (addFloatingIp Action): JSON request**

.. literalinclude:: ../../doc/api_samples/os-floating-ips/floating-ips-create-resp.json
:language: javascript
.. literalinclude:: ../../doc/api_samples/servers/server-action-addfloatingip.json
:language: javascript

Response
--------
Expand Down

0 comments on commit f21ba22

Please sign in to comment.