From f30b54dae1ed7374c4c8347e7e086e2b8149535b Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Mon, 21 Oct 2024 14:00:56 -0400 Subject: [PATCH] Rebuild migrations --- ...n_policy.py => 0195_interface_vlan_translation_policy.py} | 4 ++-- netbox/ipam/forms/filtersets.py | 5 +++++ ....py => 0074_vlantranslationpolicy_vlantranslationrule.py} | 2 +- ...policy.py => 0042_vminterface_vlan_translation_policy.py} | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) rename netbox/dcim/migrations/{0194_interface_vlan_translation_policy.py => 0195_interface_vlan_translation_policy.py} (80%) rename netbox/ipam/migrations/{0073_vlantranslationpolicy_vlantranslationrule.py => 0074_vlantranslationpolicy_vlantranslationrule.py} (98%) rename netbox/virtualization/migrations/{0041_vminterface_vlan_translation_policy.py => 0042_vminterface_vlan_translation_policy.py} (79%) diff --git a/netbox/dcim/migrations/0194_interface_vlan_translation_policy.py b/netbox/dcim/migrations/0195_interface_vlan_translation_policy.py similarity index 80% rename from netbox/dcim/migrations/0194_interface_vlan_translation_policy.py rename to netbox/dcim/migrations/0195_interface_vlan_translation_policy.py index f5a18d2d9..42ff1205a 100644 --- a/netbox/dcim/migrations/0194_interface_vlan_translation_policy.py +++ b/netbox/dcim/migrations/0195_interface_vlan_translation_policy.py @@ -7,8 +7,8 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('dcim', '0193_poweroutlet_color'), - ('ipam', '0073_vlantranslationpolicy_vlantranslationrule'), + ('dcim', '0194_charfield_null_choices'), + ('ipam', '0074_vlantranslationpolicy_vlantranslationrule'), ] operations = [ diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index 255236a21..e44cb918e 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -487,6 +487,11 @@ class VLANTranslationRuleFilterForm(NetBoxModelFilterSetForm): FieldSet('policy', 'local_vid', 'remote_vid', name=_('Attributes')), ) tag = TagFilterField(model) + policy = DynamicModelMultipleChoiceField( + queryset=VLANTranslationPolicy.objects.all(), + required=False, + label=_('VLAN Translation Policy') + ) class VLANFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): diff --git a/netbox/ipam/migrations/0073_vlantranslationpolicy_vlantranslationrule.py b/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py similarity index 98% rename from netbox/ipam/migrations/0073_vlantranslationpolicy_vlantranslationrule.py rename to netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py index 25114ca5b..4b35ea9e7 100644 --- a/netbox/ipam/migrations/0073_vlantranslationpolicy_vlantranslationrule.py +++ b/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py @@ -11,7 +11,7 @@ class Migration(migrations.Migration): dependencies = [ ('extras', '0121_customfield_related_object_filter'), - ('ipam', '0072_prefix_cached_relations'), + ('ipam', '0073_charfield_null_choices'), ] operations = [ diff --git a/netbox/virtualization/migrations/0041_vminterface_vlan_translation_policy.py b/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py similarity index 79% rename from netbox/virtualization/migrations/0041_vminterface_vlan_translation_policy.py rename to netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py index 6e03f4aa6..e0992c9c8 100644 --- a/netbox/virtualization/migrations/0041_vminterface_vlan_translation_policy.py +++ b/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py @@ -7,8 +7,8 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('ipam', '0073_vlantranslationpolicy_vlantranslationrule'), - ('virtualization', '0040_convert_disk_size'), + ('ipam', '0074_vlantranslationpolicy_vlantranslationrule'), + ('virtualization', '0041_charfield_null_choices'), ] operations = [