Merge pull request #137 from k01ek/develop

Develop

Author: k01ek

Makefile

@@ -1,5 +1,5 @@
 PYTHON_VER?=3.8
-NETBOX_VER?=v3.4.0
+NETBOX_VER?=v3.5.1
 
 NAME=netbox-bgp
 

README.md

@@ -19,6 +19,7 @@ This plugin provide following Models:
 | NetBox 3.2  | >= 0.6.0 |
 | NetBox 3.3  | >= 0.8.1 |
 | NetBox 3.4  | >= 0.9.0 |
+| NetBox 3.5  | >= 0.10.0 |
 
 ## Installation
 
@@ -40,6 +41,7 @@ See [NetBox Documentation](https://docs.netbox.dev/en/stable/plugins/#installing
 The following options are available:
 * `device_ext_page`: String (default right) Device related BGP sessions table position. The following values are available:  
 left, right, full_width. Set empty value for disable.
+* `top_level_menu`: Bool (default False) Enable top level section navigation menu for the plugin. 
 
 ## Screenshots
 
@@ -59,4 +61,4 @@ Routing Policy
 ![Routing Policy](docs/img/routepolicy.png)
 
 Prefix List
-![Prefix List](docs/img/preflist.png)
+![Prefix List](docs/img/preflist.png)

develop/Dockerfile

@@ -15,9 +15,6 @@ RUN git clone --single-branch --branch ${netbox_ver} https://github.com/netbox-c
     cd /opt/netbox/ && \
     pip install -r /opt/netbox/requirements.txt
 
-# Work around https://github.com/rq/django-rq/issues/421
-RUN pip install django-rq==2.3.2
-
 # -------------------------------------------------------------------------------------
 # Install Netbox Plugin
 # -------------------------------------------------------------------------------------
@@ -28,4 +25,4 @@ COPY . /source
 #RUN pip install -r requirements.txt
 RUN python setup.py develop
 
-WORKDIR /opt/netbox/netbox/
+WORKDIR /opt/netbox/netbox/

develop/dev.env

@@ -6,7 +6,7 @@ PGPASSWORD=decinablesprewad
 DB_HOST=postgres
 NAPALM_TIMEOUT=5
 MAX_PAGE_SIZE=0
-SECRET_KEY=bqn8nn4qmjvx4hv2u5qr4pp46s3w9skbb63y
+SECRET_KEY=bqn8nn4qmjvx4hv2u5qr4pp46s3w9skbb63yaiyoos0sho6ath
 POSTGRES_USER=netbox
 POSTGRES_PASSWORD=decinablesprewad
 POSTGRES_DB=netbox

netbox_bgp/__init__.py

@@ -11,8 +11,8 @@ class BGPConfig(PluginConfig):
     author_email = '[email protected]'
     base_url = 'bgp'
     required_settings = []
-    min_version = '3.4.0'
-    max_version = '3.4.99'
+    min_version = '3.5.0'
+    max_version = '3.5.99'
     default_settings = {
         'device_ext_page': 'right',
         'top_level_menu' : False,

netbox_bgp/api/serializers.py

@@ -167,7 +167,17 @@ class Meta:
         fields = '__all__'
 
 
+class NestedPrefixListSerializer(WritableNestedSerializer):
+    url = HyperlinkedIdentityField(view_name='plugins:netbox_bgp:prefixlist')
+
+    class Meta:
+        model = PrefixList
+        fields = ("id", "url", "display", "name")
+
+
 class PrefixListRuleSerializer(NetBoxModelSerializer):
+    prefix_list = NestedPrefixListSerializer()
+
     class Meta:
         model = PrefixListRule
         fields = '__all__'

netbox_bgp/forms.py

@@ -10,11 +10,12 @@
 from dcim.models import Device, Site
 from ipam.models import IPAddress, Prefix, ASN
 from ipam.formfields import IPNetworkFormField
-from utilities.forms import (
+from utilities.forms.fields import (
     DynamicModelChoiceField,
-    DynamicModelMultipleChoiceField, StaticSelect,
-    APISelect, APISelectMultiple, StaticSelectMultiple, TagFilterField
+    DynamicModelMultipleChoiceField,
+    TagFilterField
 )
+from utilities.forms.widgets import APISelect, APISelectMultiple
 from netbox.forms import NetBoxModelForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
 
 from .models import (
@@ -33,7 +34,6 @@ class CommunityForm(NetBoxModelForm):
     status = forms.ChoiceField(
         required=False,
         choices=CommunityStatusChoices,
-        widget=StaticSelect()
     )
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
@@ -59,7 +59,6 @@ class CommunityFilterForm(NetBoxModelFilterSetForm):
     status = forms.MultipleChoiceField(
         choices=CommunityStatusChoices,
         required=False,
-        widget=StaticSelectMultiple()
     )
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
@@ -87,7 +86,6 @@ class CommunityBulkEditForm(NetBoxModelBulkEditForm):
     status = forms.ChoiceField(
         required=False,
         choices=CommunityStatusChoices,
-        widget=StaticSelect()
     )
 
     model = Community
@@ -176,7 +174,7 @@ class Meta:
             ('Policies', ('import_policies', 'export_policies'))
         )
         widgets = {
-            'status': StaticSelect(),
+            'status': forms.Select(),
         }
 
 
@@ -226,7 +224,6 @@ class BGPSessionFilterForm(NetBoxModelFilterSetForm):
     status = forms.MultipleChoiceField(
         choices=SessionStatusChoices,
         required=False,
-        widget=StaticSelectMultiple()
     )
     peer_group = DynamicModelMultipleChoiceField(
         queryset=BGPPeerGroup.objects.all(),

netbox_bgp/version.py

@@ -1 +1 @@
-__version__ = "0.9.0"
+__version__ = "0.10.0"