CLOUDSTACK-6612: Resolved issue with sshClient.py (cherry picked from commit f2ebfe019e1ead6172712ec804b241cf0dc5a800)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/247377c4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/247377c4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/247377c4 Branch: refs/heads/4.4 Commit: 247377c4cf2e6e0b0d6c04f0b0eba2e6811ac6de Parents: d560391 Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Sun May 18 21:25:29 2014 -0400 Committer: Daan Hoogland <d...@onecht.net> Committed: Mon Jul 28 17:43:21 2014 +0200 ---------------------------------------------------------------------- tools/marvin/marvin/config/test_data.py | 2 +- tools/marvin/marvin/sshClient.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/247377c4/tools/marvin/marvin/config/test_data.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index ecdf8f7..2b820d6 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -479,7 +479,7 @@ test_data = { }, "natrule": { "privateport": 22, - "publicport": 2222, + "publicport": 22, "protocol": "TCP" }, "lbrule": { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/247377c4/tools/marvin/marvin/sshClient.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/sshClient.py b/tools/marvin/marvin/sshClient.py index 611c8b5..e1c62c0 100644 --- a/tools/marvin/marvin/sshClient.py +++ b/tools/marvin/marvin/sshClient.py @@ -15,7 +15,6 @@ # specific language governing permissions and limitations # under the License. -import paramiko from paramiko import (BadHostKeyException, AuthenticationException, SSHException, @@ -32,9 +31,8 @@ from marvin.cloudstackException import ( import contextlib import logging from marvin.codes import ( - SUCCESS, FAILED, INVALID_INPUT, EXCEPTION_OCCURRED + SUCCESS, FAILED, INVALID_INPUT ) -from contextlib import closing class SshClient(object): @@ -152,9 +150,9 @@ class SshClient(object): self.logger.\ exception("SshClient: Exception under " "createConnection: %s" % except_msg) - self.retryCnt = self.retryCnt - 1 + self.retryCnt -= 1 time.sleep(self.delay) - return ret + return ret def runCommand(self, command): '''
