mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Fix typo keyparis -> keypairs in InvalidParameterValueException (#9100)
This commit is contained in:
parent
b38f1364e6
commit
e817e04343
@ -1012,7 +1012,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (cmd.getNames() == null || cmd.getNames().isEmpty()) {
|
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 = "";
|
String keypairnames = "";
|
||||||
@ -1021,7 +1021,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
|||||||
|
|
||||||
pairs = _sshKeyPairDao.findByNames(owner.getAccountId(), owner.getDomainId(), cmd.getNames());
|
pairs = _sshKeyPairDao.findByNames(owner.getAccountId(), owner.getDomainId(), cmd.getNames());
|
||||||
if (pairs == null || pairs.size() != cmd.getNames().size()) {
|
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"));
|
sshPublicKeys = pairs.stream().map(p -> p.getPublicKey()).collect(Collectors.joining("\n"));
|
||||||
keypairnames = String.join(",", cmd.getNames());
|
keypairnames = String.join(",", cmd.getNames());
|
||||||
@ -4209,7 +4209,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
|||||||
if (!sshKeyPairs.isEmpty()) {
|
if (!sshKeyPairs.isEmpty()) {
|
||||||
List<SSHKeyPairVO> pairs = _sshKeyPairDao.findByNames(owner.getAccountId(), owner.getDomainId(), sshKeyPairs);
|
List<SSHKeyPairVO> pairs = _sshKeyPairDao.findByNames(owner.getAccountId(), owner.getDomainId(), sshKeyPairs);
|
||||||
if (pairs == null || pairs.size() != sshKeyPairs.size()) {
|
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"));
|
sshPublicKeys = pairs.stream().map(p -> p.getPublicKey()).collect(Collectors.joining("\n"));
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user