update Approvals from Testing

Issue-ID: AAF-857
Change-Id: Ic7780678991f5d3f25f2634d1a8b15cc03f62592
Signed-off-by: Instrumental <jonathan.gathman@att.com>

2 files changed, 28 insertions, 3 deletions

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java
index edbe2068..8fcea294 100644
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java
@@ -94,6 +94,10 @@ public class AAFcli {
         this(access,new AuthzEnv(access.getProperties()),wtr,hman, si,ss);
     }
 
+    public AuthzEnv env() {
+    	return env;
+    }
+    
     public AAFcli(Access access, AuthzEnv env, Writer wtr, HMangr hman, SecurityInfoC<HttpURLConnection> si, SecuritySetter<HttpURLConnection> ss) throws APIException {
         this.env = env;
         this.access = access;
@@ -328,7 +332,7 @@ public class AAFcli {
                             Thread.sleep((long)(delay+globalDelay));
                         }
                     } catch (Exception e) {
-                        if (expect.contains(-1)) {
+                    	if (expect.contains(-1)) {
                             pw.println(e.getMessage());
                             ret = -1;
                         } else {
diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java
index d41f0cf3..a1cb3e7a 100644
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/Cred.java
@@ -21,30 +21,37 @@
 
 package org.onap.aaf.auth.cmd.user;
 
+import java.util.List;
+
 import org.onap.aaf.auth.cmd.AAFcli;
 import org.onap.aaf.auth.cmd.Cmd;
 import org.onap.aaf.auth.cmd.Param;
 import org.onap.aaf.auth.rserv.HttpMethods;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.aaf.client.ErrMessage;
 import org.onap.aaf.cadi.client.Future;
 import org.onap.aaf.cadi.client.Rcli;
 import org.onap.aaf.cadi.client.Retryable;
 import org.onap.aaf.misc.env.APIException;
 
 import aaf.v2_0.CredRequest;
+import aaf.v2_0.Error;
 
 public class Cred extends Cmd {
     public static final String ATTEMPT_FAILED_SPECIFICS_WITHELD = "Attempt Failed.  Specifics witheld.";
     private static final String CRED_PATH = "/authn/cred";
     private static final String[] options = {"add","del","reset","extend"/*,"clean"*/};
-    public Cred(User parent) {
+	private ErrMessage em;
+//	private RosettaDF<Error> errDF;
+    public Cred(User parent) throws APIException {
         super(parent,"cred",
                 new Param(optionsToString(options),true),
                 new Param("id",true),
                 new Param("password (! D|E)",false),
                 new Param("entry# (if multi)",false)
         );
+        em = new ErrMessage(aafcli.env());
     }
 
     @Override
@@ -59,8 +66,9 @@ public class Cred extends Cmd {
             if (idx>=args.length) throw new CadiException("Password Required");
             cr.setPassword(args[idx++]);
         }
-        if (args.length>idx)
+        if (args.length>idx) {
             cr.setEntry(args[idx]);
+        }
         
         // Set Start/End commands
         setStartEnd(cr);
@@ -114,6 +122,19 @@ public class Cred extends Cmd {
                     pw().println(']');
                 } else if (fp.code()==202) {
                         pw().println("Credential Action Accepted, but requires Approvals before actualizing");
+                } else if (fp.code()==300) {
+                	Error err = em.getError(fp);
+                	String text = err.getText();
+                	List<String> vars = err.getVariables();
+                	
+                	// IMPORTANT! We do this backward, because it is looking for string
+                	// %1 or %13.  If we replace %1 first, that messes up %13
+                	for(int i=vars.size()-1;i>0;--i) {
+                		text = text.replace("%"+(i+1), (i<10?" ":"") + i+") " + vars.get(i));
+                	}
+
+                	text = text.replace("%1",vars.get(0));
+                	pw().println(text);
                 } else if (fp.code()==406 && option==1) {
                         pw().println("You cannot delete this Credential");
                 } else {