From: Ross Brattain Date: Wed, 20 Sep 2017 21:53:38 +0000 (-0700) Subject: heat: fixup unittest block with pkey X-Git-Tag: opnfv-6.0.0~441 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F77%2F42577%2F1;hp=d374dc8ca09e7d6e08a531e68a21a8b107af21d0;p=yardstick.git heat: fixup unittest block with pkey get pkey after we have found the node Change-Id: I0e67834b87ed5ba268ea9cb5cffb6c214aedeebb Signed-off-by: Ross Brattain --- diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py index f93dfac28..9a7b3817f 100644 --- a/yardstick/benchmark/contexts/heat.py +++ b/yardstick/benchmark/contexts/heat.py @@ -413,10 +413,6 @@ class HeatContext(Context): attr_name: either a name for a server created by yardstick or a dict with attribute name mapping when using external heat templates """ - pkey = pkg_resources.resource_string( - 'yardstick.resources', - h_join('files/yardstick_key', get_short_key_uuid(self.key_uuid))).decode('utf-8') - if isinstance(attr_name, collections.Mapping): node_name, cname = self.split_name(attr_name['name']) if cname is None or cname != self.name: @@ -434,6 +430,10 @@ class HeatContext(Context): if server is None: return None + pkey = pkg_resources.resource_string( + 'yardstick.resources', + h_join('files/yardstick_key', get_short_key_uuid(self.key_uuid))).decode('utf-8') + result = { "user": server.context.user, "pkey": pkey,