openstack/api-site
Code Issues Proposed changes

Merge "Add "locked" information in server details"

Browse Source
This commit is contained in:
Jenkins
2015-08-14 15:11:11 +00:00
committed by Gerrit Code Review
parent b92d741d56 2edd11a9a9
commit e7ea81fd7f
7 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api-ref/src/docbkx/ch_compute-v2.1.xml
View File

@@ -60,8 +60,8 @@
Shows server usage for a specified server.
</para>
<para>
Shows <code>os-server-usage:launched_at</code> and
<code>os-server-usage:terminated_at</code> attributes in server responses.
Shows <code>OS-SRV-USG:launched_at</code> and
<code>OS-SRV-USG:terminated_at</code> attributes in server responses.
</para>
<wadl:resources
href="../wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl"

3
api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/server-get-resp.json
View File

@@ -52,6 +52,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-08-15T08:12:40Z",
"user_id": "fake"
"user_id": "fake",
"locked": false
}
}

3
api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-server-usage/servers-detail-resp.json
View File

@@ -53,7 +53,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-08-15T12:04:05Z",
"user_id": "fake"
"user_id": "fake",
"locked": false
}
]
}

11
api-ref/src/wadls/compute-api/src/v2.1/common.ent
View File

@@ -537,6 +537,17 @@
</para>
</wadl:doc>
</param>'>
<!ENTITY serverListDetailsResponseParameters '
<param xmlns="http://wadl.dev.java.net/2009/02" name="locked"
style="plain" required="true" type="xsd:boolean" default="ALL">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>
Indicates whether the server is locked (<code>true</code>) or unlocked
(<code>false</code>).
</para>
</wadl:doc>
</param>'>
<!-- Servers Extended Attributes Parameters -->
<!ENTITY GetListServersDetailQueryParameters '
<param xmlns="http://wadl.dev.java.net/2009/02"

8
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl
View File

@@ -70,7 +70,9 @@
<xsdxt:code
href="../api_samples/os-server-usage/server-get-resp.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc>
&x-openstack-request-idHeader;
&serverListDetailsResponseParameters;
</representation>
</response>
</method>
@@ -92,7 +94,9 @@
<xsdxt:code
href="../api_samples/os-server-usage/servers-detail-resp.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc>
&x-openstack-request-idHeader;
&serverListDetailsResponseParameters;
</representation>
</response>
</method>

4
api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/server-get-resp.json
View File

@@ -46,8 +46,8 @@
"My Server Name": "Apache1"
},
"name": "new-server-test",
"os-server-usage:launched_at": "2013-08-15T08:12:40.108903",
"os-server-usage:terminated_at": null,
"OS-SRV-USG:launched_at": "2013-08-15T08:12:40.108903",
"OS-SRV-USG:terminated_at": null,
"progress": 0,
"status": "ACTIVE",
"tenant_id": "openstack",

4
api-ref/src/wadls/compute-api/src/v2/api_samples/os-server-usage/servers-detail-resp.json
View File

@@ -47,8 +47,8 @@
"My Server Name": "Apache1"
},
"name": "new-server-test",
"os-server-usage:launched_at": "2013-08-15T12:04:05.368766",
"os-server-usage:terminated_at": null,
"OS-SRV-USG:launched_at": "2013-08-15T12:04:05.368766",
"OS-SRV-USG:terminated_at": null,
"progress": 0,
"status": "ACTIVE",
"tenant_id": "openstack",