diff options
author | Endi S. Dewata <edewata@redhat.com> | 2013-12-16 04:13:11 -0500 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2014-01-30 10:47:34 -0500 |
commit | cd7a937200592038c2eff3253497e1eea68a1224 (patch) | |
tree | d141c93d2a3d495a2616c03e989aecb56d355bf4 /base/java-tools | |
parent | 0caa396d65f15c37e9565760a30e0acd9ea7c617 (diff) | |
download | pki-cd7a937200592038c2eff3253497e1eea68a1224.tar.gz pki-cd7a937200592038c2eff3253497e1eea68a1224.tar.xz pki-cd7a937200592038c2eff3253497e1eea68a1224.zip |
Fixed TPS resource statuses.
TPS resources that are stored in CS.cfg have been refactored to update
their statuses properly. These resources include profiles, profile
mappings, connections, and authenticators.
Ticket #654
Diffstat (limited to 'base/java-tools')
6 files changed, 91 insertions, 50 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorModifyCLI.java index 292e03f75..0f82d1e55 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorModifyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorModifyCLI.java @@ -48,8 +48,8 @@ public class AuthenticatorModifyCLI extends CLI { public void execute(String[] args) throws Exception { - Option option = new Option(null, "status", true, "Status: ENABLED, DISABLED."); - option.setArgName("status"); + Option option = new Option(null, "action", true, "Action: update (default), approve, reject, enable, disable."); + option.setArgName("action"); options.addOption(option); option = new Option(null, "input", true, "Input file containing authenticator properties."); @@ -75,24 +75,37 @@ public class AuthenticatorModifyCLI extends CLI { } String authenticatorID = cmdArgs[0]; - String status = cmd.getOptionValue("status"); + String action = cmd.getOptionValue("action", "update"); String input = cmd.getOptionValue("input"); AuthenticatorData authenticatorData; - try (BufferedReader in = new BufferedReader(new FileReader(input)); - StringWriter sw = new StringWriter(); - PrintWriter out = new PrintWriter(sw, true)) { + if (action.equals("update")) { - String line; - while ((line = in.readLine()) != null) { - out.println(line); + if (input == null) { + System.err.println("Error: Missing input file"); + printHelp(); + System.exit(1); + return; } - authenticatorData = AuthenticatorData.valueOf(sw.toString()); - } + try (BufferedReader in = new BufferedReader(new FileReader(input)); + StringWriter sw = new StringWriter(); + PrintWriter out = new PrintWriter(sw, true)) { + + String line; + while ((line = in.readLine()) != null) { + out.println(line); + } + + authenticatorData = AuthenticatorData.valueOf(sw.toString()); + } + + authenticatorData = authenticatorCLI.authenticatorClient.updateAuthenticator(authenticatorID, authenticatorData); - authenticatorData = authenticatorCLI.authenticatorClient.updateAuthenticator(authenticatorID, authenticatorData); + } else { // other actions + authenticatorData = authenticatorCLI.authenticatorClient.changeAuthenticatorStatus(authenticatorID, action); + } MainCLI.printMessage("Modified authenticator \"" + authenticatorID + "\""); diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionAddCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionAddCLI.java index f01823a4a..5b9cf8781 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionAddCLI.java @@ -43,7 +43,7 @@ public class ConnectionAddCLI extends CLI { } public void printHelp() { - formatter.printHelp(getFullName() + " <Connection ID> [OPTIONS...]", options); + formatter.printHelp(getFullName() + " [OPTIONS...]", options); } public void execute(String[] args) throws Exception { diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionModifyCLI.java index 704410daa..4c1d992d8 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionModifyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionModifyCLI.java @@ -48,8 +48,8 @@ public class ConnectionModifyCLI extends CLI { public void execute(String[] args) throws Exception { - Option option = new Option(null, "status", true, "Status: ENABLED, DISABLED."); - option.setArgName("status"); + Option option = new Option(null, "action", true, "Action: update (default), approve, reject, enable, disable."); + option.setArgName("action"); options.addOption(option); option = new Option(null, "input", true, "Input file containing connection properties."); @@ -75,24 +75,37 @@ public class ConnectionModifyCLI extends CLI { } String connectionID = cmdArgs[0]; - String status = cmd.getOptionValue("status"); + String action = cmd.getOptionValue("action", "update"); String input = cmd.getOptionValue("input"); ConnectionData connectionData; - try (BufferedReader in = new BufferedReader(new FileReader(input)); - StringWriter sw = new StringWriter(); - PrintWriter out = new PrintWriter(sw, true)) { + if (action.equals("update")) { - String line; - while ((line = in.readLine()) != null) { - out.println(line); + if (input == null) { + System.err.println("Error: Missing input file"); + printHelp(); + System.exit(1); + return; } - connectionData = ConnectionData.valueOf(sw.toString()); - } + try (BufferedReader in = new BufferedReader(new FileReader(input)); + StringWriter sw = new StringWriter(); + PrintWriter out = new PrintWriter(sw, true)) { + + String line; + while ((line = in.readLine()) != null) { + out.println(line); + } + + connectionData = ConnectionData.valueOf(sw.toString()); + } + + connectionData = connectionCLI.connectionClient.updateConnection(connectionID, connectionData); - connectionData = connectionCLI.connectionClient.updateConnection(connectionID, connectionData); + } else { // other actions + connectionData = connectionCLI.connectionClient.changeConnectionStatus(connectionID, action); + } MainCLI.printMessage("Modified connection \"" + connectionID + "\""); diff --git a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileAddCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileAddCLI.java index d44ddc08e..503e9c54d 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileAddCLI.java @@ -43,7 +43,7 @@ public class ProfileAddCLI extends CLI { } public void printHelp() { - formatter.printHelp(getFullName() + " <Profile ID> [OPTIONS...]", options); + formatter.printHelp(getFullName() + " [OPTIONS...]", options); } public void execute(String[] args) throws Exception { diff --git a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingModifyCLI.java index 4561695ff..d7c82dedd 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingModifyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingModifyCLI.java @@ -48,8 +48,8 @@ public class ProfileMappingModifyCLI extends CLI { public void execute(String[] args) throws Exception { - Option option = new Option(null, "status", true, "Status: ENABLED, DISABLED."); - option.setArgName("status"); + Option option = new Option(null, "action", true, "Action: update (default), approve, reject, enable, disable."); + option.setArgName("action"); options.addOption(option); option = new Option(null, "input", true, "Input file containing profile mapping properties."); @@ -75,24 +75,37 @@ public class ProfileMappingModifyCLI extends CLI { } String profileMappingID = cmdArgs[0]; - String status = cmd.getOptionValue("status"); + String action = cmd.getOptionValue("action", "update"); String input = cmd.getOptionValue("input"); ProfileMappingData profileMappingData; - try (BufferedReader in = new BufferedReader(new FileReader(input)); - StringWriter sw = new StringWriter(); - PrintWriter out = new PrintWriter(sw, true)) { + if (action.equals("update")) { - String line; - while ((line = in.readLine()) != null) { - out.println(line); + if (input == null) { + System.err.println("Error: Missing input file"); + printHelp(); + System.exit(1); + return; } - profileMappingData = ProfileMappingData.valueOf(sw.toString()); - } + try (BufferedReader in = new BufferedReader(new FileReader(input)); + StringWriter sw = new StringWriter(); + PrintWriter out = new PrintWriter(sw, true)) { + + String line; + while ((line = in.readLine()) != null) { + out.println(line); + } + + profileMappingData = ProfileMappingData.valueOf(sw.toString()); + } + + profileMappingData = profileMappingCLI.profileMappingClient.updateProfileMapping(profileMappingID, profileMappingData); - profileMappingData = profileMappingCLI.profileMappingClient.updateProfileMapping(profileMappingID, profileMappingData); + } else { // other actions + profileMappingData = profileMappingCLI.profileMappingClient.changeProfileMappingStatus(profileMappingID, action); + } MainCLI.printMessage("Modified profile mapping \"" + profileMappingID + "\""); diff --git a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileModifyCLI.java index b4db03706..8f907ab91 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileModifyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileModifyCLI.java @@ -48,12 +48,12 @@ public class ProfileModifyCLI extends CLI { public void execute(String[] args) throws Exception { - Option option = new Option(null, "input", true, "Input file containing profile properties."); - option.setArgName("file"); + Option option = new Option(null, "action", true, "Action: update (default), approve, reject, enable, disable."); + option.setArgName("action"); options.addOption(option); - option = new Option(null, "action", true, "Action: approve, reject, enable, disable."); - option.setArgName("action"); + option = new Option(null, "input", true, "Input file containing profile properties."); + option.setArgName("file"); options.addOption(option); CommandLine cmd = null; @@ -75,18 +75,20 @@ public class ProfileModifyCLI extends CLI { } String profileID = cmdArgs[0]; + String action = cmd.getOptionValue("action", "update"); String input = cmd.getOptionValue("input"); - String action = cmd.getOptionValue("action"); ProfileData profileData; - if (input == null && action == null || input != null && action != null) { - System.err.println("Error: Either input file or action should be specified"); - printHelp(); - System.exit(1); - return; + if (action.equals("update")) { + + if (input == null) { + System.err.println("Error: Missing input file"); + printHelp(); + System.exit(1); + return; + } - } else if (input != null) { try (BufferedReader in = new BufferedReader(new FileReader(input)); StringWriter sw = new StringWriter(); PrintWriter out = new PrintWriter(sw, true)) { @@ -101,7 +103,7 @@ public class ProfileModifyCLI extends CLI { profileData = profileCLI.profileClient.updateProfile(profileID, profileData); - } else { // action != null + } else { // other actions profileData = profileCLI.profileClient.changeProfileStatus(profileID, action); } |