diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-01-11 21:59:18 -0800 |
---|---|---|
committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-01-12 00:45:50 -0800 |
commit | 5f0b3d417244397b2d5e61c7a6ddd145f1d25046 (patch) | |
tree | 7da9673054bb138a7bafd231edccca774c927f5b /yardstick/orchestrator/heat.py | |
parent | 708550dd0718abdad8862e2275cc8e025a7c55e3 (diff) |
heat: fix key_uuid format
The .format() won't work, since it can't slice the uuid
We have to convert the uuid to string before we slice it.
I thought .format() would implicitly call __str__() before
applying width, but that is not the case.
'files/yardstick_key-{:.{width}}'.format(self.key_uuid, width=8))
We also need to define a constant short uuid lenght, we can't
hardcode the length to 8 everywhere.
Create a helper function to standardize the generation
of the short key uuid and use that helper function everywhere
Change-Id: I59e051bfe697587e967f93f5b8f209e0e7daa5c7
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Diffstat (limited to 'yardstick/orchestrator/heat.py')
-rw-r--r-- | yardstick/orchestrator/heat.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py index f1104d625..e32d360e4 100644 --- a/yardstick/orchestrator/heat.py +++ b/yardstick/orchestrator/heat.py @@ -14,11 +14,11 @@ import datetime import getpass import socket import logging -import pkg_resources import json from oslo_utils import encodeutils import heatclient +import pkg_resources from yardstick.common import template_format import yardstick.common.openstack_utils as op_utils @@ -27,6 +27,13 @@ import yardstick.common.openstack_utils as op_utils log = logging.getLogger(__name__) +HEAT_KEY_UUID_LENGTH = 8 + + +def get_short_key_uuid(uuid): + return str(uuid)[:HEAT_KEY_UUID_LENGTH] + + class HeatObject(object): ''' base class for template and stack''' def __init__(self): @@ -308,8 +315,8 @@ class HeatTemplate(HeatObject): 'public_key': encodeutils.safe_decode( pkg_resources.resource_string( 'yardstick.resources', - 'files/yardstick_key-{:.{width}}.pub'.format( - key_uuid, width=8)), + 'files/yardstick_key-' + + get_short_key_uuid(key_uuid) + '.pub'), 'utf-8') } } |