summaryrefslogtreecommitdiff
path: root/tempest/scenario/manager.py
diff options
context:
space:
mode:
authorKen'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>2015-03-23 02:00:19 +0000
committerKen'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>2015-03-30 01:24:05 +0000
commit6ded8df3b82680a63fd5b28f2ca71d2045e9f592 (patch)
treef3a08469093e7bf6dff497c1df293f03566831f3 /tempest/scenario/manager.py
parentd0057586b9c2313c9d5eb370d3eb9b67e54f566f (diff)
downloadtempest-6ded8df3b82680a63fd5b28f2ca71d2045e9f592.tar.gz
Remove hyphen from rand_name calls in scenario tests
data_utils.rand_name() appends randam charactors with a hypen like: def rand_name(name=''): randbits = str(random.randint(1, 0x7fffffff)) if name: return name + '-' + randbits So it is not necessary to specify a hypen in caller side. This patch removes a hypen in scenario tests. Change-Id: I21f19e27c3081ac35317d9422436bd8062eced2d
Diffstat (limited to 'tempest/scenario/manager.py')
-rw-r--r--tempest/scenario/manager.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index bae829677..ebdebcfef 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -401,7 +401,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
# Compute client
_images_client = self.images_client
if name is None:
- name = data_utils.rand_name('scenario-snapshot-')
+ name = data_utils.rand_name('scenario-snapshot')
LOG.debug("Creating a snapshot image for server: %s", server['name'])
image = _images_client.create_image(server['id'], name)
image_id = image.response['location'].split('images/')[1]
@@ -1317,7 +1317,7 @@ class EncryptionScenarioTest(ScenarioTest):
client = self.admin_volume_types_client
if not name:
name = 'generic'
- randomized_name = data_utils.rand_name('scenario-type-' + name + '-')
+ randomized_name = data_utils.rand_name('scenario-type-' + name)
LOG.debug("Creating a volume type: %s", randomized_name)
body = client.create_volume_type(
randomized_name)