Просмотр исходного кода

Update custom napalm_read, napalm_write permissions

Jeremy Stretch 5 лет назад
Родитель
Сommit
110bad7041

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

@@ -395,7 +395,7 @@ class DeviceViewSet(CustomFieldModelViewSet):
             ))
 
         # Verify user permission
-        if not request.user.has_perm('dcim.napalm_read'):
+        if not request.user.has_perm('dcim.napalm_read_device'):
             return HttpResponseForbidden()
 
         # Connect to the device

+ 1 - 1
netbox/dcim/migrations/0041_napalm_integration.py

@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterModelOptions(
             name='device',
-            options={'ordering': ['name'], 'permissions': (('napalm_read', 'Read-only access to devices via NAPALM'), ('napalm_write', 'Read/write access to devices via NAPALM'))},
+            options={'ordering': ['name']},
         ),
         migrations.AddField(
             model_name='platform',

+ 1 - 1
netbox/dcim/migrations/0089_deterministic_ordering.py

@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterModelOptions(
             name='device',
-            options={'ordering': ('name', 'pk'), 'permissions': (('napalm_read', 'Read-only access to devices via NAPALM'), ('napalm_write', 'Read/write access to devices via NAPALM'))},
+            options={'ordering': ('name', 'pk')},
         ),
         migrations.AlterModelOptions(
             name='rack',

+ 1 - 1
netbox/dcim/migrations/0095_primary_model_ordering.py

@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterModelOptions(
             name='device',
-            options={'ordering': ('_name', 'pk'), 'permissions': (('napalm_read', 'Read-only access to devices via NAPALM'), ('napalm_write', 'Read/write access to devices via NAPALM'))},
+            options={'ordering': ('_name', 'pk')},
         ),
         migrations.AlterModelOptions(
             name='rack',

+ 0 - 4
netbox/dcim/models/__init__.py

@@ -1477,10 +1477,6 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
             ('rack', 'position', 'face'),
             ('virtual_chassis', 'vc_position'),
         )
-        permissions = (
-            ('napalm_read', 'Read-only access to devices via NAPALM'),
-            ('napalm_write', 'Read/write access to devices via NAPALM'),
-        )
 
     def __str__(self):
         return self.display_name or super().__str__()

+ 3 - 3
netbox/dcim/views.py

@@ -1099,7 +1099,7 @@ class DeviceInventoryView(ObjectView):
 
 
 class DeviceStatusView(ObjectView):
-    additional_permissions = ['dcim.napalm_read']
+    additional_permissions = ['dcim.napalm_read_device']
     queryset = Device.objects.all()
 
     def get(self, request, pk):
@@ -1113,7 +1113,7 @@ class DeviceStatusView(ObjectView):
 
 
 class DeviceLLDPNeighborsView(ObjectView):
-    additional_permissions = ['dcim.napalm_read']
+    additional_permissions = ['dcim.napalm_read_device']
     queryset = Device.objects.all()
 
     def get(self, request, pk):
@@ -1133,7 +1133,7 @@ class DeviceLLDPNeighborsView(ObjectView):
 
 
 class DeviceConfigView(ObjectView):
-    additional_permissions = ['dcim.napalm_read']
+    additional_permissions = ['dcim.napalm_read_device']
     queryset = Device.objects.all()
 
     def get(self, request, pk):

+ 1 - 1
netbox/templates/dcim/device.html

@@ -101,7 +101,7 @@
                 Inventory <span class="badge">{{ device.inventory_items.count }}</span>
             </a>
         </li>
-        {% if perms.dcim.napalm_read %}
+        {% if perms.dcim.napalm_read_device %}
             {% if device.status != 'active' %}
                 {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='Device must be in active status' %}
             {% elif not device.platform %}