This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new e817e04343a Fix typo keyparis -> keypairs in
InvalidParameterValueException (#9100)
e817e04343a is described below
commit e817e04343a3c91696625211b59d916125366fc1
Author: Hans Rakers <[email protected]>
AuthorDate: Fri May 24 17:41:02 2024 +0200
Fix typo keyparis -> keypairs in InvalidParameterValueException (#9100)
---
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index a5a8f07546b..a03aeac9967 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -1012,7 +1012,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
}
if (cmd.getNames() == null || cmd.getNames().isEmpty()) {
- throw new InvalidParameterValueException("'keypair' or 'keyparis'
must be specified");
+ throw new InvalidParameterValueException("'keypair' or 'keypairs'
must be specified");
}
String keypairnames = "";
@@ -1021,7 +1021,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
pairs = _sshKeyPairDao.findByNames(owner.getAccountId(),
owner.getDomainId(), cmd.getNames());
if (pairs == null || pairs.size() != cmd.getNames().size()) {
- throw new InvalidParameterValueException("Not all specified
keyparis exist");
+ throw new InvalidParameterValueException("Not all specified
keypairs exist");
}
sshPublicKeys = pairs.stream().map(p ->
p.getPublicKey()).collect(Collectors.joining("\n"));
keypairnames = String.join(",", cmd.getNames());
@@ -4209,7 +4209,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
if (!sshKeyPairs.isEmpty()) {
List<SSHKeyPairVO> pairs =
_sshKeyPairDao.findByNames(owner.getAccountId(), owner.getDomainId(),
sshKeyPairs);
if (pairs == null || pairs.size() != sshKeyPairs.size()) {
- throw new InvalidParameterValueException("Not all
specified keyparis exist");
+ throw new InvalidParameterValueException("Not all
specified keypairs exist");
}
sshPublicKeys = pairs.stream().map(p ->
p.getPublicKey()).collect(Collectors.joining("\n"));