From dc2a70ed32ac3a7919d0891b50bb621b226d5bc9 Mon Sep 17 00:00:00 2001 From: rexlee8776 Date: Mon, 15 Aug 2016 12:08:48 +0000 Subject: bug fix: ssh authentiation error when run compass scenario in fuel JIRA: YARDSTICK-319 Change-Id: I25ee9a2582c751024b30e91eabf77aebb14a02f7 Signed-off-by: rexlee8776 --- tests/unit/test_ssh.py | 4 +++- yardstick/ssh.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_ssh.py b/tests/unit/test_ssh.py index 574da0343..a27052462 100644 --- a/tests/unit/test_ssh.py +++ b/tests/unit/test_ssh.py @@ -108,7 +108,9 @@ class SSHTestCase(unittest.TestCase): mock.call.set_missing_host_key_policy("autoadd"), mock.call.connect("example.net", username="admin", port=22, pkey="key", key_filename=None, - password=None, timeout=1), + password=None, + allow_agent=False, look_for_keys=False, + timeout=1), ] self.assertEqual(client_calls, client.mock_calls) diff --git a/yardstick/ssh.py b/yardstick/ssh.py index 2816a1c7d..cf890df6f 100644 --- a/yardstick/ssh.py +++ b/yardstick/ssh.py @@ -121,7 +121,9 @@ class SSH(object): self._client.connect(self.host, username=self.user, port=self.port, pkey=self.pkey, key_filename=self.key_filename, - password=self.password, timeout=1) + password=self.password, + allow_agent=False, look_for_keys=False, + timeout=1) return self._client except Exception as e: message = ("Exception %(exception_type)s was raised " -- cgit 1.2.3-korg