From: cope.li <cope.li@huawei.com>
Date: Wed, 28 Nov 2018 08:54:36 +0000 (+0800)
Subject: Pass the path of ssh public key to scenario method
X-Git-Tag: opnfv-8.0.0~48^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F65445%2F3;p=yardstick.git

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>
---

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),