Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding sample testcases to run on standalone context"
[yardstick.git]
/
yardstick
/
ssh.py
diff --git
a/yardstick/ssh.py
b/yardstick/ssh.py
index
bb715e4
..
e98ee98
100644
(file)
--- a/
yardstick/ssh.py
+++ b/
yardstick/ssh.py
@@
-64,6
+64,7
@@
Eventlet:
"""
from __future__ import absolute_import
import os
"""
from __future__ import absolute_import
import os
+import io
import select
import socket
import time
import select
import socket
import time
@@
-81,6
+82,14
@@
from yardstick.common.utils import try_int
from yardstick.network_services.utils import provision_tool
from yardstick.network_services.utils import provision_tool
+def convert_key_to_str(key):
+ if not isinstance(key, (paramiko.RSAKey, paramiko.DSSKey)):
+ return key
+ k = io.StringIO()
+ key.write_private_key(k)
+ return k.getvalue()
+
+
class SSHError(Exception):
pass
class SSHError(Exception):
pass