Merge pull request #42 from k01ek/develop

Develop

Author: k01ek

Makefile

@@ -1,5 +1,5 @@
 PYTHON_VER?=3.7
-NETBOX_VER?=v2.11.2
+NETBOX_VER?=v2.11.6
 
 NAME=netbox-bgp
 
@@ -71,3 +71,7 @@ endif
 	git commit -am 'bump ver'
 	git push origin release-$(NEWVER)
 	git checkout develop
+
+
+test:
+	docker-compose -f ${COMPOSE_FILE} -p ${BUILD_NAME} run netbox python manage.py test ${BUILD_NAME}

netbox_bgp/__init__.py

@@ -12,7 +12,7 @@ class BGPConfig(PluginConfig):
     base_url = 'bgp'
     required_settings = []
     min_version = '2.10.1'
-    max_version = '2.11.3'
+    max_version = '2.11.6'
     default_settings = {
         'device_ext_page': 'right'
     }

netbox_bgp/api/serializers.py

@@ -1,7 +1,7 @@
 from rest_framework.serializers import Serializer, HyperlinkedIdentityField
 from rest_framework.relations import PrimaryKeyRelatedField
 
-from netbox.api import ChoiceField, WritableNestedSerializer
+from netbox.api import ChoiceField, WritableNestedSerializer, ValidatedModelSerializer
 from dcim.api.nested_serializers import NestedSiteSerializer, NestedDeviceSerializer
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from extras.api.nested_serializers import NestedTagSerializer
@@ -14,7 +14,8 @@
     from netbox.api.serializers import CustomFieldModelSerializer
 
 from netbox_bgp.models import (
-    ASN, ASNStatusChoices, BGPSession, SessionStatusChoices, RoutingPolicy, BGPPeerGroup
+    ASN, ASNStatusChoices, BGPSession, SessionStatusChoices, RoutingPolicy, BGPPeerGroup,
+    Community
 )
 
 
@@ -161,3 +162,12 @@ def to_representation(self, instance):
                         NestedRoutingPolicySerializer(pol, context={'request': self.context['request']}).data
                     )
         return ret
+
+
+class CommunitySerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    status = ChoiceField(choices=ASNStatusChoices, required=False)
+    tenant = NestedTenantSerializer(required=False, allow_null=True)
+
+    class Meta:
+        model = Community
+        fields = ['id', 'value', 'status', 'description', 'tenant', 'tags']

netbox_bgp/api/urls.py

@@ -1,12 +1,16 @@
 from rest_framework import routers
 
-from .views import ASNViewSet, BGPSessionViewSet, RoutingPolicyViewSet, BGPPeerGroupViewSet
+from .views import (
+    ASNViewSet, BGPSessionViewSet, RoutingPolicyViewSet, BGPPeerGroupViewSet,
+    CommunityViewSet
+)
 
 router = routers.DefaultRouter()
 router.register('asn', ASNViewSet)
 router.register('session', BGPSessionViewSet)
 router.register('routing-policy', RoutingPolicyViewSet)
 router.register('peer-group', BGPPeerGroupViewSet)
+router.register('community', CommunityViewSet)
 
 
 urlpatterns = router.urls

netbox_bgp/api/views.py

@@ -1,9 +1,13 @@
 from rest_framework.viewsets import ModelViewSet
 
-from .serializers import ASNSerializer, BGPSessionSerializer, RoutingPolicySerializer, BGPPeerGroupSerializer
-from netbox_bgp.models import ASN, BGPSession, RoutingPolicy, BGPPeerGroup
+from .serializers import (
+    ASNSerializer, BGPSessionSerializer, RoutingPolicySerializer, BGPPeerGroupSerializer,
+    CommunitySerializer
+)
+from netbox_bgp.models import ASN, BGPSession, RoutingPolicy, BGPPeerGroup, Community
 from netbox_bgp.filters import (
-    ASNFilterSet, BGPSessionFilterSet, RoutingPolicyFilterSet, BGPPeerGroupFilterSet
+    ASNFilterSet, BGPSessionFilterSet, RoutingPolicyFilterSet, BGPPeerGroupFilterSet,
+    CommunityFilterSet
 )
 
 
@@ -29,3 +33,9 @@ class BGPPeerGroupViewSet(ModelViewSet):
     queryset = BGPPeerGroup.objects.all()
     serializer_class = BGPPeerGroupSerializer
     filterset_class = BGPPeerGroupFilterSet
+
+
+class CommunityViewSet(ModelViewSet):
+    queryset = Community.objects.all()
+    serializer_class = CommunitySerializer
+    filterset_class = CommunityFilterSet

netbox_bgp/tests/__init__.py

@@ -0,0 +1,107 @@
+from django.contrib.auth.models import User
+from django.test import TestCase
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APIClient, APITestCase
+
+
+from users.models import Token
+
+from netbox_bgp.models import ASN, Community
+
+
+class BaseTestCase(TestCase):
+    def setUp(self):
+        self.user = User.objects.create(username='testuser', is_superuser=True)
+        self.token = Token.objects.create(user=self.user)
+        self.client = APIClient()
+        self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
+
+
+class ASNTestCase(BaseTestCase):
+    def setUp(self):
+        super().setUp()
+        self.base_url_lookup = 'plugins-api:netbox_bgp-api:asn'
+        self.asn1 = ASN.objects.create(number=65000, description='test_asn1')
+        self.asn2 = ASN.objects.create(number=65001, description='test_asn2')
+
+    def test_list_asn(self):
+        url = reverse(f'{self.base_url_lookup}-list')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['count'], 2)
+
+    def test_get_asn(self):
+        url = reverse(f'{self.base_url_lookup}-detail', kwargs={'pk': self.asn1.pk})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['number'], self.asn1.number)
+        self.assertEqual(response.data['description'], self.asn1.description)
+
+    def test_create_asn(self):
+        url = reverse(f'{self.base_url_lookup}-list')
+        data = {'number': 65002, 'description': 'test_asn3'}
+
+        response = self.client.post(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        for key, value in data.items():
+            self.assertEqual(response.data[key], value)
+
+        asn = ASN.objects.get(pk=response.data['id'])
+        self.assertEqual(asn.number, data['number'])
+        self.assertEqual(asn.description, data['description'])
+
+    def test_update_asn(self):
+        url = reverse(f'{self.base_url_lookup}-detail', kwargs={'pk': self.asn1.pk})
+
+        response = self.client.patch(url, {'number': 65004}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        asn = ASN.objects.get(pk=self.asn1.pk)
+        self.assertEqual(asn.number, 65004)
+
+        response = self.client.patch(url, {'number': 65005}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        asn = ASN.objects.get(pk=self.asn1.pk)
+        self.assertEqual(asn.number, 65005)
+
+    def test_delete_task(self):
+        url = reverse(f'{self.base_url_lookup}-detail', kwargs={'pk': self.asn1.pk})
+
+        response = self.client.delete(url)
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+        with self.assertRaises(ASN.DoesNotExist):
+            ASN.objects.get(pk=self.asn1.pk)
+
+
+class CommunityTestCase(BaseTestCase):
+    def setUp(self):
+        super().setUp()
+        self.base_url_lookup = 'plugins-api:netbox_bgp-api:community'
+        self.community1 = Community.objects.create(value='65000:65000', description='test_community')
+
+    def test_list_community(self):
+        url = reverse(f'{self.base_url_lookup}-list')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['count'], 1)
+
+    def test_get_asn(self):
+        url = reverse(f'{self.base_url_lookup}-detail', kwargs={'pk': self.community1.pk})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['value'], self.community1.value)
+        self.assertEqual(response.data['description'], self.community1.description)
+
+    def test_create_community(self):
+        url = reverse(f'{self.base_url_lookup}-list')
+        data = {'value': '65001:65001', 'description': 'test_community1'}
+        response = self.client.post(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(Community.objects.get(pk=response.data['id']).value, '65001:65001')
+        self.assertEqual(Community.objects.get(pk=response.data['id']).description, 'test_community1')
+
+    def test_update_community(self):
+        pass
+
+    def test_delete_community(self):
+        pass

netbox_bgp/tests/test_api.py

@@ -0,0 +1,37 @@
+from django.core.exceptions import ValidationError
+from django.db.utils import IntegrityError
+from django.test import TestCase
+
+from tenancy.models import Tenant
+
+from netbox_bgp.models import ASN, BGPSession, Community, RoutingPolicy, BGPPeerGroup
+
+
+class ASNTestCase(TestCase):
+    def setUp(self):
+        self.tenant = Tenant.objects.create(name='tenant')
+        self.asn = ASN.objects.create(
+            number=65001,
+            description='test_asn'
+        )
+
+    def test_create_asn(self):
+        pass
+
+    def test_invalid_asn0(self):
+        asn = ASN(number=0)
+        self.assertRaises(ValidationError, asn.full_clean)
+
+    def test_invalid_asndohuya(self):
+        asn = ASN(number=4294967295)
+        self.assertRaises(ValidationError, asn.full_clean)
+
+    def test_uniqueconstraint_asn(self):
+        asn = ASN(number=65001)
+        with self.assertRaises(IntegrityError):
+            asn.save()
+
+    def test_uniqueconstraint_asn2(self):
+        asn = ASN.objects.create(number=65001, tenant=self.tenant)
+        self.assertEqual(str(asn), '65001')
+        # todo cre another 65001 tenant=self.tenant

netbox_bgp/tests/test_models.py

@@ -1 +1 @@
-__version__ = "0.3.4"
+__version__ = "0.3.5"