Prechádzať zdrojové kódy

Update VMInterface view names

Jeremy Stretch 5 rokov pred
rodič
commit
99c72c78c1

+ 1 - 1
netbox/virtualization/api/urls.py

@@ -21,7 +21,7 @@ router.register('clusters', views.ClusterViewSet)
 
 
 # VirtualMachines
 # VirtualMachines
 router.register('virtual-machines', views.VirtualMachineViewSet)
 router.register('virtual-machines', views.VirtualMachineViewSet)
-router.register('interfaces', views.InterfaceViewSet)
+router.register('interfaces', views.VMInterfaceViewSet)
 
 
 app_name = 'virtualization-api'
 app_name = 'virtualization-api'
 urlpatterns = router.urls
 urlpatterns = router.urls

+ 1 - 1
netbox/virtualization/api/views.py

@@ -71,7 +71,7 @@ class VirtualMachineViewSet(CustomFieldModelViewSet):
         return serializers.VirtualMachineWithConfigContextSerializer
         return serializers.VirtualMachineWithConfigContextSerializer
 
 
 
 
-class InterfaceViewSet(ModelViewSet):
+class VMInterfaceViewSet(ModelViewSet):
     queryset = VMInterface.objects.filter(
     queryset = VMInterface.objects.filter(
         virtual_machine__isnull=False
         virtual_machine__isnull=False
     ).prefetch_related(
     ).prefetch_related(

+ 9 - 9
netbox/virtualization/urls.py

@@ -51,15 +51,15 @@ urlpatterns = [
     path('virtual-machines/<int:virtualmachine>/services/assign/', ServiceEditView.as_view(), name='virtualmachine_service_assign'),
     path('virtual-machines/<int:virtualmachine>/services/assign/', ServiceEditView.as_view(), name='virtualmachine_service_assign'),
 
 
     # VM interfaces
     # VM interfaces
-    path('interfaces/', views.InterfaceListView.as_view(), name='vminterface_list'),
-    path('interfaces/add/', views.InterfaceCreateView.as_view(), name='vminterface_add'),
-    path('interfaces/import/', views.InterfaceBulkImportView.as_view(), name='vminterface_import'),
-    path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'),
-    path('interfaces/rename/', views.InterfaceBulkRenameView.as_view(), name='vminterface_bulk_rename'),
-    path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'),
-    path('interfaces/<int:pk>/', views.InterfaceView.as_view(), name='vminterface'),
-    path('interfaces/<int:pk>/edit/', views.InterfaceEditView.as_view(), name='vminterface_edit'),
-    path('interfaces/<int:pk>/delete/', views.InterfaceDeleteView.as_view(), name='vminterface_delete'),
+    path('interfaces/', views.VMInterfaceListView.as_view(), name='vminterface_list'),
+    path('interfaces/add/', views.VMInterfaceCreateView.as_view(), name='vminterface_add'),
+    path('interfaces/import/', views.VMInterfaceBulkImportView.as_view(), name='vminterface_import'),
+    path('interfaces/edit/', views.VMInterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'),
+    path('interfaces/rename/', views.VMInterfaceBulkRenameView.as_view(), name='vminterface_bulk_rename'),
+    path('interfaces/delete/', views.VMInterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'),
+    path('interfaces/<int:pk>/', views.VMInterfaceView.as_view(), name='vminterface'),
+    path('interfaces/<int:pk>/edit/', views.VMInterfaceEditView.as_view(), name='vminterface_edit'),
+    path('interfaces/<int:pk>/delete/', views.VMInterfaceDeleteView.as_view(), name='vminterface_delete'),
     path('interfaces/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='vminterface_changelog', kwargs={'model': VMInterface}),
     path('interfaces/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='vminterface_changelog', kwargs={'model': VMInterface}),
     path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_vminterface'),
     path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_vminterface'),
 
 

+ 9 - 9
netbox/virtualization/views.py

@@ -289,7 +289,7 @@ class VirtualMachineBulkDeleteView(BulkDeleteView):
 # VM interfaces
 # VM interfaces
 #
 #
 
 
-class InterfaceListView(ObjectListView):
+class VMInterfaceListView(ObjectListView):
     queryset = VMInterface.objects.prefetch_related('virtual_machine')
     queryset = VMInterface.objects.prefetch_related('virtual_machine')
     filterset = filters.VMInterfaceFilterSet
     filterset = filters.VMInterfaceFilterSet
     filterset_form = forms.VMInterfaceFilterForm
     filterset_form = forms.VMInterfaceFilterForm
@@ -297,7 +297,7 @@ class InterfaceListView(ObjectListView):
     action_buttons = ('export',)
     action_buttons = ('export',)
 
 
 
 
-class InterfaceView(ObjectView):
+class VMInterfaceView(ObjectView):
     queryset = VMInterface.objects.all()
     queryset = VMInterface.objects.all()
 
 
     def get(self, request, pk):
     def get(self, request, pk):
@@ -332,42 +332,42 @@ class InterfaceView(ObjectView):
 
 
 
 
 # TODO: This should not use ComponentCreateView
 # TODO: This should not use ComponentCreateView
-class InterfaceCreateView(ComponentCreateView):
+class VMInterfaceCreateView(ComponentCreateView):
     queryset = VMInterface.objects.all()
     queryset = VMInterface.objects.all()
     form = forms.VMInterfaceCreateForm
     form = forms.VMInterfaceCreateForm
     model_form = forms.VMInterfaceForm
     model_form = forms.VMInterfaceForm
     template_name = 'virtualization/virtualmachine_component_add.html'
     template_name = 'virtualization/virtualmachine_component_add.html'
 
 
 
 
-class InterfaceEditView(ObjectEditView):
+class VMInterfaceEditView(ObjectEditView):
     queryset = VMInterface.objects.all()
     queryset = VMInterface.objects.all()
     model_form = forms.VMInterfaceForm
     model_form = forms.VMInterfaceForm
     template_name = 'virtualization/vminterface_edit.html'
     template_name = 'virtualization/vminterface_edit.html'
 
 
 
 
-class InterfaceDeleteView(ObjectDeleteView):
+class VMInterfaceDeleteView(ObjectDeleteView):
     queryset = VMInterface.objects.all()
     queryset = VMInterface.objects.all()
 
 
 
 
-class InterfaceBulkImportView(BulkImportView):
+class VMInterfaceBulkImportView(BulkImportView):
     queryset = VMInterface.objects.all()
     queryset = VMInterface.objects.all()
     model_form = forms.VMInterfaceCSVForm
     model_form = forms.VMInterfaceCSVForm
     table = tables.VMInterfaceTable
     table = tables.VMInterfaceTable
     default_return_url = 'virtualization:vminterface_list'
     default_return_url = 'virtualization:vminterface_list'
 
 
 
 
-class InterfaceBulkEditView(BulkEditView):
+class VMInterfaceBulkEditView(BulkEditView):
     queryset = VMInterface.objects.all()
     queryset = VMInterface.objects.all()
     table = tables.VMInterfaceTable
     table = tables.VMInterfaceTable
     form = forms.VMInterfaceBulkEditForm
     form = forms.VMInterfaceBulkEditForm
 
 
 
 
-class InterfaceBulkRenameView(BulkRenameView):
+class VMInterfaceBulkRenameView(BulkRenameView):
     queryset = VMInterface.objects.all()
     queryset = VMInterface.objects.all()
     form = forms.VMInterfaceBulkRenameForm
     form = forms.VMInterfaceBulkRenameForm
 
 
 
 
-class InterfaceBulkDeleteView(BulkDeleteView):
+class VMInterfaceBulkDeleteView(BulkDeleteView):
     queryset = VMInterface.objects.all()
     queryset = VMInterface.objects.all()
     table = tables.VMInterfaceTable
     table = tables.VMInterfaceTable