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

1) prepare to seperate volume/snapshot logic to secondary storage VM 

2) Add vmware.service.console configuration variable to allow customized VMware setup
This commit is contained in:
Kelven Yang 2011-02-10 16:38:19 -08:00
parent 64b7308fe7
commit 737954bed8
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -696,8 +696,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
Map<? extends ServerResource, Map<String, String>> resources = null;
try {
resources = discoverer.find(dcId, podId, clusterId, uri,
username, password);
resources = discoverer.find(dcId, podId, clusterId, uri, username, password);
} catch (Exception e) {
s_logger.info("Exception in external cluster discovery process with discoverer: "
+ discoverer.getName());
@ -705,15 +704,13 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
if (resources != null) {
for (Map.Entry<? extends ServerResource, Map<String, String>> entry : resources.entrySet()) {
ServerResource resource = entry.getKey();
AgentAttache attache = simulateStart(resource,
entry.getValue(), true);
AgentAttache attache = simulateStart(resource, entry.getValue(), true);
if (attache != null) {
hosts.add(_hostDao.findById(attache.getId()));
}
discoverer.postDiscovery(hosts, _nodeId);
}
s_logger.info("External cluster has been successfully discovered by "
+ discoverer.getName());
s_logger.info("External cluster has been successfully discovered by " + discoverer.getName());
success = true;
return result;
}
@ -1627,8 +1624,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
_hostDao.loadDetails(host);
HashMap<String, Object> params = new HashMap<String, Object>(host
.getDetails().size() + 5);
HashMap<String, Object> params = new HashMap<String, Object>(host.getDetails().size() + 5);
params.putAll(host.getDetails());
params.put("guid", host.getGuid());
@ -1647,8 +1643,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
}
if (guid == null || guid.isEmpty()) {
throw new CloudRuntimeException(
"Can not find guid for cluster " + cluster.getId()
+ " name " + cluster.getName());
"Can not find guid for cluster " + cluster.getId() + " name " + cluster.getName());
}
params.put("pool", guid);
}

1
server/src/com/cloud/configuration/Config.java
View File

@ -186,6 +186,7 @@ public enum Config {
VmwarePrivateNetworkVSwitch("Advanced", ManagementServer.class, String.class, "vmware.private.vswitch", null, "Specify the vSwitch on host for private network", null),
VmwarePublicNetworkVSwitch("Advanced", ManagementServer.class, String.class, "vmware.public.vswitch", null, "Specify the vSwitch on host for public network", null),
VmwareGuestNetworkVSwitch("Advanced", ManagementServer.class, String.class, "vmware.guest.vswitch", null, "Specify the vSwitch on host for guest network", null),
VmwareServiceConsole("Advanced", ManagementServer.class, String.class, "vmware.service.console", "Service Console", "Specify the service console network name (ESX host only)", null),
// KVM
KvmPublicNetwork("Advanced", ManagementServer.class, String.class, "kvm.public.network.device", null, "Specify the public bridge on host for public network", null),

26
server/src/com/cloud/servlet/ConsoleProxyServlet.java
View File

@ -74,7 +74,7 @@ public class ConsoleProxyServlet extends HttpServlet {
}
if(_ms.getHashKey() == null) {
s_logger.info("Console/thumbnail access denied. Ticket service is not ready yet");
s_logger.debug("Console/thumbnail access denied. Ticket service is not ready yet");
sendResponse(resp, "Service is not ready");
return;
}
@ -93,7 +93,7 @@ public class ConsoleProxyServlet extends HttpServlet {
account = (String)params.get("account")[0];
accountObj = (Account)params.get("accountobj")[0];
} else {
s_logger.info("Invalid web session or API key in request, reject console/thumbnail access");
s_logger.debug("Invalid web session or API key in request, reject console/thumbnail access");
sendResponse(resp, "Access denied. Invalid web session or API key in request");
return;
}
@ -111,14 +111,14 @@ public class ConsoleProxyServlet extends HttpServlet {
// Do a sanity check here to make sure the user hasn't already been deleted
if ((userId == null) || (account == null) || (accountObj == null) || !verifyUser(Long.valueOf(userId))) {
s_logger.info("Invalid user/account, reject console/thumbnail access");
s_logger.debug("Invalid user/account, reject console/thumbnail access");
sendResponse(resp, "Access denied. Invalid or inconsistent account is found");
return;
}
String cmd = req.getParameter("cmd");
if(cmd == null || !isValidCmd(cmd)) {
s_logger.info("invalid console servlet command: " + cmd);
s_logger.debug("invalid console servlet command: " + cmd);
sendResponse(resp, "");
return;
}
@ -294,8 +294,8 @@ public class ConsoleProxyServlet extends HttpServlet {
sb.append("&tag=").append(tag);
sb.append("&ticket=").append(ticket);
if(s_logger.isInfoEnabled()) {
s_logger.info("Compose thumbnail url: " + sb.toString());
if(s_logger.isDebugEnabled()) {
s_logger.debug("Compose thumbnail url: " + sb.toString());
}
return sb.toString();
}
@ -318,8 +318,8 @@ public class ConsoleProxyServlet extends HttpServlet {
sb.append("&tag=").append(tag);
sb.append("&ticket=").append(ticket);
if(s_logger.isInfoEnabled()) {
s_logger.info("Compose console url: " + sb.toString());
if(s_logger.isDebugEnabled()) {
s_logger.debug("Compose console url: " + sb.toString());
}
return sb.toString();
}
@ -479,7 +479,7 @@ public class ConsoleProxyServlet extends HttpServlet {
// if api/secret key are passed to the parameters
if ((signature == null) || (apiKey == null)) {
if (s_logger.isDebugEnabled()) {
s_logger.info("expired session, missing signature, or missing apiKey -- ignoring request...sig: " + signature + ", apiKey: " + apiKey);
s_logger.debug("expired session, missing signature, or missing apiKey -- ignoring request...sig: " + signature + ", apiKey: " + apiKey);
}
return false; // no signature, bad request
}
@ -490,7 +490,7 @@ public class ConsoleProxyServlet extends HttpServlet {
// verify there is a user with this api key
Pair<User, Account> userAcctPair = _ms.findUserByApiKey(apiKey);
if (userAcctPair == null) {
s_logger.info("apiKey does not map to a valid user -- ignoring request, apiKey: " + apiKey);
s_logger.debug("apiKey does not map to a valid user -- ignoring request, apiKey: " + apiKey);
return false;
}
@ -498,14 +498,14 @@ public class ConsoleProxyServlet extends HttpServlet {
Account account = userAcctPair.second();
if (!user.getState().equals(Account.State.enabled) || !account.getState().equals(Account.State.enabled)) {
s_logger.info("disabled or locked user accessing the api, userid = " + user.getId() + "; name = " + user.getUsername() + "; state: " + user.getState() + "; accountState: " + account.getState());
s_logger.debug("disabled or locked user accessing the api, userid = " + user.getId() + "; name = " + user.getUsername() + "; state: " + user.getState() + "; accountState: " + account.getState());
return false;
}
// verify secret key exists
secretKey = user.getSecretKey();
if (secretKey == null) {
s_logger.info("User does not have a secret key associated with the account -- ignoring request, username: " + user.getUsername());
s_logger.debug("User does not have a secret key associated with the account -- ignoring request, username: " + user.getUsername());
return false;
}
@ -519,7 +519,7 @@ public class ConsoleProxyServlet extends HttpServlet {
String computedSignature = com.cloud.utils.encoding.Base64.encodeBytes(encryptedBytes);
boolean equalSig = signature.equals(computedSignature);
if (!equalSig) {
s_logger.info("User signature: " + signature + " is not equaled to computed signature: " + computedSignature);
s_logger.debug("User signature: " + signature + " is not equaled to computed signature: " + computedSignature);
}
return equalSig;
} catch (Exception ex) {