Merge pull request #140 from k01ek/develop

Develop

Author: k01ek

netbox_bgp/api/serializers.py

@@ -103,7 +103,15 @@ class BGPSessionSerializer(NetBoxModelSerializer):
 
     class Meta:
         model = BGPSession
-        fields = '__all__'
+        #fields = '__all__'
+        fields = [
+            'id', 'tags', 'custom_fields',
+            'display', 'status', 'site', 'tenant',
+            'device', 'local_address', 'remote_address',
+            'local_as', 'remote_as', 'peer_group', 'import_policies',
+            'export_policies', 'created', 'last_updated',
+            'name', 'description'
+            ]
         validators = []
 
     def validate(self, attrs):
@@ -152,7 +160,13 @@ class CommunitySerializer(NetBoxModelSerializer):
     class Meta:
         model = Community
         # fields = ['id', 'value', 'status', 'description', 'tenant', 'tags']
-        fields = '__all__'
+        fields = [
+            'id', 'tags', 'custom_fields', 'display',
+            'status', 'tenant', 'created', 'last_updated',
+            'description',
+            'value', 'site', 'role'
+        ]
+        # fields = '__all__'
 
 
 class RoutingPolicyRuleSerializer(NetBoxModelSerializer):
@@ -172,7 +186,7 @@ class NestedPrefixListSerializer(WritableNestedSerializer):
 
     class Meta:
         model = PrefixList
-        fields = ("id", "url", "display", "name")
+        fields = ['id', 'url', 'display', 'name']
 
 
 class PrefixListRuleSerializer(NetBoxModelSerializer):
@@ -181,3 +195,9 @@ class PrefixListRuleSerializer(NetBoxModelSerializer):
     class Meta:
         model = PrefixListRule
         fields = '__all__'
+        fields = [
+            'id', 'tags', 'custom_fields', 'display',
+            'prefix_list', 'created', 'last_updated',
+            'index', 'action',
+            'prefix_custom', 'ge', 'le', 'prefix'
+        ]

netbox_bgp/forms.py

@@ -1,5 +1,3 @@
-import re
-
 from django import forms
 from django.conf import settings
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist, ValidationError
@@ -11,12 +9,12 @@
 from ipam.models import IPAddress, Prefix, ASN
 from ipam.formfields import IPNetworkFormField
 from utilities.forms.fields import (
-    DynamicModelChoiceField,
+    DynamicModelChoiceField, CSVModelChoiceField,
     DynamicModelMultipleChoiceField,
-    TagFilterField
+    TagFilterField, CSVChoiceField,
 )
 from utilities.forms.widgets import APISelect, APISelectMultiple
-from netbox.forms import NetBoxModelForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
+from netbox.forms import NetBoxModelForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm, NetBoxModelImportForm  
 
 from .models import (
     Community, BGPSession, RoutingPolicy, BGPPeerGroup,
@@ -93,6 +91,23 @@ class CommunityBulkEditForm(NetBoxModelBulkEditForm):
        'tenant', 'description',
     ]
 
+class CommunityImportForm(NetBoxModelImportForm):
+    tenant = CSVModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        to_field_name='name',
+        help_text=_('Assigned tenant')
+    )
+
+    status = CSVChoiceField(
+        choices=CommunityStatusChoices,
+        help_text=_('Operational status')
+    )    
+
+    class Meta:
+        model = Community
+        fields = ('value', 'description', 'tags')    
+
 
 class BGPSessionForm(NetBoxModelForm):
     name = forms.CharField(

netbox_bgp/urls.py

@@ -8,6 +8,7 @@
     # Community
     path('community/', views.CommunityListView.as_view(), name='community_list'),
     path('community/add/', views.CommunityEditView.as_view(), name='community_add'),
+    path('community/import/', views.CommunityBulkImportView.as_view(), name='community_import'),
     path('community/edit/', views.CommunityBulkEditView.as_view(), name='community_bulk_edit'),
     path('community/delete/', views.CommunityBulkDeleteView.as_view(), name='community_bulk_delete'),
     path('community/<int:pk>/', views.CommunityView.as_view(), name='community'),

netbox_bgp/version.py

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

netbox_bgp/views.py

@@ -51,6 +51,11 @@ class CommunityDeleteView(generic.ObjectDeleteView):
     default_return_url = 'plugins:netbox_bgp:community_list'
 
 
+class CommunityBulkImportView(generic.BulkImportView):
+    queryset = Community.objects.all()
+    model_form = forms.CommunityImportForm
+
+
 # Session