diff --git a/netbox/dcim/migrations/0164_devicetype_vdc_type_virtualdevicecontext_and_more.py b/netbox/dcim/migrations/0164_devicetype_vdc_type_virtualdevicecontext_and_more.py new file mode 100644 index 000000000..cd4762e43 --- /dev/null +++ b/netbox/dcim/migrations/0164_devicetype_vdc_type_virtualdevicecontext_and_more.py @@ -0,0 +1,59 @@ +# Generated by Django 4.1.1 on 2022-10-28 16:56 + +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion +import taggit.managers +import utilities.json + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0078_unique_constraints'), + ('ipam', '0062_unique_constraints'), + ('tenancy', '0008_unique_constraints'), + ('dcim', '0163_rack_devicetype_moduletype_weights'), + ] + + operations = [ + migrations.AddField( + model_name='devicetype', + name='vdc_type', + field=models.CharField(blank=True, max_length=50), + ), + migrations.CreateModel( + name='VirtualDeviceContext', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), + ('created', models.DateTimeField(auto_now_add=True, null=True)), + ('last_updated', models.DateTimeField(auto_now=True, null=True)), + ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder)), + ('name', models.CharField(max_length=64)), + ('status', models.CharField(blank=True, max_length=50)), + ('identifier', models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MaxValueValidator(255)])), + ('comments', models.TextField(blank=True)), + ('device', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vdcs', to='dcim.device')), + ('primary_ip4', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress')), + ('primary_ip6', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress')), + ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), + ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vdcs', to='tenancy.tenant')), + ], + options={ + 'ordering': ['name'], + }, + ), + migrations.AddField( + model_name='interface', + name='vdc', + field=models.ManyToManyField(related_name='interfaces', to='dcim.virtualdevicecontext'), + ), + migrations.AddConstraint( + model_name='virtualdevicecontext', + constraint=models.UniqueConstraint(fields=('device', 'identifier'), name='dcim_virtualdevicecontext_device_identifiers', violation_error_message='A VDC with this identifier already exists on this device.'), + ), + migrations.AddConstraint( + model_name='virtualdevicecontext', + constraint=models.UniqueConstraint(fields=('device', 'name'), name='dcim_virtualdevicecontext_name', violation_error_message='A VDC with this name already exists on this device.'), + ), + ] diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 0301c5d81..942a66e6e 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -190,12 +190,7 @@ urlpatterns = [ path('vdcs/edit/', views.VirtualDeviceContextBulkEditView.as_view(), name='virtualdevicecontext_bulk_edit'), path('vdcs/rename/', views.VirtualDeviceContextBulkRenameView.as_view(), name='virtualdevicecontext_bulk_rename'), path('vdcs/delete/', views.VirtualDeviceContextBulkDeleteView.as_view(), name='virtualdevicecontext_bulk_delete'), - path('vdcs//', views.VirtualDeviceContextView.as_view(), name='virtualdevicecontext'), - path('vdcs//edit/', views.VirtualDeviceContextEditView.as_view(), name='virtualdevicecontext_edit'), - path('vdcs//delete/', views.VirtualDeviceContextDeleteView.as_view(), name='virtualdevicecontext_delete'), - path('vdcs//interfaces/', views.VirtualDeviceContextInterfacesView.as_view(), name='virtualdevicecontext_interfaces'), - path('vdcs//changelog/', ObjectChangeLogView.as_view(), name='virtualdevicecontext_changelog', kwargs={'model': VirtualDeviceContext}), - path('vdcs//journal/', ObjectJournalView.as_view(), name='virtualdevicecontext_journal', kwargs={'model': VirtualDeviceContext}), + path('vdcs//', include(get_model_urls('dcim', 'virtualdevicecontext'))), # Modules path('modules/', views.ModuleListView.as_view(), name='module_list'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 8f6145ba8..4fc2c2f1c 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -3571,6 +3571,7 @@ class VirtualDeviceContextListView(generic.ObjectListView): table = tables.VirtualDeviceContextTable +@register_model_view(VirtualDeviceContext) class VirtualDeviceContextView(generic.ObjectView): queryset = VirtualDeviceContext.objects.all() @@ -3584,11 +3585,13 @@ class VirtualDeviceContextView(generic.ObjectView): } +@register_model_view(VirtualDeviceContext, 'edit') class VirtualDeviceContextEditView(generic.ObjectEditView): queryset = VirtualDeviceContext.objects.all() form = forms.VirtualDeviceContextForm +@register_model_view(VirtualDeviceContext, 'delete') class VirtualDeviceContextDeleteView(generic.ObjectDeleteView): queryset = VirtualDeviceContext.objects.all() @@ -3610,17 +3613,8 @@ class VirtualDeviceContextBulkEditView(generic.BulkEditView): form = forms.VirtualDeviceContextBulkEditForm + class VirtualDeviceContextBulkDeleteView(generic.BulkDeleteView): queryset = VirtualDeviceContext.objects.all() filterset = filtersets.VirtualDeviceContextFilterSet table = tables.VirtualDeviceContextTable - - -class VirtualDeviceContextInterfacesView(DeviceComponentsView): - queryset = VirtualDeviceContext.objects.all() - child_model = Interface - table = tables.DeviceInterfaceTable - filterset = filtersets.InterfaceFilterSet - - def get_children(self, request, parent): - return self.child_model.objects.restrict(request.user, 'view').filter(vdcs=parent)