openstack
/
api-site
Code Issues Proposed changes

Change wording for delete action under lock state 

There are duplication for the lock state description,
also some wording is miss leading , make it clearer.

Change-Id: If2d83fa7cdb209b53a1156ab13794e78694d5db6
Partial-Bug: #1515222
This commit is contained in:
jichenjc 2015-11-24 10:40:01 +08:00 committed by Diane Fleming
parent c829e2f679
commit 91b56ec616
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl
View File

@ -478,20 +478,14 @@
</listitem>
<listitem>
<para>
Anyone can delete a server when the server's
status is not locked.
Anyone can delete a server when the status of the server is
not locked and when the policy allows.
</para>
</listitem>
<listitem>
<para>
You can delete a server which status is
not locked.
</para>
</listitem>
<listitem>
<para>
If the server is locked, you need to
have administrator privileges to delete the server.
If the server is locked, you must have administrator
privileges to delete the server.
</para>
</listitem>
</itemizedlist>
@ -499,27 +493,24 @@
<itemizedlist>
<listitem>
<para>
With correct permissions, you can see the
server status as <code>DELETED</code> through API
calls.
With correct permissions, you can see the server status as
<code>DELETED</code> through API calls.
</para>
</listitem>
<listitem>
<para>
The port attached to the server
is deleted.
The port attached to the server is deleted.
</para>
</listitem>
<listitem>
<para>
The server is deleted from the list of
servers returned by an API calls.
The server does not appear in the list servers response.
</para>
</listitem>
<listitem>
<para>
The server managed by OpenStack Compute is
deleted on the compute node.
The server managed by OpenStack Compute is deleted on the
compute node.
</para>
</listitem>
</itemizedlist>
@ -527,16 +518,17 @@
<itemizedlist>
<listitem>
<para>
If server status remains in <code>deleting</code>
or shows another error status, the request failed. Ensure you
meet the preconditions then investigate the compute back end.
If server status remains in <code>deleting</code> status or
another error status, the request failed. Ensure that you
meet the preconditions. Then, investigate the compute back
end.
</para>
</listitem>
<listitem>
<para>
The request returns the HTTP 409 status code
when the server is locked even if you have a correct permissions.
Ensure you meet the preconditions then investigate the server
The request returns the HTTP 409 response code when the server
is locked even if you have correct permissions. Ensure that
you meet the preconditions then investigate the server
status.
</para>
</listitem>