finish implementation of data generator presets, fix flake8

Makefile

@@ -507,11 +507,12 @@ test_tox:
 test_jenkins : test_coverage
 
 # Make fake data
+DATA_GEN_PRESET = ""
 bulk_data:
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/tower/bin/activate; \
 	fi; \
-	$(PYTHON) tools/data_generators/rbac_dummy_data_generator.py
+	$(PYTHON) tools/data_generators/rbac_dummy_data_generator.py --preset=$(DATA_GEN_PRESET)
 
 # l10n TASKS
 # --------------------------------------

tools/data_generators/load_presets.py

@@ -1,26 +0,0 @@
-import os
-
-preset = 'medium'
-
-presets_filename = os.path.abspath(os.path.join(
-    os.path.dirname(os.path.abspath(__file__)),
-    'presets.tsv'))
-
-with open(presets_filename) as f:
-    text = f.read()
-
-split_lines = [line.split('\t') for line in text.split('\n')]
-keys = split_lines[0][1:]
-
-try:
-    col = keys.index(preset)
-except ValueError:
-    raise Exception('Preset %s data set not found, options are %s' % (preset, keys))
-
-options = {cols[0]: cols[col+1] for cols in split_lines}
-
-print ' text '
-print text
-
-print ' options '
-print options

tools/data_generators/rbac_dummy_data_generator.py

@@ -84,7 +84,22 @@ options = vars(options)
 
 
 if options['preset']:
-    pass
+    # Read the numbers of resources from presets file, if provided
+    presets_filename = os.path.abspath(os.path.join(
+        os.path.dirname(os.path.abspath(__file__)), 'presets.tsv'))
+
+    with open(presets_filename) as f:
+        text = f.read()
+
+    split_lines = [line.split('\t') for line in text.split('\n')]
+    keys = split_lines[0][1:]
+
+    try:
+        col = keys.index(options['preset'])
+    except ValueError:
+        raise Exception('Preset "%s" dataset not found, options are %s' % (options['preset'], keys))
+
+    options.update({cols[0]: cols[col + 1] for cols in split_lines})
 
 
 n_organizations    = int(options['organizations'])
@@ -163,6 +178,7 @@ class Rollback(Exception):
 def mock_save(self, *args, **kwargs):
     return super(PrimordialModel, self).save(*args, **kwargs)
 
+
 PrimordialModel.save = mock_save
 
 
@@ -334,8 +350,8 @@ try:
                     project, _ = Project.objects.get_or_create(
                         name='%s Project %d Org %d' % (prefix, project_id, org_idx),
                         organization=org,
-                        defaults=dict(created_by=next(creator_gen),
+                        defaults=dict(
-                                      modified_by=next(modifier_gen),
+                            created_by=next(creator_gen), modified_by=next(modifier_gen),
                             scm_url='https://github.com/jlaska/ansible-playbooks.git',
                             scm_type='git',
                             playbook_files=[