Merge branch 'master' of github.com:enovance/swiftsync

Conflicts:
	sync/filler.py
This commit is contained in:
Chmouel Boudjnah 2013-03-20 13:48:18 +01:00
commit 0b49537127
1 changed files with 28 additions and 6 deletions

View File

@ -44,15 +44,28 @@ import eventlet
sys.path.append("../")
from common.utils import get_config
eventlet.patcher.monkey_patch()
# Some unicode codepoint
ucodes = (u'\u00b5', u'\u00c6', u'\u0159', u'\u0267',
u'\u02b6', u'\u0370', u'\u038F', u'\u03EA',
u'\u046A')
def get_rand_str(mode='user'):
prefix = "%s" % mode
return prefix + ''.join(random.choice(
string.ascii_uppercase + string.digits) for x in range(8))
def customize(bstr, mdl):
if mdl == 0:
return bstr
elif mdl == 1:
return bstr+" s"
elif mdl == 2:
return unicode(bstr, 'utf8') + u'_' + u"".\
join([random.choice(ucodes) for i in range(3)])
else:
return bstr
def create_swift_user(client, account_name, account_id, user_amount):
users = []
@ -162,9 +175,12 @@ def create_objects(cnx, acc, o_amount, fmax, index_containers):
_generate_object(f_object, fmax, zero_byte=True)
else:
_generate_object(f_object, fmax)
object_name = get_rand_str('file_name_')
meta_keys = map(get_rand_str, ('X-Object-Meta-',) * 3)
meta_values = map(get_rand_str, ('meta_v_',) * 3)
# Customize filename
object_name = customize(get_rand_str('file_name_'), i%3)
meta_keys = [customize(m, (i+1)%3) for m in
map(get_rand_str, ('X-Object-Meta-',) * 3)]
meta_values = [customize(m, (i+1)%3) for m in
map(get_rand_str, ('meta_v_',) * 3)]
meta = dict(zip(meta_keys, meta_values))
data = f_object.read()
etag = cnx.put_object(container, object_name,
@ -178,9 +194,15 @@ def create_objects(cnx, acc, o_amount, fmax, index_containers):
def create_containers(cnx, acc, c_amount, index_containers=None):
containers_d = index_containers.setdefault(acc, {})
for i in range(c_amount):
container_name = get_rand_str('container_')
container_name = customize(get_rand_str('container_'), i%3)
# Got some errors when triying to reach container with space
# in their name.
# meta_keys = [customize(m, (i+1)%3) for m in
# map(get_rand_str, ('X-Container-Meta-',) * 3)]
meta_keys = map(get_rand_str, ('X-Container-Meta-',) * 3)
meta_values = map(get_rand_str, ('meta_v_',) * 3)
# meta_values = map(get_rand_str, ('meta_v_',) * 3)
meta_values = [customize(m, (i+1)%3) for m in
map(get_rand_str, ('meta_v_',) * 3)]
meta = dict(zip(meta_keys, meta_values))
print "Create container %s" % container_name
cnx.put_container(container_name, headers=copy(meta))