Yair Zaslavsky has uploaded a new change for review. Change subject: core: Changing mangage-domains permissions msg (#856581) ......................................................................
core: Changing mangage-domains permissions msg (#856581) https://bugzilla.redhat.com/856581 Changing the warning message for adding a domain without the addPermissions flag. In addition, changing last print, not to repeat the information on domain addition, if not needed. Change-Id: I896a6514b4e63706c49b8a0d5121caff31644304 Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java 1 file changed, 16 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/8062/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java index 8703fe8..5d274fb 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java @@ -31,8 +31,8 @@ public static final String CONF_FILE_PATH = "/etc/ovirt-engine/engine-manage-domains/engine-manage-domains.conf"; private final String WARNING_ABOUT_TO_DELETE_LAST_DOMAIN = "WARNING: Domain %1$s is the last domain in the configuration. After deleting it you will have to either add another domain, or to use the internal admin user in order to login."; - private final String WARNING_NOT_ADDING_PERMISSIONS = - "WARNING: No permissions were added to the Engine. Login either with the internal admin user or with another configured user."; + private final String INFO_ABOUT_NOT_ADDING_PERMISSIONS = + "The domain %1$s has been added to the engine as an authentication source but no users from that domain have been granted permissions within the RHEV Manager.\nUsers from this domain can be granted permissions from the Web administration interface."; private final String SERVICE_RESTART_MESSAGE = "oVirt Engine restart is required in order for the changes to take place (service ovirt-engine restart)."; @@ -447,7 +447,7 @@ true, false); - handleAddPermissions(adUserNameEntry, adUserIdEntry); + handleAddPermissions(domainName, adUserNameEntry, adUserIdEntry); // Update the configuration setConfigurationEntries(domainNameEntry, @@ -457,15 +457,22 @@ ldapServersEntry, adUserIdEntry, ldapProviderTypesEntry); - - System.out.println(String.format(SUCCESSFULLY_COMPLETED_ACTION_ON_DOMAIN, "added", domainName)); + printSuccessMessage(domainName,"added"); } - private void handleAddPermissions(DomainsConfigurationEntry adUserNameEntry, DomainsConfigurationEntry adUserIdEntry) { + private void printSuccessMessage(String domainName, String action) { + if (addPermissions) { + System.out.println(String.format(SUCCESSFULLY_COMPLETED_ACTION_ON_DOMAIN, "added", domainName)); + } else { + System.out.println(SERVICE_RESTART_MESSAGE); + } + } + + private void handleAddPermissions(String domainName,DomainsConfigurationEntry adUserNameEntry, DomainsConfigurationEntry adUserIdEntry) { if (addPermissions) { updatePermissionsTable(adUserNameEntry, adUserIdEntry); } else { - System.out.println(WARNING_NOT_ADDING_PERMISSIONS); + System.out.println(String.format(INFO_ABOUT_NOT_ADDING_PERMISSIONS, domainName)); } } @@ -564,7 +571,7 @@ true, false); - handleAddPermissions(adUserNameEntry, adUserIdEntry); + handleAddPermissions(domainName,adUserNameEntry, adUserIdEntry); setConfigurationEntries(domainNameEntry, adUserNameEntry, @@ -574,7 +581,7 @@ adUserIdEntry, ldapProviderTypeEntry); - System.out.println(String.format(SUCCESSFULLY_COMPLETED_ACTION_ON_DOMAIN, "edited", domainName)); + printSuccessMessage(domainName,"edited"); } private void createKerberosConfiguration(DomainsConfigurationEntry gssapiDomains) throws ManageDomainsResult { -- To view, visit http://gerrit.ovirt.org/8062 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I896a6514b4e63706c49b8a0d5121caff31644304 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
