apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Decouple the use of updateHostPassword

Browse Source 
- The code was hard to maintain because updating a host or all the hosts in a cluster was handled in the same method
   - Created updateHost and updateCluster password in both ResourceManager and ManagementServer interfaces/classes
   - The chck for whihc method to use is done in the API level
   - Started adding the support for KVM host passwd update

No API changes are needed and it will be backwards compatible.

Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>
This commit is contained in:
wilderrodrigues 2015-06-24 13:59:50 +02:00
parent ac1b5e3705
commit 03dd34039a
5 changed files with 113 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/resource/ResourceService.java
View File

@ -84,6 +84,8 @@ public interface ResourceService {
*/
boolean deleteHost(long hostId, boolean isForced, boolean isForceDeleteStorage);
boolean updateClusterPassword(UpdateHostPasswordCmd upasscmd);
boolean updateHostPassword(UpdateHostPasswordCmd upasscmd);
Host getHost(long hostId);

2
api/src/com/cloud/server/ManagementService.java
View File

@ -300,6 +300,8 @@ public interface ManagementService {
boolean updateHostPassword(UpdateHostPasswordCmd cmd);
boolean updateClusterPassword(UpdateHostPasswordCmd cmd);
InstanceGroup updateVmGroup(UpdateVMGroupCmd cmd);
Map<String, Object> listCapabilities(ListCapabilitiesCmd cmd);

10
api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
View File

@ -86,8 +86,14 @@ public class UpdateHostPasswordCmd extends BaseCmd {
@Override
public void execute() {
_mgr.updateHostPassword(this);
_resourceService.updateHostPassword(this);
if (getClusterId() == null) {
_mgr.updateHostPassword(this);
_resourceService.updateHostPassword(this);
} else {
_mgr.updateClusterPassword(this);
_resourceService.updateClusterPassword(this);
}
setResponseObject(new SuccessResponse(getCommandName()));
}
}

54
server/src/com/cloud/resource/ResourceManagerImpl.java
View File

@ -2239,39 +2239,41 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
}
@Override
public boolean updateHostPassword(final UpdateHostPasswordCmd cmd) {
if (cmd.getClusterId() == null) {
// update agent attache password
public boolean updateClusterPassword(final UpdateHostPasswordCmd command) {
// get agents for the cluster
final List<HostVO> hosts = listAllHostsInCluster(command.getClusterId());
for (final HostVO h : hosts) {
try {
final Boolean result = propagateResourceEvent(cmd.getHostId(), ResourceState.Event.UpdatePassword);
/*
* FIXME: this is a buggy logic, check with alex. Shouldn't
* return if propagation return non null
*/
final Boolean result = propagateResourceEvent(h.getId(), ResourceState.Event.UpdatePassword);
if (result != null) {
return result;
}
} catch (final AgentUnavailableException e) {
s_logger.error("Agent is not availbale!", e);
}
return doUpdateHostPassword(cmd.getHostId());
} else {
// get agents for the cluster
final List<HostVO> hosts = listAllHostsInCluster(cmd.getClusterId());
for (final HostVO h : hosts) {
try {
/*
* FIXME: this is a buggy logic, check with alex. Shouldn't
* return if propagation return non null
*/
final Boolean result = propagateResourceEvent(h.getId(), ResourceState.Event.UpdatePassword);
if (result != null) {
return result;
}
doUpdateHostPassword(h.getId());
} catch (final AgentUnavailableException e) {
}
}
return true;
doUpdateHostPassword(h.getId());
}
return true;
}
@Override
public boolean updateHostPassword(final UpdateHostPasswordCmd cmd) {
// update agent attache password
try {
final Boolean result = propagateResourceEvent(cmd.getHostId(), ResourceState.Event.UpdatePassword);
if (result != null) {
return result;
}
} catch (final AgentUnavailableException e) {
s_logger.error("Agent is not availbale!", e);
}
return doUpdateHostPassword(cmd.getHostId());
}
public String getPeerName(final long agentHostId) {

112
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -3739,50 +3739,84 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
return password;
}
private boolean updateHostsInCluster(final UpdateHostPasswordCmd command) {
// get all the hosts in this cluster
final List<HostVO> hosts = _resourceMgr.listAllHostsInCluster(command.getClusterId());
Transaction.execute(new TransactionCallbackNoReturn() {
@Override
public void doInTransactionWithoutResult(final TransactionStatus status) {
for (final HostVO h : hosts) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Changing password for host name = " + h.getName());
}
// update password for this host
final DetailVO nv = _detailsDao.findDetail(h.getId(), ApiConstants.USERNAME);
if (nv.getValue().equals(command.getUsername())) {
final DetailVO nvp = _detailsDao.findDetail(h.getId(), ApiConstants.PASSWORD);
nvp.setValue(DBEncryptionUtil.encrypt(command.getPassword()));
_detailsDao.persist(nvp);
} else {
// if one host in the cluster has diff username then
// rollback to maintain consistency
throw new InvalidParameterValueException("The username is not same for all hosts, please modify passwords for individual hosts.");
}
}
}
});
return true;
}
/**
* This method updates the password of all hosts in a given cluster.
*/
@Override
@DB
public boolean updateClusterPassword(final UpdateHostPasswordCmd command) {
if (command.getClusterId() == null) {
throw new InvalidParameterValueException("You should provide a cluster id.");
}
final ClusterVO cluster = ApiDBUtils.findClusterById(command.getClusterId());
if (cluster == null || cluster.getHypervisorType() != HypervisorType.XenServer || cluster.getHypervisorType() != HypervisorType.KVM) {
throw new InvalidParameterValueException("This operation is not supported for this hypervisor type");
}
return updateHostsInCluster(command);
}
@Override
@DB
public boolean updateHostPassword(final UpdateHostPasswordCmd cmd) {
if (cmd.getClusterId() == null && cmd.getHostId() == null) {
throw new InvalidParameterValueException("You should provide one of cluster id or a host id.");
} else if (cmd.getClusterId() == null) {
final HostVO host = _hostDao.findById(cmd.getHostId());
if (host != null && host.getHypervisorType() == HypervisorType.XenServer) {
throw new InvalidParameterValueException("You should provide cluster id for Xenserver cluster.");
} else {
throw new InvalidParameterValueException("This operation is not supported for this hypervisor type");
}
} else {
final ClusterVO cluster = ApiDBUtils.findClusterById(cmd.getClusterId());
if (cluster == null || cluster.getHypervisorType() != HypervisorType.XenServer) {
throw new InvalidParameterValueException("This operation is not supported for this hypervisor type");
}
// get all the hosts in this cluster
final List<HostVO> hosts = _resourceMgr.listAllHostsInCluster(cmd.getClusterId());
Transaction.execute(new TransactionCallbackNoReturn() {
@Override
public void doInTransactionWithoutResult(final TransactionStatus status) {
for (final HostVO h : hosts) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Changing password for host name = " + h.getName());
}
// update password for this host
final DetailVO nv = _detailsDao.findDetail(h.getId(), ApiConstants.USERNAME);
if (nv.getValue().equals(cmd.getUsername())) {
final DetailVO nvp = _detailsDao.findDetail(h.getId(), ApiConstants.PASSWORD);
nvp.setValue(DBEncryptionUtil.encrypt(cmd.getPassword()));
_detailsDao.persist(nvp);
} else {
// if one host in the cluster has diff username then
// rollback to maintain consistency
throw new InvalidParameterValueException("The username is not same for all hosts, please modify passwords for individual hosts.");
}
}
}
});
if (cmd.getHostId() == null) {
throw new InvalidParameterValueException("You should provide an host id.");
}
final HostVO host = _hostDao.findById(cmd.getHostId());
if (host.getHypervisorType() != HypervisorType.XenServer || host.getHypervisorType() != HypervisorType.KVM) {
throw new InvalidParameterValueException("This operation is not supported for this hypervisor type");
}
Transaction.execute(new TransactionCallbackNoReturn() {
@Override
public void doInTransactionWithoutResult(final TransactionStatus status) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Changing password for host name = " + host.getName());
}
// update password for this host
final DetailVO nv = _detailsDao.findDetail(host.getId(), ApiConstants.USERNAME);
if (nv.getValue().equals(cmd.getUsername())) {
final DetailVO nvp = _detailsDao.findDetail(host.getId(), ApiConstants.PASSWORD);
nvp.setValue(DBEncryptionUtil.encrypt(cmd.getPassword()));
_detailsDao.persist(nvp);
} else {
// if one host in the cluster has diff username then
// rollback to maintain consistency
throw new InvalidParameterValueException("The username is not same for the hosts..");
}
}
});
return true;
}