x/cloudcafe
Code Issues Proposed changes

Merge "Makes the random string method more random"

Browse Source
This commit is contained in:
Jenkins 2013-12-04 19:41:29 +00:00 committed by Gerrit Code Review
commit 6bff32b8dc
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cloudcafe/common/tools/datagen.py
View File

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
from uuid import uuid4
import random
from math import pow
import string
import time
from math import pow
SOURCE_RANDOM = '/dev/urandom'
SOURCE_ZEROS = '/dev/zero'
@ -65,30 +65,12 @@ def timestamp_string(prefix=None, suffix=None, decimal_precision=6):
def random_string(prefix=None, suffix=None, size=8):
"""
Return exactly size bytes worth of base_text as a string
surrounded by any defined pre or suf-fixes
Return a random string of alphanumeric characaters of 'size' length.
"""
base_text = str(uuid4()).replace('-', '0')
if size <= 0:
return '%s%s' % (prefix, suffix)
extra = size % len(base_text)
body = ''
if extra == 0:
body = base_text * size
if extra == size:
body = base_text[:size]
if (extra > 0) and (extra < size):
body = (size / len(base_text)) * base_text + base_text[:extra]
body = str(prefix) + str(body) if prefix is not None else body
body = str(body) + str(suffix) if suffix is not None else body
return body
charpool = tuple(string.ascii_letters + string.digits)
rstr = "".join(random.sample((charpool), size))
return "{0}{1}{2}".format(prefix or '', rstr, suffix or '')
def random_ip(pattern=None):