mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-16 12:12:53 -06:00
Fixes #17676: Fix support for module bay creation when bulk importing module types
This commit is contained in:
parent
02f51bc11b
commit
00f18de35b
@ -159,7 +159,7 @@ class ModuleBayTemplateImportForm(forms.ModelForm):
|
|||||||
class Meta:
|
class Meta:
|
||||||
model = ModuleBayTemplate
|
model = ModuleBayTemplate
|
||||||
fields = [
|
fields = [
|
||||||
'device_type', 'name', 'label', 'position', 'description',
|
'device_type', 'module_type', 'name', 'label', 'position', 'description',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@ -1205,6 +1205,13 @@ front-ports:
|
|||||||
- name: Front Port 3
|
- name: Front Port 3
|
||||||
type: 8p8c
|
type: 8p8c
|
||||||
rear_port: Rear Port 3
|
rear_port: Rear Port 3
|
||||||
|
module-bays:
|
||||||
|
- name: Module Bay 1
|
||||||
|
position: 1
|
||||||
|
- name: Module Bay 2
|
||||||
|
position: 2
|
||||||
|
- name: Module Bay 3
|
||||||
|
position: 3
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Create the manufacturer
|
# Create the manufacturer
|
||||||
@ -1222,6 +1229,7 @@ front-ports:
|
|||||||
'dcim.add_interfacetemplate',
|
'dcim.add_interfacetemplate',
|
||||||
'dcim.add_frontporttemplate',
|
'dcim.add_frontporttemplate',
|
||||||
'dcim.add_rearporttemplate',
|
'dcim.add_rearporttemplate',
|
||||||
|
'dcim.add_modulebaytemplate',
|
||||||
)
|
)
|
||||||
|
|
||||||
form_data = {
|
form_data = {
|
||||||
@ -1276,6 +1284,11 @@ front-ports:
|
|||||||
self.assertEqual(fp1.rear_port, rp1)
|
self.assertEqual(fp1.rear_port, rp1)
|
||||||
self.assertEqual(fp1.rear_port_position, 1)
|
self.assertEqual(fp1.rear_port_position, 1)
|
||||||
|
|
||||||
|
self.assertEqual(module_type.modulebaytemplates.count(), 3)
|
||||||
|
mb1 = ModuleBayTemplate.objects.first()
|
||||||
|
self.assertEqual(mb1.name, 'Module Bay 1')
|
||||||
|
self.assertEqual(mb1.position, '1')
|
||||||
|
|
||||||
def test_export_objects(self):
|
def test_export_objects(self):
|
||||||
url = reverse('dcim:moduletype_list')
|
url = reverse('dcim:moduletype_list')
|
||||||
self.add_permissions('dcim.view_moduletype')
|
self.add_permissions('dcim.view_moduletype')
|
||||||
|
@ -1508,6 +1508,7 @@ class ModuleTypeImportView(generic.BulkImportView):
|
|||||||
'dcim.add_interfacetemplate',
|
'dcim.add_interfacetemplate',
|
||||||
'dcim.add_frontporttemplate',
|
'dcim.add_frontporttemplate',
|
||||||
'dcim.add_rearporttemplate',
|
'dcim.add_rearporttemplate',
|
||||||
|
'dcim.add_modulebaytemplate',
|
||||||
]
|
]
|
||||||
queryset = ModuleType.objects.all()
|
queryset = ModuleType.objects.all()
|
||||||
model_form = forms.ModuleTypeImportForm
|
model_form = forms.ModuleTypeImportForm
|
||||||
@ -1519,6 +1520,7 @@ class ModuleTypeImportView(generic.BulkImportView):
|
|||||||
'interfaces': forms.InterfaceTemplateImportForm,
|
'interfaces': forms.InterfaceTemplateImportForm,
|
||||||
'rear-ports': forms.RearPortTemplateImportForm,
|
'rear-ports': forms.RearPortTemplateImportForm,
|
||||||
'front-ports': forms.FrontPortTemplateImportForm,
|
'front-ports': forms.FrontPortTemplateImportForm,
|
||||||
|
'module-bays': forms.ModuleBayTemplateImportForm,
|
||||||
}
|
}
|
||||||
|
|
||||||
def prep_related_object_data(self, parent, data):
|
def prep_related_object_data(self, parent, data):
|
||||||
|
Loading…
Reference in New Issue
Block a user