Alon Bar-Lev has uploaded a new change for review. Change subject: utils: support external host for VdsInstallerSSH tests ......................................................................
utils: support external host for VdsInstallerSSH tests Useful for problem determination using real sshd. Similar to low level SSH tests, only that it cannot receive custom key store. Change-Id: I007282dbb9404f0a0a898ae2443dccf9f0c0e404 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/VdsInstallerSSHTest.java 1 file changed, 50 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/7427/1 diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/VdsInstallerSSHTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/VdsInstallerSSHTest.java index da90088..c8a912f 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/VdsInstallerSSHTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/VdsInstallerSSHTest.java @@ -19,6 +19,18 @@ import org.ovirt.engine.core.common.config.IConfigUtilsInterface; import org.ovirt.engine.core.utils.ssh.SSHD; +/* + * Test properties + * $ mvn -Dssh-host=host1 -Dssh-test-port=22 -Dssh-test-user=root -Dssh-test-password=password + * + * SSH public key is: + * ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCF7Rhlve8ikOono3zHN2kkyCqauNSdX9w6lwq3uLNFi7ryyENSpCsQADjCO5EzABUxU+0RHh6OG6TRFCRbI57NN77isfKyLqjsVOkhPB4D86GhmefmnYKPSAA2JxVB9s0BIA8jAgrEy4QFjmxt1EHAi2UAG3PjCC+qANF7CnR47Q== + * + * TODO + * + * In future the installer should accept PublicKey and not keystore. + */ + public class VdsInstallerSSHTest { class MyVdsInstallerCallback implements IVdsInstallerCallback { public String error; @@ -71,11 +83,11 @@ } } - static String user = "root"; - static String password = "password"; + static String host; + static String user; + static String password; static String hostKstore = "src/test/resources/.hostKstore"; static String hostKstorePassword = "NoSoup4U"; - static String host = "localhost"; int port; SSHD sshd; @@ -85,30 +97,43 @@ IConfigUtilsInterface confInstance = new DefaultValuesConfigUtil(); Config.setConfigUtils(confInstance); - sshd = new SSHD(); - try { - KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(hostKstore), /*hostKstorePassword.toCharArray()*/null); - sshd.setUser( - user, - password, - ks.getCertificate( - Config.<String>GetValue( - ConfigValues.CertAlias - ) - ).getPublicKey() - ); - } - catch (Throwable e) { - throw new RuntimeException(e); - } - try { - sshd.start(); - } - catch(IOException e) { + host = System.getProperty("ssh-host"); + + if (host == null) { + host = "localhost"; + user = "root"; + password = "password"; + + sshd = new SSHD(); + try { + KeyStore ks = KeyStore.getInstance("JKS"); + ks.load(new FileInputStream(hostKstore), /*hostKstorePassword.toCharArray()*/null); + sshd.setUser( + user, + password, + ks.getCertificate( + Config.<String>GetValue( + ConfigValues.CertAlias + ) + ).getPublicKey() + ); + } + catch (Throwable e) { throw new RuntimeException(e); + } + try { + sshd.start(); + } + catch(IOException e) { + throw new RuntimeException(e); + } + port = sshd.getPort(); } - port = sshd.getPort(); + else { + port = Integer.parseInt(System.getProperty("ssh-test-port", "22")); + user = System.getProperty("ssh-test-user", "root"); + password = System.getProperty("ssh-test-password", "password"); + } } @After -- To view, visit http://gerrit.ovirt.org/7427 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I007282dbb9404f0a0a898ae2443dccf9f0c0e404 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
