From 94dd07e1e64d3f19eb15eaf30575b82bfe2cc62a Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 15 Nov 2022 08:34:14 -0500 Subject: [PATCH] #10560: Build search index as part of migration --- .../migrations/0166_virtualdevicecontext.py | 2 +- ...es.py => 0080_customlink_content_types.py} | 2 +- ...y => 0081_exporttemplate_content_types.py} | 2 +- ...083_savedfilter.py => 0082_savedfilter.py} | 2 +- .../{0080_search.py => 0083_search.py} | 25 ++++++++++++++++--- netbox/extras/migrations/0084_staging.py | 2 +- 6 files changed, 27 insertions(+), 8 deletions(-) rename netbox/extras/migrations/{0081_customlink_content_types.py => 0080_customlink_content_types.py} (94%) rename netbox/extras/migrations/{0082_exporttemplate_content_types.py => 0081_exporttemplate_content_types.py} (95%) rename netbox/extras/migrations/{0083_savedfilter.py => 0082_savedfilter.py} (96%) rename netbox/extras/migrations/{0080_search.py => 0083_search.py} (64%) diff --git a/netbox/dcim/migrations/0166_virtualdevicecontext.py b/netbox/dcim/migrations/0166_virtualdevicecontext.py index 5c95e1177..05becbdc6 100644 --- a/netbox/dcim/migrations/0166_virtualdevicecontext.py +++ b/netbox/dcim/migrations/0166_virtualdevicecontext.py @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ ('ipam', '0063_standardize_description_comments'), - ('extras', '0083_savedfilter'), + ('extras', '0082_savedfilter'), ('tenancy', '0009_standardize_description_comments'), ('dcim', '0165_standardize_description_comments'), ] diff --git a/netbox/extras/migrations/0081_customlink_content_types.py b/netbox/extras/migrations/0080_customlink_content_types.py similarity index 94% rename from netbox/extras/migrations/0081_customlink_content_types.py rename to netbox/extras/migrations/0080_customlink_content_types.py index 2f0f23509..91fe453c3 100644 --- a/netbox/extras/migrations/0081_customlink_content_types.py +++ b/netbox/extras/migrations/0080_customlink_content_types.py @@ -12,7 +12,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), - ('extras', '0080_search'), + ('extras', '0079_jobresult_scheduled_time'), ] operations = [ diff --git a/netbox/extras/migrations/0082_exporttemplate_content_types.py b/netbox/extras/migrations/0081_exporttemplate_content_types.py similarity index 95% rename from netbox/extras/migrations/0082_exporttemplate_content_types.py rename to netbox/extras/migrations/0081_exporttemplate_content_types.py index 34a9c77e6..afa21c5b8 100644 --- a/netbox/extras/migrations/0082_exporttemplate_content_types.py +++ b/netbox/extras/migrations/0081_exporttemplate_content_types.py @@ -12,7 +12,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), - ('extras', '0081_customlink_content_types'), + ('extras', '0080_customlink_content_types'), ] operations = [ diff --git a/netbox/extras/migrations/0083_savedfilter.py b/netbox/extras/migrations/0082_savedfilter.py similarity index 96% rename from netbox/extras/migrations/0083_savedfilter.py rename to netbox/extras/migrations/0082_savedfilter.py index 6bae7ccde..67ccc325f 100644 --- a/netbox/extras/migrations/0083_savedfilter.py +++ b/netbox/extras/migrations/0082_savedfilter.py @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('contenttypes', '0002_remove_content_type_name'), - ('extras', '0082_exporttemplate_content_types'), + ('extras', '0081_exporttemplate_content_types'), ] operations = [ diff --git a/netbox/extras/migrations/0080_search.py b/netbox/extras/migrations/0083_search.py similarity index 64% rename from netbox/extras/migrations/0080_search.py rename to netbox/extras/migrations/0083_search.py index 7a133e84b..64118a05e 100644 --- a/netbox/extras/migrations/0080_search.py +++ b/netbox/extras/migrations/0083_search.py @@ -1,13 +1,28 @@ -from django.db import migrations, models -import django.db.models.deletion +import sys import uuid +import django.db.models.deletion +from django.core import management +from django.db import migrations, models + + +def reindex(apps, schema_editor): + # Build the search index (except during tests) + if 'test' not in sys.argv: + management.call_command('reindex') + class Migration(migrations.Migration): dependencies = [ + ('circuits', '0041_standardize_description_comments'), ('contenttypes', '0002_remove_content_type_name'), - ('extras', '0079_jobresult_scheduled_time'), + ('dcim', '0166_virtualdevicecontext'), + ('extras', '0082_savedfilter'), + ('ipam', '0063_standardize_description_comments'), + ('tenancy', '0009_standardize_description_comments'), + ('virtualization', '0034_standardize_description_comments'), + ('wireless', '0008_wirelesslan_status'), ] operations = [ @@ -32,4 +47,8 @@ class Migration(migrations.Migration): 'ordering': ('weight', 'object_type', 'object_id'), }, ), + migrations.RunPython( + code=reindex, + reverse_code=migrations.RunPython.noop + ), ] diff --git a/netbox/extras/migrations/0084_staging.py b/netbox/extras/migrations/0084_staging.py index 25c3f164f..3129d7f5b 100644 --- a/netbox/extras/migrations/0084_staging.py +++ b/netbox/extras/migrations/0084_staging.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('extras', '0083_savedfilter'), + ('extras', '0083_search'), ] operations = [