etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 13626: Able to add a F5 device successfully even when invalid username/password was provided 

Reviewed-By:nitin.mehta@citrix.com
status 13626: resolved fixed

added a fake call during to login to force validate the credentails
This commit is contained in:
Murali reddy 2012-02-15 17:14:31 +05:30
parent 67d91cef5d
commit 3438e506b6
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/com/cloud/network/resource/F5BigIpResource.java
View File

@ -182,10 +182,8 @@ public class F5BigIpResource implements ServerResource {
_inline = Boolean.parseBoolean((String) params.get("inline"));
if (!login()) {
throw new ExecutionException("Failed to login to the F5 BigIp.");
}
login();
return true;
} catch (Exception e) {
throw new ConfigurationException(e.getMessage());
@ -274,7 +272,15 @@ public class F5BigIpResource implements ServerResource {
}
private boolean shouldRetry(int numRetries) {
return (numRetries > 0 && login());
try {
if (numRetries > 0) {
login();
return true;
}
} catch (Exception e) {
s_logger.error("Failed to log in to F5 device at " + _ip + " due to " + e.getMessage());
}
return false;
}
private Answer execute(ReadyCommand cmd) {
@ -590,14 +596,17 @@ public class F5BigIpResource implements ServerResource {
// Login
private boolean login() {
private void login() throws ExecutionException {
try {
_interfaces = new Interfaces();
if (!_interfaces.initialize(_ip, _username, _password)) {
throw new ExecutionException("Failed to log in to BigIp appliance");
}
// iControl.Interfaces.initialize always return true so make a call to force connect to F5 to validate credentials
_interfaces.getSystemSystemInfo().get_system_information();
_virtualServerApi = _interfaces.getLocalLBVirtualServer();
_loadbalancerApi = _interfaces.getLocalLBPool();
_nodeApi = _interfaces.getLocalLBNodeAddress();
@ -605,10 +614,8 @@ public class F5BigIpResource implements ServerResource {
_selfIpApi = _interfaces.getNetworkingSelfIP();
_routeDomainApi = _interfaces.getNetworkingRouteDomain();
_configSyncApi = _interfaces.getSystemConfigSync();
return true;
} catch (Exception e) {
return false;
throw new ExecutionException("Failed to log in to BigIp appliance due to " + e.getMessage());
}
}