From 8aca1828fc983ace0e90a5495595f7ec9c891beb Mon Sep 17 00:00:00 2001
From: Richard Downer <richard.downer@cloudsoftcorp.com>
Date: Sat, 1 Sep 2012 17:35:24 +0300
Subject: [PATCH 1/3] Update parsing of Status in CloudStack Template

The CloudStack Template status field is generally presented as human
readable text. This commit extends the enum fromValue() to understand
the known status strings in CloudStack 3.0.4.
---
 .../org/jclouds/cloudstack/domain/Template.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
index 0891c839a2..55a2136516 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
@@ -23,6 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.beans.ConstructorProperties;
 import java.util.Date;
 
+import com.google.common.base.Strings;
 import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.base.Objects;
@@ -82,9 +83,15 @@ public class Template implements Comparable<Template> {
       UPLOAD_IN_PROGRESS, UNRECOGNIZED;
 
       public static Status fromValue(String state) {
-         if (state.equals("Download Complete")) {
-            return DOWNLOADED;
-         }
+         // Statuses are in free text form. These are the ones in CloudStack 3.0.4 source
+         // https://github.com/CloudStack/CloudStack/blob/e2e76c70ec51bfb35d755371f6c33856cef8a277/server/src/com/cloud/api/ApiResponseHelper.java#L1968
+         if (Strings.isNullOrEmpty(state)) { return UNKNOWN; }
+         else if (state.equals("Processing")) { return DOWNLOAD_IN_PROGRESS; }
+         else if (state.endsWith("% Downloaded")) { return DOWNLOAD_IN_PROGRESS; }
+         else if (state.equals("Installing Template")) { return DOWNLOAD_IN_PROGRESS; }
+         else if (state.equals("Installing ISO")) { return DOWNLOAD_IN_PROGRESS; }
+         else if (state.equals("Download Complete")) { return DOWNLOADED; }
+         else if (state.equals("Successfully Installed")) { return DOWNLOADED; }
          try {
             return valueOf(checkNotNull(state, "state"));
          } catch (IllegalArgumentException e) {

From ca7ede59324f373eef30bd78d3d129730625c3a6 Mon Sep 17 00:00:00 2001
From: Richard Downer <richard.downer@cloudsoftcorp.com>
Date: Sun, 2 Sep 2012 10:22:33 +0300
Subject: [PATCH 2/3] CloudStack template status parsing update

Remove the "Successfully Installed" message as it's not clear what its
definition is or even if it's possible to get that message - see
http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev/201209.mbox/%3CCED8A372-E235-4C32-A15E-F021CC449BFD%40citrix.com%3E
---
 .../src/main/java/org/jclouds/cloudstack/domain/Template.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
index 55a2136516..4e6ddb79ae 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
@@ -91,7 +91,6 @@ public class Template implements Comparable<Template> {
          else if (state.equals("Installing Template")) { return DOWNLOAD_IN_PROGRESS; }
          else if (state.equals("Installing ISO")) { return DOWNLOAD_IN_PROGRESS; }
          else if (state.equals("Download Complete")) { return DOWNLOADED; }
-         else if (state.equals("Successfully Installed")) { return DOWNLOADED; }
          try {
             return valueOf(checkNotNull(state, "state"));
          } catch (IllegalArgumentException e) {

From 8b29a6c4f66d081b507f213d66c5f77e0e7669b6 Mon Sep 17 00:00:00 2001
From: Richard Downer <richard.downer@cloudsoftcorp.com>
Date: Mon, 3 Sep 2012 11:35:19 +0300
Subject: [PATCH 3/3] Javadoc update for CloudStack Template.getStatus()

---
 .../main/java/org/jclouds/cloudstack/domain/Template.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
index 4e6ddb79ae..749a160b6d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
@@ -652,6 +652,14 @@ public class Template implements Comparable<Template> {
    }
 
    /**
+    * Retrieve the status of the template.
+    *
+    * <p>Note that in CloudStack 2.2.x through to at least 3.0.4, the possible status values are
+    * not well defined by CloudStack. CloudStack returns a plain-text English string for UI
+    * display, which jclouds attempts to parse into an enumeration, but the mapping is incomplete.
+    * This method should be reliable for the common cases, but it is possible (particularly for
+    * error statuses) that this method will return UNRECOGNIZED.</p>
+    *
     * @return status of the template
     */
    @Nullable