cleanup from accessible_objects refactor

This commit is contained in:
AlanCoding
2017-01-21 12:45:40 -05:00
parent b2d0871a5e
commit 36c68178dd
4 changed files with 35 additions and 36 deletions

View File

@@ -1,15 +1,15 @@
resource medium jan2017
organizations 500 1
users 5000 3
teams 500 2
projects 1000 30
job-templates 2000 127
credentials 2000 50
inventories 2000 6
inventory-groups 500 15
inventory-hosts 2500 15
wfjts 100 0
nodes 1000 0
labels 1000 0
jobs 1000 157208
job-events 1000 3370942
resource medium Jan2017 jobs1k jobs10k
organizations 500 1 1 1
users 5000 3 3 3
teams 500 2 2 2
projects 1000 30 30 30
job_templates 2000 127 127 127
credentials 2000 50 50 50
inventories 2000 6 6 6
inventory_groups 500 15 15 15
inventory_hosts 2500 15 15 15
wfjts 100 0 0 0
nodes 1000 0 0 0
labels 1000 0 0 0
jobs 1000 157208 1000 10000
job_events 1000 3370942 20000 200000
1 resource medium jan2017 Jan2017 jobs1k jobs10k
2 organizations 500 1 1 1
3 users 5000 3 3 3
4 teams 500 2 2 2
5 projects 1000 30 30 30
6 job-templates job_templates 2000 127 127 127
7 credentials 2000 50 50 50
8 inventories 2000 6 6 6
9 inventory-groups inventory_groups 500 15 15 15
10 inventory-hosts inventory_hosts 2500 15 15 15
11 wfjts 100 0 0 0
12 nodes 1000 0 0 0
13 labels 1000 0 0 0
14 jobs 1000 157208 1000 10000
15 job-events job_events 1000 3370942 20000 200000

View File

@@ -490,7 +490,8 @@ try:
if project_idx == 0 and i == 0:
job_template.admin_role.members.add(jt_admin)
project_idx += 1
print('')
if n > 0:
print('')
print('# Creating %d Workflow Job Templates' % n_wfjts)
org_idx = 0
@@ -511,7 +512,8 @@ try:
wfjt._is_new = _
wfjts.append(wfjt)
org_idx += 1
print('')
if n:
print('')
print('# Creating %d Workflow Job Template nodes' % n_nodes)
wfjt_idx = 0
@@ -561,7 +563,8 @@ try:
parent_node.success_nodes.add(node)
parent_idx = (parent_idx + 7) % len(wfjt_nodes)
wfjt_idx += 1
print('')
if n:
print('')
print('# Creating %d Labels' % n_labels)
org_idx = 0
@@ -580,7 +583,8 @@ try:
)
labels.append(label)
org_idx += 1
print('')
if n:
print('')
label_gen = yield_choice(labels)
print('# Adding labels to job templates')
@@ -636,10 +640,9 @@ try:
jobs.append(job)
job_i += 1
if not job._is_new:
job_template_idx += 1
group_idx += 1
continue
if i+1 == n:
if i + 1 == n:
job_template.last_job = job
if job_template.pk % 5 == 0:
job_template.current_job = job
@@ -689,3 +692,5 @@ try:
except Rollback:
print('Rolled back changes')
pass
print('')