Repository: cloudstack Updated Branches: refs/heads/master 8c4763a1e -> 89b041a62
CLOUDSTACK-6612: Resolved issue with sshClient.py Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/89b041a6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/89b041a6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/89b041a6 Branch: refs/heads/master Commit: 89b041a62d99d07b7c5d5b7b49bda3630f9559dd Parents: 8c4763a Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Sun May 18 21:25:29 2014 -0400 Committer: Girish Shilamkar <gir...@clogeny.com> Committed: Mon May 19 01:17:02 2014 -0400 ---------------------------------------------------------------------- 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/89b041a6/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 5577ae1..52be02d 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -621,7 +621,7 @@ test_data = { }, "natrule": { "privateport": 22, - "publicport": 2222, + "publicport": 22, "protocol": "TCP" }, "lbrule": { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89b041a6/tools/marvin/marvin/sshClient.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/sshClient.py b/tools/marvin/marvin/sshClient.py index 76f3b6d..df2eeee 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): '''
