Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NetBox 2.9.3 compatibility issues #38

Merged
merged 5 commits into from
Sep 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ python3 manage.py migrate

For more information about installing plugins, refer to [NetBox's documentation.](https://netbox.readthedocs.io/en/stable/plugins/)

## Compatibility

Below is a table describing the compatibility of various NetBox versions with NetBox Virtual Circuit Plugin versions.

| | Netbox 2.8 | NetBox 2.9 |
|----------------------|------------|
| `1.0.0` | ✓ | ✗ |
| `1.1.0` | ✗ | ✓ |

## Using

Once the plugin is installed correctly as instructed above, one can find the
Expand Down
4 changes: 2 additions & 2 deletions dev/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@

# Remote authentication support
REMOTE_AUTH_ENABLED = False
REMOTE_AUTH_BACKEND = "utilities.auth_backends.RemoteUserBackend"
REMOTE_AUTH_BACKEND = "netbox.authentication.RemoteUserBackend"
REMOTE_AUTH_HEADER = "HTTP_REMOTE_USER"
REMOTE_AUTH_AUTO_CREATE_USER = True
REMOTE_AUTH_DEFAULT_GROUPS = []
REMOTE_AUTH_DEFAULT_PERMISSIONS = []
REMOTE_AUTH_DEFAULT_PERMISSIONS = {}

# This determines how often the GitHub API is called to check the latest release of NetBox. Must be at least 1 hour.
RELEASE_CHECK_TIMEOUT = 24 * 3600
Expand Down
2 changes: 1 addition & 1 deletion netbox_virtual_circuit_plugin/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from django.core.validators import MaxValueValidator, MinValueValidator
from django.urls import reverse
from ipam.models import VLAN
from utilities.models import ChangeLoggedModel
from extras.models import ChangeLoggedModel

from .choices import VirtualCircuitStatusChoices

Expand Down
16 changes: 8 additions & 8 deletions netbox_virtual_circuit_plugin/views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.shortcuts import get_object_or_404, get_list_or_404, render
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.shortcuts import get_object_or_404, get_list_or_404, render
from django.views.generic import View
from utilities.views import BulkDeleteView, ObjectEditView, ObjectListView, ObjectDeleteView

Expand All @@ -22,15 +22,15 @@ def get(self, request, pk):
'vlans': vlans,
})

class VirtualCircuitListView(ObjectListView):
class VirtualCircuitListView(PermissionRequiredMixin, ObjectListView):
permission_required = 'netbox_virtual_circuit_plugin.view_virtualcircuit'
queryset = VirtualCircuit.objects.all()
filterset = VirtualCircuitFilter
filterset_form = VirtualCircuitFilterForm
table = VirtualCircuitTable
template_name = 'netbox_virtual_circuit_plugin/virtual_circuit_list.html'

class VirtualCircuitCreateView(ObjectEditView):
class VirtualCircuitCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'netbox_virtual_circuit_plugin.add_virtualcircuit'
model = VirtualCircuit
queryset = VirtualCircuit.objects.all()
Expand All @@ -41,32 +41,32 @@ class VirtualCircuitCreateView(ObjectEditView):
class VirtualCircuitEditView(VirtualCircuitCreateView):
permission_required = 'netbox_virtual_circuit_plugin.change_virtualcircuit'

class VirtualCircuitDeleteView(ObjectDeleteView):
class VirtualCircuitDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'netbox_virtual_circuit_plugin.delete_virtualcircuit'
model = VirtualCircuit
default_return_url = 'plugins:netbox_virtual_circuit_plugin:virtual_circuit_list'

class VirtualCircuitBulkDeleteView(BulkDeleteView):
class VirtualCircuitBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
permission_required = 'netbox_virtual_circuit_plugin.delete_virtualcircuit'
queryset = VirtualCircuit.objects.filter()
table = VirtualCircuitTable
default_return_url = 'plugins:netbox_virtual_circuit_plugin:virtual_circuit_list'

class VirtualCircuitVLANListView(ObjectListView):
class VirtualCircuitVLANListView(PermissionRequiredMixin, ObjectListView):
permission_required = 'netbox_virtual_circuit_plugin.view_virtualcircuitvlan'
queryset = VirtualCircuitVLAN.objects.all()
table = VirtualCircuitVLANTable
template_name = 'netbox_virtual_circuit_plugin/virtual_circuit_vlan_list.html'

class VirtualCircuitVLANCreateView(ObjectEditView):
class VirtualCircuitVLANCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'netbox_virtual_circuit_plugin.add_virtualcircuitvlan'
model = VirtualCircuitVLAN
queryset = VirtualCircuitVLAN.objects.all()
model_form = VirtualCircuitVLANForm
template_name = 'netbox_virtual_circuit_plugin/virtual_circuit_vlan_edit.html'
default_return_url = 'plugins:netbox_virtual_circuit_plugin:virtual_circuit_vlan_list'

class VirtualCircuitVLANBulkDeleteView(BulkDeleteView):
class VirtualCircuitVLANBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
permission_required = 'netbox_virtual_circuit_plugin.delete_virtualcircuitvlan'
queryset = VirtualCircuitVLAN.objects.filter()
table = VirtualCircuitVLANTable
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name='netbox-virtual-circuit-plugin',
version='1.0.0',
version='1.1.0',
description='A Netbox plugin that supports Virtual Circuit management',
long_description=readme,
long_description_content_type='text/markdown',
Expand Down