Code Review
/
yardstick.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
edb66ef
)
Pass the path of ssh public key to scenario method
45/65445/3
author
cope.li
<cope.li@huawei.com>
Wed, 28 Nov 2018 08:54:36 +0000
(16:54 +0800)
committer
cope li
<cope.li@huawei.com>
Tue, 11 Dec 2018 11:54:07 +0000
(11:54 +0000)
In our testcase, we need the key_file for our VM login.
JIRA:YARDSTICK-1558
Change-Id: If99704c4f91c87d79e156f2dd73795a059b7ce6c
Signed-off-by: cope.li <cope.li@huawei.com>
yardstick/benchmark/contexts/heat.py
patch
|
blob
|
history
diff --git
a/yardstick/benchmark/contexts/heat.py
b/yardstick/benchmark/contexts/heat.py
index
c3c5451
..
f4c48f4
100644
(file)
--- a/
yardstick/benchmark/contexts/heat.py
+++ b/
yardstick/benchmark/contexts/heat.py
@@
-508,10
+508,12
@@
class HeatContext(Context):
pkey = pkg_resources.resource_string(
'yardstick.resources',
h_join('files/yardstick_key', self.name)).decode('utf-8')
-
+ key_filename = pkg_resources.resource_filename('yardstick.resources',
+ h_join('files/yardstick_key', self.name))
result = {
"user": server.context.user,
"pkey": pkey,
+ "key_filename": key_filename,
"private_ip": server.private_ip,
"interfaces": server.interfaces,
"routing_table": self.generate_routing_table(server),