From 9eb8a8b6bc5f9f5c15d38db40afe776dfb5fbb58 Mon Sep 17 00:00:00 2001
From: Atsushi SAKAI <sakaia@jp.fujitsu.com>
Date: Wed, 2 Sep 2015 10:39:10 +0900
Subject: [PATCH] Add stack_event_list API resouce_action missing action

Adds SNAPSHOT, CHECK, RESTORE and INIT

Sorted in alphabetical order (df)

Change-Id: I6baabec363e54a140cb42cd5be85263065e34657
Closes-Bug: #1412158
---
 .../src/v1/orchestration-api.wadl             | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
index 7aca43086..b61457d89 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
+++ b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
@@ -710,7 +710,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <para>
-                  Timelines for stack creation.
+                  Time-lines for stack creation.
                </para>
             </wadl:doc>
             </param>
@@ -1551,10 +1551,11 @@
                   Filters the event list by a specified resource action. You
                   can use this filter multiple times to filter by multiple
                   resource actions. Valid resource actions are
-                  <code>CREATE</code>, <code>DELETE</code>,
-                  <code>UPDATE</code>, <code>ROLLBACK</code>,
-                  <code>SUSPEND</code>, <code>RESUME</code>, and
-                  <code>ADOPT</code>.
+                  <code>ADOPT</code>, <code>CHECK</code>, <code>CREATE</code>,
+                  <code>DELETE</code>, <code>INIT</code>,
+                  <code>RESTORE</code>, <code>RESUME</code>,
+                  <code>ROLLBACK</code>, <code>SNAPSHOT</code>,
+                  <code>SUSPEND</code>, and <code>UPDATE</code>.
                </para>
             </wadl:doc>
             </param>
@@ -1567,8 +1568,8 @@
                   Filters the event list by a specified resource status. You
                   can use this filter multiple times to filter by multiple
                   resource statuses. Valid resource statuses are
-                  <code>IN_PROGRESS</code>, <code>COMPLETE</code>, and
-                  <code>FAILED</code>.
+                  <code>COMPLETE</code>, <code>FAILED</code>, and
+                  <code>IN_PROGRESS</code>.
                </para>
             </wadl:doc>
             </param>
@@ -1592,8 +1593,8 @@
                   Filters the event list by a specified resource type. You can
                   use this filter multiple times to filter by multiple
                   resource types. Valid resource types include
-                  <code>OS::Nova::Server</code>,
                   <code>OS::Cinder::Volume</code>,
+                  <code>OS::Nova::Server</code>,
                   <code>OS::Neutron::Port</code>, and so on.
                </para>
             </wadl:doc>
@@ -1633,10 +1634,11 @@
                   Filters the event list by a specified resource action. You
                   can use this filter multiple times to filter by multiple
                   resource actions. Valid resource actions are
-                  <code>CREATE</code>, <code>DELETE</code>,
-                  <code>UPDATE</code>, <code>ROLLBACK</code>,
-                  <code>SUSPEND</code>, <code>RESUME</code>, and
-                  <code>ADOPT</code>.
+                  <code>ADOPT</code>, <code>CHECK</code>, <code>CREATE</code>,
+                  <code>DELETE</code>, <code>INIT</code>,
+                  <code>RESTORE</code>, <code>RESUME</code>,
+                  <code>ROLLBACK</code>, <code>SNAPSHOT</code>,
+                  <code>SUSPEND</code>, and <code>UPDATE</code>.
                </para>
             </wadl:doc>
             </param>
@@ -1649,8 +1651,8 @@
                   Filters the event list by a specified resource status. You
                   can use this filter multiple times to filter by multiple
                   resource statuses. Valid resource statuses are
-                  <code>IN_PROGRESS</code>, <code>COMPLETE</code>, and
-                  <code>FAILED</code>.
+                  <code>COMPLETE</code>, <code>FAILED</code>, and
+                  <code>IN_PROGRESS</code>.
                </para>
             </wadl:doc>
             </param>
@@ -1674,8 +1676,8 @@
                   Filters the event list by a specified resource type. You can
                   use this filter multiple times to filter by multiple
                   resource types. Valid resource types include
-                  <code>OS::Nova::Server</code>,
                   <code>OS::Cinder::Volume</code>,
+                  <code>OS::Nova::Server</code>,
                   <code>OS::Neutron::Port</code>, and so on.
                </para>
             </wadl:doc>
@@ -1953,8 +1955,8 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <para>
-                  Current status of the deployment. Value is
-                  <code>IN_PROGRESS</code>, <code>COMPLETE</code>, or
+                  Current status of the deployment. A valid value is
+                  <code>COMPLETE</code>, <code>IN_PROGRESS</code>, or
                   <code>FAILED</code>.
                </para>
             </wadl:doc>
@@ -2069,7 +2071,7 @@
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
                <para>
-                  Map of output values for the deployment, as signalled from
+                  Map of output values for the deployment, as signaled from
                   the server.
                </para>
             </wadl:doc>
@@ -2112,9 +2114,10 @@
             <listitem>
                <para>
                   A <code>503</code> error code indicates that the heat
-                  engines are down. Run the <command>heat-manage service
-                  list</command> command or contact your cloud provider to
-                  find out why the heat engines are down.
+                  engines are not operational. Run the <command>heat-manage
+                  service list</command> command or contact your cloud
+                  provider to determine why the heat engines are not
+                  operational.
                </para>
             </listitem>
          </itemizedlist>
@@ -2133,7 +2136,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <para role="shortdesc">
-                  All Orchestration engines are down.
+                  All Orchestration engines are not operational.
                </para>
             </wadl:doc>
          </representation>