Updated Branches: refs/heads/4.2-forward 6e64fa53c -> 37d500d2a
CLOUDSTACK-4482: getVMPassword() API call does not return password for Vms that are deployed with password enabled templates. Improving the error message saying no ssh key pair is assinged to VM to get the encrypted password and included a check for password enabled template Signed-off-by: Koushik Das <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/37d500d2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/37d500d2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/37d500d2 Branch: refs/heads/4.2-forward Commit: 37d500d2a6b71c267af20a83208eb6049157f95f Parents: 6e64fa5 Author: Harikrishna Patnala <[email protected]> Authored: Tue Aug 27 11:46:26 2013 +0530 Committer: Koushik Das <[email protected]> Committed: Tue Aug 27 16:26:40 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/server/ManagementServerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37d500d2/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index d1e4e5f..b20bf48 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -3673,7 +3673,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe _userVmDao.loadDetails(vm); String password = vm.getDetail("Encrypted.Password"); if (password == null || password.equals("")) { - InvalidParameterValueException ex = new InvalidParameterValueException("No password for VM with specified id found."); + InvalidParameterValueException ex = new InvalidParameterValueException("No password for VM with specified id found. " + + "If VM is created from password enabled template and SSH keypair is assigned to VM then only password can be retrieved."); ex.addProxyObject(vm.getUuid(), "vmId"); throw ex; }
