Alon Bar-Lev has uploaded a new change for review. Change subject: utils: ssh: cleanup: rename server with host ......................................................................
utils: ssh: cleanup: rename server with host 'Host' is more compatible with the other API. Change-Id: I4b342fa033713608baa977c8e0592be2f5c35927 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQuery.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHClient.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java 3 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/9246/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQuery.java index 0232fc2..a6b57eb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersQuery.java @@ -147,12 +147,12 @@ } private String getFingerprint(SSHClient client) { - PublicKey serverKey = client.getServerKey(); - if (serverKey == null) { + PublicKey hostKey = client.getHostKey(); + if (hostKey == null) { log.error("Could not get server key"); return null; } - return OpenSSHUtils.getKeyFingerprintString(serverKey); + return OpenSSHUtils.getKeyFingerprintString(hostKey); } } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHClient.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHClient.java index 3e6d97f..e645ee6 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHClient.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHClient.java @@ -51,7 +51,7 @@ private KeyPair _keyPair; private String _host; private int _port = DEFAULT_SSH_PORT; - private PublicKey _serverKey; + private PublicKey _hostKey; /** * Create the client. @@ -169,7 +169,7 @@ public void setHost(String host, int port) { _host = host; _port = port; - _serverKey = null; + _hostKey = null; } /** @@ -240,11 +240,11 @@ } /** - * Get server key - * @return server key. + * Get host key + * @return host key. */ - public PublicKey getServerKey() { - return _serverKey; + public PublicKey getHostKey() { + return _hostKey; } /** @@ -265,7 +265,7 @@ SocketAddress remoteAddress, PublicKey serverKey ) { - _serverKey = serverKey; + _hostKey = serverKey; return true; } } @@ -287,7 +287,7 @@ /* * Wait for authentication phase so - * we have serverKey. + * we have host key. */ int stat = _session.waitFor( ( diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java index c323e45..98f6d78 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java @@ -90,9 +90,9 @@ } @Test - public void testServerKey() throws Exception { + public void testHostKey() throws Exception { Assume.assumeNotNull(TestCommon.sshd); client.connect(); - assertEquals(TestCommon.sshd.getKey(), client.getServerKey()); + assertEquals(TestCommon.sshd.getKey(), client.getHostKey()); } } -- To view, visit http://gerrit.ovirt.org/9246 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b342fa033713608baa977c8e0592be2f5c35927 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
