Hello Douglas Schilling Landgraf,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/24416
to review the following change.
Change subject: tools: Resolve hosts in --ldap-servers in engine-manage-domains
......................................................................
tools: Resolve hosts in --ldap-servers in engine-manage-domains
Tries to resolve hosts specified in argument --ldap-servers during
add/edit action in engine-manage-domains. If some host cannot be
resolved, warning is logged and displayed in console.
Change-Id: Ibae81ccd6b2a402c856934839f1dbdad316bbc3d
Bug-URL: https://bugzilla.redhat.com/1001976
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
Signed-off-by: Martin Perina <[email protected]>
---
M
backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java
1 file changed, 24 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/24416/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 61f8ce1..e88333a 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
@@ -32,6 +32,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
@@ -446,6 +447,7 @@
}
protected List<String> getLdapServers(String domainName) throws
ManageDomainsResult {
+ ArrayList<String> servers = new ArrayList<String>();
String argValue = args.get(ARG_LDAP_SERVERS);
if (StringUtils.isEmpty(argValue)) {
LdapSRVLocator locator = new LdapSRVLocator();
@@ -464,16 +466,34 @@
ManageDomainsResultEnum.NO_LDAP_SERVERS_FOR_DOMAIN,
domainName);
}
- ArrayList<String> result = new ArrayList<String>();
for (int counter = 0; counter <
ldapDnsResult.getNumOfValidAddresses(); counter++) {
// In case the address provides a port, don't keep it, we
currently assume only the port
// defined at ConfigValues.ldapServerPort is being used.
String[] addressParts =
ldapDnsResult.getAddresses()[counter].split(":");
- result.add(addressParts[0]);
+ servers.add(addressParts[0]);
}
- return result;
+ } else {
+ servers = new
ArrayList<String>(Arrays.asList(argValue.split(",")));
+ for (String server : servers) {
+ try {
+ for (InetAddress ip : InetAddress.getAllByName(server)) {
+ ip.getCanonicalHostName();
+ log.debug(String.format(
+ "Successfuly resolved IP '%s' for server '%s'",
+ ip.getHostAddress(),
+ server));
+ }
+ } catch (Exception ex) {
+ String msg = String.format(
+ "Cannot resolve LDAP server hostname '%s'.
Details: %s,",
+ server,
+ ex.getMessage());
+ log.warn(msg, ex);
+ System.err.println(msg);
+ }
+ }
}
- return new ArrayList<String>(Arrays.asList(argValue.split(",")));
+ return servers;
}
public void addDomain() throws ManageDomainsResult {
--
To view, visit http://gerrit.ovirt.org/24416
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibae81ccd6b2a402c856934839f1dbdad316bbc3d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Martin Peřina <[email protected]>
Gerrit-Reviewer: Douglas Schilling Landgraf <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
