Martin Peřina has uploaded a new change for review. Change subject: tools: Domain name should be case insensitive ......................................................................
tools: Domain name should be case insensitive Domain name should be case insensitive. This patch by default converts domain entered by user to lower case so it can be easily compared and used as a key in maps. Change-Id: I2573933e6ded5644f3c0c4c532e2407d753b9f4f Bug-Url: https://bugzilla.redhat.com/1078147 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java 2 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/26042/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java index 03a3833..21220d4 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomains.java @@ -998,7 +998,7 @@ public void deleteDomain() throws ManageDomainsResult { - String domainName = args.get(ARG_DOMAIN).toLowerCase(); + String domainName = args.get(ARG_DOMAIN); String currentDomains = configurationProvider.getConfigValue(ConfigValues.DomainName); DomainsConfigurationEntry domainNameEntry = new DomainsConfigurationEntry(currentDomains, DOMAIN_SEPERATOR, null); diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java index 586d3e4..f668da2 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java @@ -295,6 +295,7 @@ } } + convertDomain(); convertProvider(); validateProvider(); @@ -335,6 +336,18 @@ } /** + * Converts string domain value to lower case + */ + private void convertDomain() { + if (contains(ARG_DOMAIN)) { + String domainStr = get(ARG_DOMAIN); + if (domainStr != null) { + argMap.put(ARG_DOMAIN, domainStr.toLowerCase()); + } + } + } + + /** * Validates provider specified as an argument * * @throws ManageDomainsResult -- To view, visit http://gerrit.ovirt.org/26042 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2573933e6ded5644f3c0c4c532e2407d753b9f4f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
