From 0943f989cee71de3adf80329edb63d3acd99ef49 Mon Sep 17 00:00:00 2001 From: Kia Lam Date: Fri, 22 Feb 2019 11:59:18 -0500 Subject: [PATCH 1/2] Fix various errors when trying to run `make bulk_data`. - Properly import PrimoridialModel. - Use floor division operator for range() method to avoid float vs int errors. --- tools/data_generators/rbac_dummy_data_generator.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/data_generators/rbac_dummy_data_generator.py b/tools/data_generators/rbac_dummy_data_generator.py index 31cea72955..1e8ecf0bcf 100755 --- a/tools/data_generators/rbac_dummy_data_generator.py +++ b/tools/data_generators/rbac_dummy_data_generator.py @@ -40,10 +40,13 @@ from django.db import transaction # noqa # awx from awx.main.models import ( # noqa Credential, CredentialType, Group, Host, Inventory, Job, JobEvent, - JobHostSummary, JobTemplate, Label, Organization, PrimordialModel, Project, + JobHostSummary, JobTemplate, Label, Organization, Project, Team, User, WorkflowJobTemplate, WorkflowJobTemplateNode, batch_role_ancestor_rebuilding, ) + +from awx.main.models.base import PrimordialModel + from awx.main.signals import ( # noqa disable_activity_stream, disable_computed_fields @@ -695,7 +698,7 @@ def make_the_data(): continue # Bulk create in chunks with maximum chunk size MAX_BULK_CREATE = 100 - for j in range((n / MAX_BULK_CREATE) + 1): + for j in range((n // MAX_BULK_CREATE) + 1): n_subgroup = MAX_BULK_CREATE if j == n / MAX_BULK_CREATE: # on final pass, create the remainder From d2c345a374b151addd5c36236a2be4584d569f94 Mon Sep 17 00:00:00 2001 From: Kia Lam Date: Fri, 22 Feb 2019 13:06:20 -0500 Subject: [PATCH 2/2] Fix API lint error. --- awx/main/models/__init__.py | 2 +- tools/data_generators/rbac_dummy_data_generator.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/awx/main/models/__init__.py b/awx/main/models/__init__.py index b1912cdf14..848db3b593 100644 --- a/awx/main/models/__init__.py +++ b/awx/main/models/__init__.py @@ -7,7 +7,7 @@ from django.db.models.signals import pre_delete # noqa # AWX from awx.main.models.base import ( # noqa - BaseModel, prevent_search, CLOUD_INVENTORY_SOURCES, VERBOSITY_CHOICES + BaseModel, PrimordialModel, prevent_search, CLOUD_INVENTORY_SOURCES, VERBOSITY_CHOICES ) from awx.main.models.unified_jobs import ( # noqa UnifiedJob, UnifiedJobTemplate, StdoutMaxBytesExceeded diff --git a/tools/data_generators/rbac_dummy_data_generator.py b/tools/data_generators/rbac_dummy_data_generator.py index 1e8ecf0bcf..4b92a4c0e2 100755 --- a/tools/data_generators/rbac_dummy_data_generator.py +++ b/tools/data_generators/rbac_dummy_data_generator.py @@ -40,13 +40,11 @@ from django.db import transaction # noqa # awx from awx.main.models import ( # noqa Credential, CredentialType, Group, Host, Inventory, Job, JobEvent, - JobHostSummary, JobTemplate, Label, Organization, Project, + JobHostSummary, JobTemplate, Label, Organization, PrimordialModel, Project, Team, User, WorkflowJobTemplate, WorkflowJobTemplateNode, batch_role_ancestor_rebuilding, ) -from awx.main.models.base import PrimordialModel - from awx.main.signals import ( # noqa disable_activity_stream, disable_computed_fields