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

12118 fix instantiting device template with parent-child relations

Browse Source
This commit is contained in:
Arthur 2023-04-04 09:46:16 -07:00
parent b032742418
commit b4622bfd1a
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/dcim/models/device_component_templates.py
View File

@ -638,13 +638,20 @@ class InventoryItemTemplate(MPTTModel, ComponentTemplateModel):
) )
def instantiate(self, **kwargs): def instantiate(self, **kwargs):
# if instance_map this means this is instantiating from a template, so need to map
# parent pointers to their previously instanced object and not the template one
instance_map = kwargs.pop('instance_map', None)
if self.parent and instance_map and self.parent.name in instance_map:
parent = instance_map[self.parent.name]
else:
parent = InventoryItem.objects.get(name=self.parent.name, **kwargs) if self.parent else None parent = InventoryItem.objects.get(name=self.parent.name, **kwargs) if self.parent else None
if self.component: if self.component:
model = self.component.component_model model = self.component.component_model
component = model.objects.get(name=self.component.name, **kwargs) component = model.objects.get(name=self.component.name, **kwargs)
else: else:
component = None component = None
return self.component_model( obj = self.component_model(
parent=parent, parent=parent,
name=self.name, name=self.name,
label=self.label, label=self.label,
@ -654,3 +661,7 @@ class InventoryItemTemplate(MPTTModel, ComponentTemplateModel):
part_id=self.part_id, part_id=self.part_id,
**kwargs **kwargs
) )
if instance_map is not None:
instance_map[self.name] = obj
return obj

12
netbox/dcim/models/devices.py
View File

@ -766,15 +766,21 @@ class Device(PrimaryModel, ConfigContextModel):
'vc_position': "A device assigned to a virtual chassis must have its position defined." 'vc_position': "A device assigned to a virtual chassis must have its position defined."
}) })
def _instantiate_components(self, queryset, bulk_create=True): def _instantiate_components(self, queryset, bulk_create=True, from_template=False):
""" """
Instantiate components for the device from the specified component templates. Instantiate components for the device from the specified component templates.
Args: Args:
bulk_create: If True, bulk_create() will be called to create all components in a single query bulk_create: If True, bulk_create() will be called to create all components in a single query
(default). Otherwise, save() will be called on each instance individually. (default). Otherwise, save() will be called on each instance individually.
from_template: If True will create an instance map to map parent-child template ids
to the newly created instances.
""" """
components = [obj.instantiate(device=self) for obj in queryset] instance_map = None
if from_template:
instance_map = {}
components = [obj.instantiate(device=self, instance_map=instance_map) for obj in queryset]
if components and bulk_create: if components and bulk_create:
model = components[0]._meta.model model = components[0]._meta.model
model.objects.bulk_create(components) model.objects.bulk_create(components)
@ -816,7 +822,7 @@ class Device(PrimaryModel, ConfigContextModel):
self._instantiate_components(self.device_type.modulebaytemplates.all()) self._instantiate_components(self.device_type.modulebaytemplates.all())
self._instantiate_components(self.device_type.devicebaytemplates.all()) self._instantiate_components(self.device_type.devicebaytemplates.all())
# Disable bulk_create to accommodate MPTT # Disable bulk_create to accommodate MPTT
self._instantiate_components(self.device_type.inventoryitemtemplates.all(), bulk_create=False) self._instantiate_components(self.device_type.inventoryitemtemplates.all(), bulk_create=False, from_template=True)
# Update Site and Rack assignment for any child Devices # Update Site and Rack assignment for any child Devices
devices = Device.objects.filter(parent_bay__device=self) devices = Device.objects.filter(parent_bay__device=self)