Alon Bar-Lev has uploaded a new change for review. Change subject: utils: tests: do not use default key alias ......................................................................
utils: tests: do not use default key alias Change-Id: I6242a2b6f138c3438ff95febe0b85e0b48befe65 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, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/9167/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 d1249bd..d301a42 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 @@ -21,16 +21,15 @@ import org.junit.Before; import org.junit.Test; import org.ovirt.engine.core.common.config.Config; -import org.ovirt.engine.core.common.config.ConfigValues; 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 -Dssh-test-p12=a.p12 -Dssh-test-p12-password=password + * $ mvn -Dssh-host=host1 -Dssh-test-port=22 -Dssh-test-user=root -Dssh-test-password=password -Dssh-test-p12=a.p12 -Dssh-test-p12-alias=alias -Dssh-test-p12-password=password * * Default SSH public key is: - * ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCF7Rhlve8ikOono3zHN2kkyCqauNSdX9w6lwq3uLNFi7ryyENSpCsQADjCO5EzABUxU+0RHh6OG6TRFCRbI57NN77isfKyLqjsVOkhPB4D86GhmefmnYKPSAA2JxVB9s0BIA8jAgrEy4QFjmxt1EHAi2UAG3PjCC+qANF7CnR47Q== + * ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHU58znwGk/TGAWaswzpC6ZiMDGIpnjcxlcooCscaLsCcvmcFEfZ/CiXSeV1Zc0DpkxWU/oEDpbxQbDGs/1a0f0K88ym2MFeosrOXiFvQV0KsvHLZH3dUvzV46ULuT0NNY8q/dLKdJJp2I2TvekEGsbthxeSzjWLOqEPiKBvHpeTjWv8Q7DCJzoz2JvWGl1Ztgb42pZISrtGPsVcdvTVajYsneR8/QtRuj8F16ntf+kwGR+OjcITIRRBzXD6GoUufuZ+fvkKg40I1VK61c8om8Yfj3ShpiqvtiRNGTWfLSu7Hnn8G9NRTjzYZ457wCTeLoDaN53NZYf3oKrMtWBbGR test * * TODO * @@ -94,6 +93,7 @@ static String password; static String hostKstore; static String hostKstorePassword; + static String hostKstoreAlias; int port; SSHD sshd; @@ -106,6 +106,7 @@ hostKstore = System.getProperty("ssh-test-p12", "src/test/resources/key.p12"); hostKstorePassword = System.getProperty("ssh-test-p12-password", "NoSoup4U"); + hostKstoreAlias = System.getProperty("ssh-test-p12-alias", "1"); host = System.getProperty("ssh-host"); @@ -121,11 +122,7 @@ sshd.setUser( user, password, - ks.getCertificate( - Config.<String>GetValue( - ConfigValues.CertAlias - ) - ).getPublicKey() + ks.getCertificate(hostKstoreAlias).getPublicKey() ); } catch (Throwable e) { -- To view, visit http://gerrit.ovirt.org/9167 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6242a2b6f138c3438ff95febe0b85e0b48befe65 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
