diff options
author | Endi S. Dewata <edewata@redhat.com> | 2016-02-03 23:54:56 +0100 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2016-02-05 16:08:10 +0100 |
commit | 987dda15acdd6e6f4c7c477fed122a76ad40260c (patch) | |
tree | 400ec3be7e2c4a314d64be8dcc7bd6e746cd9262 /base/java-tools/src/com/netscape/cmstools | |
parent | 4c1f6b632fe5493ba3bfe106257192d3fc088f15 (diff) | |
download | pki-987dda15acdd6e6f4c7c477fed122a76ad40260c.tar.gz pki-987dda15acdd6e6f4c7c477fed122a76ad40260c.tar.xz pki-987dda15acdd6e6f4c7c477fed122a76ad40260c.zip |
Fixed token add operation.
The TPS UI and CLI have been modified to accept only token ID,
and optionally user ID and policy attributes when adding a token.
https://fedorahosted.org/pki/ticket/1477
https://fedorahosted.org/pki/ticket/1687
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools')
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java index a63df2e80..1615846d6 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenAddCLI.java @@ -42,13 +42,16 @@ public class TokenAddCLI extends CLI { } public void printHelp() { - formatter.printHelp(getFullName() + " <Token ID> --user <User ID> [OPTIONS...]", options); + formatter.printHelp(getFullName() + " <Token ID> [OPTIONS...]", options); } public void createOptions() { Option option = new Option(null, "user", true, "User ID"); option.setArgName("User ID"); - option.setRequired(true); + options.addOption(option); + + option = new Option(null, "policy", true, "Policy"); + option.setArgName("Policy"); options.addOption(option); } @@ -83,7 +86,12 @@ public class TokenAddCLI extends CLI { TokenData tokenData = new TokenData(); tokenData.setTokenID(tokenID); - tokenData.setUserID(cmd.getOptionValue("user")); + + String userID = cmd.getOptionValue("user"); + tokenData.setUserID(userID); + + String policy = cmd.getOptionValue("policy"); + tokenData.setPolicy(policy); tokenData = tokenCLI.tokenClient.addToken(tokenData); |