openstack/nova
Code Issues Proposed changes

Merge "api-ref: docs for microversion v2.28"

Browse Source
This commit is contained in:
Jenkins 2016-06-22 11:43:05 +00:00 committed by Gerrit Code Review
commit a919ea33c8
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api-ref/source/os-hypervisors.inc
View File

@ -84,7 +84,11 @@ Response
**Example List Hypervisors Details: JSON request** **Example List Hypervisors Details: JSON request**
.. literalinclude:: ../../doc/api_samples/os-hypervisors/hypervisors-detail-resp.json .. note::
This API sample is actual since microversion v2.28
.. literalinclude:: ../../doc/api_samples/os-hypervisors/v2.28/hypervisors-detail-resp.json
:language: javascript :language: javascript
Show Hypervisor Statistics Show Hypervisor Statistics
@ -177,7 +181,11 @@ Response
**Example Show Hypervisor Details: JSON response** **Example Show Hypervisor Details: JSON response**
.. literalinclude:: ../../doc/api_samples/os-hypervisors/hypervisors-show-resp.json .. note::
This API sample is actual since microversion v2.28
.. literalinclude:: ../../doc/api_samples/os-hypervisors/v2.28/hypervisors-show-resp.json
:language: javascript :language: javascript
Show Hypervisor Uptime Show Hypervisor Uptime

8
api-ref/source/parameters.yaml
View File

@ -1084,8 +1084,12 @@ cores_quota_optional:
type: integer type: integer
cpu_info: cpu_info:
description: | description: |
The cpu information object. The content of this field is hypervisor A dictionary that contains cpu information like ``arch``, ``model``,
specific. ``vendor``, ``features`` and ``topology``. The content of this field is
hypervisor specific.
NOTE: Since version 2.28 ``cpu_info`` field is returned as a dictionary
instead of string.
in: body in: body
required: true required: true
type: object type: object