From d37b5467a3b8b375b603579d2888a4443a8b06a7 Mon Sep 17 00:00:00 2001
From: Instrumental <jonathan.gathman@att.com>
Date: Thu, 5 Jul 2018 15:00:18 -0500
Subject: Refine Agent for cadi utils

Issue-ID: AAF-361
Change-Id: Id07b60181b906e65aefb24cbe0d192e362c2c3f4
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---
 .../src/main/java/org/onap/aaf/cadi/CmdLine.java   |  9 ++-----
 .../java/org/onap/aaf/cadi/test/JU_CmdLine.java    | 28 +++++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

(limited to 'cadi/core/src')

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/CmdLine.java b/cadi/core/src/main/java/org/onap/aaf/cadi/CmdLine.java
index ea126f54..9444cfac 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/CmdLine.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/CmdLine.java
@@ -37,11 +37,7 @@ import org.onap.aaf.cadi.util.JsonOutputStream;
 
 /**
  * A Class to run on command line to determine suitability of environment for certain TAFs.
- * 
- * For instance, CSP supports services only in certain domains, and while dynamic host
- * lookups on the machine work in most cases, sometimes, names and IPs are unexpected (and
- * invalid) for CSP because of multiple NetworkInterfaces, etc
- * 
+ *  * 
  * @author Jonathan
  *
  */
@@ -336,11 +332,10 @@ public class CmdLine {
 			System.out.println("Usage: java -jar <this jar> ...");
 			System.out.println("  keygen [<keyfile>]                     (Generates Key on file, or Std Out)");
 			System.out.println("  digest [<passwd>|-i|] <keyfile>        (Encrypts Password with \"keyfile\"");
-			System.out.println("                                          if passwd = -i, will read StdIin");
+			System.out.println("                                          if passwd = -i, will read StdIn");
 			System.out.println("                                          if passwd is blank, will ask securely)");
 			System.out.println("  passgen <digits>                       (Generate Password of given size)");
 			System.out.println("  urlgen <digits>                        (Generate URL field of given size)");
-			System.out.println("  csptest                                (Tests for CSP compatibility)");
 			System.out.println("  encode64 <your text>                   (Encodes to Base64)");
 			System.out.println("  decode64 <base64 encoded text>         (Decodes from Base64)");
 			System.out.println("  encode64url <your text>                (Encodes to Base64 URL charset)");
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java b/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java
index efcc1b29..76cd225d 100644
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/test/JU_CmdLine.java
@@ -228,20 +228,20 @@ public class JU_CmdLine {
 	@Test
 	public void showHelpTest() {
 		String expected = 
-			"Usage: java -jar <this jar> ...\n" +
-			"  keygen [<keyfile>]                     (Generates Key on file, or Std Out)\n" +
-			"  digest [<passwd>|-i|] <keyfile>        (Encrypts Password with \"keyfile\"\n" +
-			"                                          if passwd = -i, will read StdIin\n" +
-			"                                          if passwd is blank, will ask securely)\n" +
-			"  passgen <digits>                       (Generate Password of given size)\n" +
-			"  urlgen <digits>                        (Generate URL field of given size)\n" +
-			"  csptest                                (Tests for CSP compatibility)\n" +
-			"  encode64 <your text>                   (Encodes to Base64)\n" +
-			"  decode64 <base64 encoded text>         (Decodes from Base64)\n" +
-			"  encode64url <your text>                (Encodes to Base64 URL charset)\n" +
-			"  decode64url <base64url encoded text>   (Decodes from Base64 URL charset)\n" +
-			"  sha256 <text> <salts(s)>               (Digest String into SHA256 Hash)\n" +
-			"  md5 <text>                             (Digest String into MD5 Hash)\n";
+			"Usage: java -jar <this jar> ...\n" + 
+			"  keygen [<keyfile>]                     (Generates Key on file, or Std Out)\n" + 
+			"  digest [<passwd>|-i|] <keyfile>        (Encrypts Password with \"keyfile\"\n" + 
+			"                                          if passwd = -i, will read StdIn\n" + 
+			"                                          if passwd is blank, will ask securely)\n" + 
+			"  passgen <digits>                       (Generate Password of given size)\n" + 
+			"  urlgen <digits>                        (Generate URL field of given size)\n" + 
+			"  encode64 <your text>                   (Encodes to Base64)\n" + 
+			"  decode64 <base64 encoded text>         (Decodes from Base64)\n" + 
+			"  encode64url <your text>                (Encodes to Base64 URL charset)\n" + 
+			"  decode64url <base64url encoded text>   (Decodes from Base64 URL charset)\n" + 
+			"  sha256 <text> <salts(s)>               (Digest String into SHA256 Hash)\n" + 
+			"  md5 <text>                             (Digest String into MD5 Hash)\n"
+			;
 
 		CmdLine.main(new String[]{});
 
-- 
cgit