NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Update reverting kwarg; allow pop() to fail

Browse Source
This commit is contained in:
Jeremy Stretch 2025-06-02 09:45:44 -04:00
parent 354c5dc1c5
commit 5a0d33a4a8
8 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/circuits/migrations/0047_circuittermination__termination.py
View File

@ -52,7 +52,7 @@ class Migration(migrations.Migration):
] ]
def oc_circuittermination_termination(objectchange, revert): def oc_circuittermination_termination(objectchange, reverting):
site_ct = ContentType.objects.get_by_natural_key('dcim', 'site').pk site_ct = ContentType.objects.get_by_natural_key('dcim', 'site').pk
provider_network_ct = ContentType.objects.get_by_natural_key('circuits', 'providernetwork').pk provider_network_ct = ContentType.objects.get_by_natural_key('circuits', 'providernetwork').pk
for data in (objectchange.prechange_data, objectchange.postchange_data): for data in (objectchange.prechange_data, objectchange.postchange_data):
@ -68,8 +68,8 @@ def oc_circuittermination_termination(objectchange, revert):
'termination_type': provider_network_ct, 'termination_type': provider_network_ct,
'termination_id': provider_network_id, 'termination_id': provider_network_id,
}) })
data.pop('site') data.pop('site', None)
data.pop('provider_network') data.pop('provider_network', None)
objectchange_migrators = { objectchange_migrators = {

4
netbox/circuits/migrations/0051_virtualcircuit_group_assignment.py
View File

@ -85,7 +85,7 @@ class Migration(migrations.Migration):
] ]
def oc_circuitgroupassignment_member(objectchange, revert): def oc_circuitgroupassignment_member(objectchange, reverting):
circuit_ct = ContentType.objects.get_by_natural_key('circuits', 'circuit').pk circuit_ct = ContentType.objects.get_by_natural_key('circuits', 'circuit').pk
for data in (objectchange.prechange_data, objectchange.postchange_data): for data in (objectchange.prechange_data, objectchange.postchange_data):
if data is None: if data is None:
@ -95,7 +95,7 @@ def oc_circuitgroupassignment_member(objectchange, revert):
'member_type': circuit_ct, 'member_type': circuit_ct,
'member_id': circuit_id, 'member_id': circuit_id,
}) })
data.pop('circuit') data.pop('circuit', None)
objectchange_migrators = { objectchange_migrators = {

9
netbox/dcim/migrations/0200_populate_mac_addresses.py
View File

@ -55,11 +55,12 @@ class Migration(migrations.Migration):
] ]
def oc_interface_primary_mac_address(objectchange, revert): def oc_interface_primary_mac_address(objectchange, reverting):
MACAddress = apps.get_model('dcim', 'MACAddress') MACAddress = apps.get_model('dcim', 'MACAddress')
interface_ct = ContentType.objects.get_by_natural_key('dcim', 'interface') interface_ct = ContentType.objects.get_by_natural_key('dcim', 'interface')
if not revert: # Swap data order if the change is being reverted
if not reverting:
before, after = objectchange.prechange_data, objectchange.postchange_data before, after = objectchange.prechange_data, objectchange.postchange_data
else: else:
before, after = objectchange.postchange_data, objectchange.prechange_data before, after = objectchange.postchange_data, objectchange.prechange_data
@ -84,8 +85,8 @@ def oc_interface_primary_mac_address(objectchange, revert):
).delete() ).delete()
before['primary_mac_address'] = None before['primary_mac_address'] = None
before.pop('mac_address') before.pop('mac_address', None)
after.pop('mac_address') after.pop('mac_address', None)
objectchange_migrators = { objectchange_migrators = {

4
netbox/ipam/migrations/0071_prefix_scope.py
View File

@ -47,7 +47,7 @@ class Migration(migrations.Migration):
] ]
def oc_prefix_scope(objectchange, revert): def oc_prefix_scope(objectchange, reverting):
site_ct = ContentType.objects.get_by_natural_key('dcim', 'site').pk site_ct = ContentType.objects.get_by_natural_key('dcim', 'site').pk
for data in (objectchange.prechange_data, objectchange.postchange_data): for data in (objectchange.prechange_data, objectchange.postchange_data):
if data is None: if data is None:
@ -57,7 +57,7 @@ def oc_prefix_scope(objectchange, revert):
'scope_type': site_ct, 'scope_type': site_ct,
'scope_id': site_id, 'scope_id': site_id,
}) })
data.pop('site') data.pop('site', None)
objectchange_migrators = { objectchange_migrators = {

6
netbox/ipam/migrations/0080_populate_service_parent.py
View File

@ -57,7 +57,7 @@ class Migration(migrations.Migration):
] ]
def oc_service_parent(objectchange, revert): def oc_service_parent(objectchange, reverting):
device_ct = ContentType.objects.get_by_natural_key('dcim', 'device').pk device_ct = ContentType.objects.get_by_natural_key('dcim', 'device').pk
virtual_machine_ct = ContentType.objects.get_by_natural_key('virtualization', 'virtualmachine').pk virtual_machine_ct = ContentType.objects.get_by_natural_key('virtualization', 'virtualmachine').pk
for data in (objectchange.prechange_data, objectchange.postchange_data): for data in (objectchange.prechange_data, objectchange.postchange_data):
@ -73,8 +73,8 @@ def oc_service_parent(objectchange, revert):
'parent_object_type': virtual_machine_ct, 'parent_object_type': virtual_machine_ct,
'parent_object_id': virtual_machine_id, 'parent_object_id': virtual_machine_id,
}) })
data.pop('device') data.pop('device', None)
data.pop('virtual_machine') data.pop('virtual_machine', None)
objectchange_migrators = { objectchange_migrators = {

8
netbox/tenancy/migrations/0018_contact_groups.py
View File

@ -68,13 +68,13 @@ class Migration(migrations.Migration):
] ]
def oc_contact_groups(objectchange, revert): def oc_contact_groups(objectchange, reverting):
for data in (objectchange.prechange_data, objectchange.postchange_data): for data in (objectchange.prechange_data, objectchange.postchange_data):
if data is None: if data is None:
continue continue
if 'group' in data: # Set the M2M field `groups` to a list containing the group ID
data['groups'] = [data['group']] if data['group'] else [] data['groups'] = [data['group']] if data.get('group') else []
data.pop('group') data.pop('group', None)
objectchange_migrators = { objectchange_migrators = {

4
netbox/virtualization/migrations/0044_cluster_scope.py
View File

@ -46,7 +46,7 @@ class Migration(migrations.Migration):
] ]
def oc_cluster_scope(objectchange, revert): def oc_cluster_scope(objectchange, reverting):
site_ct = ContentType.objects.get_by_natural_key('dcim', 'site').pk site_ct = ContentType.objects.get_by_natural_key('dcim', 'site').pk
for data in (objectchange.prechange_data, objectchange.postchange_data): for data in (objectchange.prechange_data, objectchange.postchange_data):
if data is None: if data is None:
@ -56,7 +56,7 @@ def oc_cluster_scope(objectchange, revert):
'scope_type': site_ct, 'scope_type': site_ct,
'scope_id': site_id, 'scope_id': site_id,
}) })
data.pop('site') data.pop('site', None)
objectchange_migrators = { objectchange_migrators = {

9
netbox/virtualization/migrations/0048_populate_mac_addresses.py
View File

@ -54,11 +54,12 @@ class Migration(migrations.Migration):
] ]
def oc_vminterface_primary_mac_address(objectchange, revert): def oc_vminterface_primary_mac_address(objectchange, reverting):
MACAddress = apps.get_model('dcim', 'MACAddress') MACAddress = apps.get_model('dcim', 'MACAddress')
vminterface_ct = ContentType.objects.get_by_natural_key('virtualization', 'vminterface') vminterface_ct = ContentType.objects.get_by_natural_key('virtualization', 'vminterface')
if not revert: # Swap data order if the change is being reverted
if not reverting:
before, after = objectchange.prechange_data, objectchange.postchange_data before, after = objectchange.prechange_data, objectchange.postchange_data
else: else:
before, after = objectchange.postchange_data, objectchange.prechange_data before, after = objectchange.postchange_data, objectchange.prechange_data
@ -83,8 +84,8 @@ def oc_vminterface_primary_mac_address(objectchange, revert):
).delete() ).delete()
before['primary_mac_address'] = None before['primary_mac_address'] = None
before.pop('mac_address') before.pop('mac_address', None)
after.pop('mac_address') after.pop('mac_address', None)
objectchange_migrators = { objectchange_migrators = {