Check the actual result of operations cert revoke/unrevoke.

Output the actual result of a revoke/unrevoke operation in CLI. Since
the actual result of the operation can be different from the cert request
status.

Ticket #217

4 files changed, 51 insertions, 21 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
index 9f47b20c6..02f973910 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertCLI.java
@@ -184,7 +184,13 @@ public class CertCLI extends CLI {
     public static void printCertRequestInfo(CertRequestInfo info) {
         System.out.println("  Request ID: " + info.getRequestId());
         System.out.println("  Type: " + info.getRequestType());
-        System.out.println("  Status: " + info.getRequestStatus());
+        System.out.println("  Request Status: " + info.getRequestStatus());
+        System.out.println("  Operation Result: " + info.getOperationResult());
+
+        String error = info.getErrorMessage();
+        if (error != null) {
+            System.out.println("  Reason: " + error);
+        }
 
         if (info.getCertId() != null) {
             System.out.println("  Certificate ID: " + info.getCertId().toHexString());
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertHoldCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertHoldCLI.java
index a112d3616..b6b5fcde7 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertHoldCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertHoldCLI.java
@@ -108,12 +108,20 @@ public class CertHoldCLI extends CLI {
         }
 
         if (certRequestInfo.getRequestStatus() == RequestStatus.COMPLETE) {
-            MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" on-hold");
-            certData = parent.client.getCert(certID);
-            CertCLI.printCertData(certData, false, false);
-
+            if (certRequestInfo.getOperationResult().equals(CertRequestInfo.RES_ERROR)) {
+                String error = certRequestInfo.getErrorMessage();
+                if (error != null) {
+                    System.out.println(error);
+                }
+                MainCLI.printMessage("Could not place certificate \"" + certID.toHexString() + "\" on-hold");
+            } else {
+                MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" on-hold");
+                certData = parent.client.getCert(certID);
+                CertCLI.printCertData(certData, false, false);
+            }
         } else {
-            MainCLI.printMessage("Request \"" + certRequestInfo.getRequestId() + "\": " + certRequestInfo.getRequestStatus());
+            MainCLI.printMessage("Request \"" + certRequestInfo.getRequestId() + "\": "
+                    + certRequestInfo.getRequestStatus());
         }
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertReleaseHoldCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertReleaseHoldCLI.java
index 184976f1e..515850539 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertReleaseHoldCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertReleaseHoldCLI.java
@@ -98,12 +98,20 @@ public class CertReleaseHoldCLI extends CLI {
         }
 
         if (certRequestInfo.getRequestStatus() == RequestStatus.COMPLETE) {
-            MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" off-hold");
-            CertData certData = parent.client.getCert(certID);
-            CertCLI.printCertData(certData, false, false);
-
+            if (certRequestInfo.getOperationResult().equals(CertRequestInfo.RES_ERROR)) {
+                String error = certRequestInfo.getErrorMessage();
+                if (error != null) {
+                    System.out.println(error);
+                }
+                MainCLI.printMessage("Could not place certificate \"" + certID.toHexString() + "\" off-hold");
+            } else {
+                MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" off-hold");
+                CertData certData = parent.client.getCert(certID);
+                CertCLI.printCertData(certData, false, false);
+            }
         } else {
-            MainCLI.printMessage("Request \"" + certRequestInfo.getRequestId() + "\": " + certRequestInfo.getRequestStatus());
+            MainCLI.printMessage("Request \"" + certRequestInfo.getRequestId() + "\": "
+                    + certRequestInfo.getRequestStatus());
         }
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertRevokeCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRevokeCLI.java
index 1a867d079..8727655f5 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertRevokeCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRevokeCLI.java
@@ -148,19 +148,27 @@ public class CertRevokeCLI extends CLI {
         }
 
         if (certRequestInfo.getRequestStatus() == RequestStatus.COMPLETE) {
-            if (reason == RevocationReason.CERTIFICATE_HOLD) {
-                MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" on-hold");
-            } else if (reason == RevocationReason.REMOVE_FROM_CRL) {
-                MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" off-hold");
+            if (certRequestInfo.getOperationResult().equals(CertRequestInfo.RES_ERROR)) {
+                String error = certRequestInfo.getErrorMessage();
+                if (error != null) {
+                    System.out.println(error);
+                }
+                MainCLI.printMessage("Could not revoke certificate \"" + certID.toHexString());
             } else {
-                MainCLI.printMessage("Revoked certificate \"" + certID.toHexString() + "\"");
+                if (reason == RevocationReason.CERTIFICATE_HOLD) {
+                    MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" on-hold");
+                } else if (reason == RevocationReason.REMOVE_FROM_CRL) {
+                    MainCLI.printMessage("Placed certificate \"" + certID.toHexString() + "\" off-hold");
+                } else {
+                    MainCLI.printMessage("Revoked certificate \"" + certID.toHexString() + "\"");
+                }
+
+                certData = parent.client.getCert(certID);
+                CertCLI.printCertData(certData, false, false);
             }
-
-            certData = parent.client.getCert(certID);
-            CertCLI.printCertData(certData, false, false);
-
         } else {
-            MainCLI.printMessage("Request \"" + certRequestInfo.getRequestId() + "\": " + certRequestInfo.getRequestStatus());
+            MainCLI.printMessage("Request \"" + certRequestInfo.getRequestId() + "\": "
+                    + certRequestInfo.getRequestStatus());
         }
     }
 }