From b90829197ec894c9c7481c7dab23ba727b809e65 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 22 Oct 2024 11:46:36 -0400 Subject: [PATCH] Revert "Make VLANTranslationRule.policy nullable (but still required)" This reverts commit 4c1bb437ef1a0a3593e5fbb87f08a0f158ea8c47. --- netbox/ipam/graphql/types.py | 2 +- .../0074_vlantranslationpolicy_vlantranslationrule.py | 2 +- netbox/ipam/models/vlans.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/netbox/ipam/graphql/types.py b/netbox/ipam/graphql/types.py index 9b3becc17..0563683f1 100644 --- a/netbox/ipam/graphql/types.py +++ b/netbox/ipam/graphql/types.py @@ -291,7 +291,7 @@ class VLANTranslationPolicyType(NetBoxObjectType): filters=VLANTranslationRuleFilter ) class VLANTranslationRuleType(NetBoxObjectType): - policy: Annotated["VLANTranslationPolicyType", strawberry.lazy('ipam.graphql.types')] | None + policy: Annotated["VLANTranslationPolicyType", strawberry.lazy('ipam.graphql.types')] @strawberry_django.type( diff --git a/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py b/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py index d791ed9a5..4b35ea9e7 100644 --- a/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py +++ b/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py @@ -42,7 +42,7 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder)), ('local_vid', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)])), ('remote_vid', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)])), - ('policy', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rules', to='ipam.vlantranslationpolicy')), + ('policy', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rules', to='ipam.vlantranslationpolicy')), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py index 3123b32be..56c7b7a81 100644 --- a/netbox/ipam/models/vlans.py +++ b/netbox/ipam/models/vlans.py @@ -297,8 +297,7 @@ class VLANTranslationRule(NetBoxModel): policy = models.ForeignKey( to=VLANTranslationPolicy, related_name='rules', - on_delete=models.SET_NULL, - null=True, + on_delete=models.CASCADE, ) local_vid = models.PositiveSmallIntegerField( verbose_name=_('Local VLAN ID'),