You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/05/19 14:01:15 UTC
git commit: updated refs/heads/4.4-forward to f2ebfe0
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward d5425e1a4 -> f2ebfe019
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/f2ebfe01
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2ebfe01
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2ebfe01
Branch: refs/heads/4.4-forward
Commit: f2ebfe019e1ead6172712ec804b241cf0dc5a800
Parents: d5425e1
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Sun May 18 21:25:29 2014 -0400
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Mon May 19 01:12:30 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/f2ebfe01/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 026f5ff..9df3f2f 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -617,7 +617,7 @@ test_data = {
},
"natrule": {
"privateport": 22,
- "publicport": 2222,
+ "publicport": 22,
"protocol": "TCP"
},
"lbrule": {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2ebfe01/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):
'''