Martin Peřina has uploaded a new change for review. Change subject: tools: Sort domains when validating in engine-manage-domains ......................................................................
tools: Sort domains when validating in engine-manage-domains Sort domains by name prior to validate action in engine-manage-domains. Change-Id: I6243fb8d6ae1fc34c31517559bb56b091cc10b1d Bug-Url: https://bugzilla.redhat.com/1057182 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java 1 file changed, 24 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/24455/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java index dce36ed..63e3783 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -755,7 +756,11 @@ boolean isValidate, List<String> ldapServers) throws ManageDomainsResult { - Set<Entry<String, String>> gssapiDomainValues = gssapiDomains.getValues(); + List<Entry<String, String>> gssapiDomainValues = new ArrayList<>(gssapiDomains.getValues()); + if (isValidate) { + // sort domains so validate report looks better + Collections.sort(gssapiDomainValues, createDomainComparator()); + } for (Entry<String, String> currDomain : gssapiDomainValues) { String domain = currDomain.getKey(); @@ -777,7 +782,7 @@ userIds.setValueForDomain(domain, userGuid.toString()); if (isValidate) { System.out.println("Domain " + domain + " is valid."); - System.out.println("The configured user for domain " + domain + " is " + currUserName); + System.out.println("The configured user for domain " + domain + " is " + currUserName + "\n"); } log.info("Successfully tested kerberos configuration for domain: " + domain); } catch (Exception e) { @@ -840,7 +845,11 @@ Map<String, List<String>> ldapServersMapPerDomainMap, boolean isValidate) throws ManageDomainsResult { - Set<Entry<String, String>> simpleDomainValues = simpleDomains.getValues(); + List<Entry<String, String>> simpleDomainValues = new ArrayList<>(simpleDomains.getValues()); + if (isValidate) { + // sort domains so validate report looks better + Collections.sort(simpleDomainValues, createDomainComparator()); + } StringBuffer userGuid = new StringBuffer(); for (Entry<String, String> currDomain : simpleDomainValues) { String domain = currDomain.getKey(); @@ -1144,4 +1153,16 @@ } return propFile.getAbsolutePath(); } + + /** + * Creates comparator to sort Map where domains are keys + */ + private Comparator<Entry<String, String>> createDomainComparator() { + return new Comparator<Entry<String, String>>() { + @Override + public int compare(Entry<String, String> entry1, Entry<String, String> entry2) { + return entry1.getKey().compareTo(entry2.getKey()); + } + }; + } } -- To view, visit http://gerrit.ovirt.org/24455 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6243fb8d6ae1fc34c31517559bb56b091cc10b1d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
