Skip to content

Commit

Permalink
Merge "Removes duplicate for generate_random_name"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Jan 20, 2015
2 parents 9f0e11b + 620d194 commit 841a578
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions rally/benchmark/scenarios/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import functools
import itertools
import random
import string
import time

from rally.common import log as logging
Expand Down Expand Up @@ -64,15 +63,9 @@ def __init__(self, context=None, admin_clients=None, clients=None):
# TODO(amaretskiy): consider about prefix part of benchmark uuid
@classmethod
def _generate_random_name(cls, prefix=None, length=None):
"""Generates random name.
:param prefix: str, custom prefix for genertated name
:param length: int, length of autogenerated part of result name
:returns: str, pseudo-random name
"""
rand_part = ''.join(random.choice(string.ascii_lowercase) for i
in range(length or cls.RESOURCE_NAME_LENGTH))
return (prefix or cls.RESOURCE_NAME_PREFIX) + rand_part
prefix = cls.RESOURCE_NAME_PREFIX if prefix is None else prefix
length = length or cls.RESOURCE_NAME_LENGTH
return utils.generate_random_name(prefix, length)

@staticmethod
def get_by_name(name):
Expand Down

0 comments on commit 841a578

Please sign in to comment.