summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcope.li <cope.li@huawei.com>2018-11-28 16:54:36 +0800
committercope li <cope.li@huawei.com>2018-12-11 11:54:07 +0000
commit1e6069603e456d44c7ebdf430c2568005e3bdd8d (patch)
tree3917b0ddbab7cfda0a4ad9a82d143e948ad0e82a
parentedb66ef37f9d89a783f3eda15d82d6fcebd7598e (diff)
Pass the path of ssh public key to scenario method
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>
-rw-r--r--yardstick/benchmark/contexts/heat.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py
index c3c5451bd..f4c48f4a5 100644
--- 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),