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 <mper...@redhat.com> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomainsArguments.java 2 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/26064/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 219e86b..fcbc884 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 @@ -1003,7 +1003,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/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomainsArguments.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomainsArguments.java index 7d8c532..25c49f3 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomainsArguments.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/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/26064 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2573933e6ded5644f3c0c4c532e2407d753b9f4f 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
