-
-
-
-
-
-
- | Site |
-
- {% if object.site %}
- {{ object.site }}
- {% else %}
- None
- {% endif %}
- |
-
-
- | Number |
- {{ object }} |
-
-
- | Tenant |
-
- {% if object.tenant %}
- {{ object.tenant }}
- {% else %}
- None
- {% endif %}
- |
-
-
- | Status |
-
- {{ object.get_status_display }}
- |
-
-
- | Description |
- {{ object.description|placeholder }} |
-
-
-
-
- {% include 'inc/panels/custom_fields.html' %}
- {% include 'inc/panels/tags.html' %}
- {% plugin_left_page object %}
-
-
-
-
-
- {% render_table related_session_table 'inc/table.html' %}
-
- {% plugin_right_page object %}
-
-
-
-
- {% plugin_full_width_page object %}
-
-
- {% endblock %}
\ No newline at end of file
diff --git a/netbox_bgp/tests/test_api.py b/netbox_bgp/tests/test_api.py
index c408bc3..449a990 100644
--- a/netbox_bgp/tests/test_api.py
+++ b/netbox_bgp/tests/test_api.py
@@ -12,9 +12,9 @@
from tenancy.models import Tenant
from dcim.models import Site, DeviceRole, DeviceType, Manufacturer, Device, Interface
-from ipam.models import IPAddress
+from ipam.models import IPAddress, ASN, RIR
-from netbox_bgp.models import ASN, Community, BGPPeerGroup, BGPSession
+from netbox_bgp.models import Community, BGPPeerGroup, BGPSession
class BaseTestCase(TestCase):
@@ -27,98 +27,6 @@ def setUp(self):
self.gql_client = Client(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')
- self.tenant = Tenant.objects.create(name='tenant')
-
- 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)
-
- response = self.client.patch(url, {'description': 'changed'}, format='json')
- self.assertEqual(response.status_code, status.HTTP_200_OK)
- asn = ASN.objects.get(pk=self.asn1.pk)
- self.assertEqual(asn.description, 'changed')
-
- 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)
-
- def test_uniqueconstraint_asn(self):
- url = reverse(f'{self.base_url_lookup}-list')
- data = {'number': 65001, 'description': 'test_asn3'}
- response = self.client.post(url, data, format='json')
- self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
- data = {'number': 65001, 'description': 'test_asn3', 'tenant': self.tenant.pk}
- response = self.client.post(url, data, format='json')
- self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-
- def test_graphql(self):
- url = reverse('graphql')
- query = 'query bgp_asn($id: Int!){bgp_asn(id: $id){number}}'
- response = self.gql_client.post(
- url,
- json.dumps({'query': query, 'variables': {'id': self.asn1.pk}}),
- content_type='application/json'
- )
- self.assertEqual(response.status_code, status.HTTP_200_OK)
- self.assertEqual(json.loads(response.content)['data']['bgp_asn']['number'], self.asn1.number)
-
- def test_graphql_list(self):
- url = reverse('graphql')
- query = '{bgp_asn_list{number}}'
- response = self.gql_client.post(
- url,
- json.dumps({'query': query}),
- content_type='application/json'
- )
- self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-
class CommunityTestCase(BaseTestCase):
def setUp(self):
super().setUp()
@@ -247,10 +155,11 @@ def setUp(self):
self.remote_ip = IPAddress.objects.create(address='4.4.4.4/32')
intf.ip_addresses.add(local_ip)
self.device.save()
- self.local_as = ASN.objects.create(number=65000, description='local_as')
- self.remote_as = ASN.objects.create(number=65001, description='remote_as')
- local_as = ASN.objects.create(number=65002, description='local_as')
- remote_as = ASN.objects.create(number=65003, description='remote_as')
+ self.rir = RIR.objects.create(name="rir")
+ self.local_as = ASN.objects.create(asn=65000, rir=self.rir, description='local_as')
+ self.remote_as = ASN.objects.create(asn=65001, rir=self.rir, description='remote_as')
+ local_as = ASN.objects.create(asn=65002, rir=self.rir, description='local_as')
+ remote_as = ASN.objects.create(asn=65003, rir=self.rir, description='remote_as')
self.peer_group = BGPPeerGroup.objects.create(name='peer_group', description='peer_group_description')
self.session = BGPSession.objects.create(
name='session',
@@ -275,8 +184,8 @@ def test_get_session(self):
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['name'], self.session.name)
self.assertEqual(response.data['description'], self.session.description)
- self.assertEqual(response.data['local_as']['number'], self.session.local_as.number)
- self.assertEqual(response.data['remote_as']['number'], self.session.remote_as.number)
+ self.assertEqual(response.data['local_as']['asn'], self.session.local_as.asn)
+ self.assertEqual(response.data['remote_as']['asn'], self.session.remote_as.asn)
self.assertEqual(response.data['local_address']['address'], self.session.local_address.address)
self.assertEqual(response.data['remote_address']['address'], self.session.remote_address.address)
self.assertEqual(response.data['status']['value'], self.session.status)
diff --git a/netbox_bgp/tests/test_forms.py b/netbox_bgp/tests/test_forms.py
index 5e15afc..8fe38d2 100644
--- a/netbox_bgp/tests/test_forms.py
+++ b/netbox_bgp/tests/test_forms.py
@@ -2,39 +2,28 @@
from django.test import TestCase
-from netbox_bgp.forms import ASNForm
+from netbox_bgp.forms import CommunityForm
-class TestASNFormCase(TestCase):
+class TestCommunityFormCase(TestCase):
def test_asn_invalid_letters(self):
- form = ASNForm(
+ form = CommunityForm(
data={
- 'number': 'dsad',
+ 'value': 'dsad',
'status': 'active'
}
)
self.assertEqual(
- form.errors['number'], ['Invalid AS Number: dsad']
+ form.errors['value'], ['Enter a valid value.']
)
- def test_asn_asdot_valid(self):
- form = ASNForm(
+ def test_community_valid(self):
+ form = CommunityForm(
data={
- 'number': '1.1',
+ 'value': '1234:5678',
'status': 'active'
}
)
self.assertEqual(
- form.errors.get('number'), None
- )
-
- def test_asn_invalid_range(self):
- form = ASNForm(
- data={
- 'number': '65536.1',
- 'status': 'active'
- }
- )
- self.assertEqual(
- form.errors['number'], ['Invalid AS Number: 65536.1']
+ form.errors.get('value'), None
)
diff --git a/netbox_bgp/tests/test_models.py b/netbox_bgp/tests/test_models.py
index 2a54e77..f7a0752 100644
--- a/netbox_bgp/tests/test_models.py
+++ b/netbox_bgp/tests/test_models.py
@@ -4,40 +4,9 @@
from tenancy.models import Tenant
from dcim.models import Site, Device, Manufacturer, DeviceRole, DeviceType
-from ipam.models import IPAddress
+from ipam.models import IPAddress, ASN, RIR
-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):
- self.assertTrue(isinstance(self.asn, ASN))
- self.assertEqual(self.asn.__str__(), str(self.asn.number))
-
- def test_invalid_asn0(self):
- asn = ASN(number=0)
- self.assertRaises(ValidationError, asn.full_clean)
-
- def test_invalid_asndohuya(self):
- asn = ASN(number=4294967296)
- 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
+from netbox_bgp.models import BGPSession, Community, RoutingPolicy, BGPPeerGroup
class RoutingPolicyTestCase(TestCase):
@@ -170,11 +139,16 @@ def setUp(self):
device_role=device_role,
device_type=device_type
)
+ self.rir = RIR.objects.create(
+ name="rir"
+ )
self.local_as = ASN.objects.create(
- number=65001,
+ asn=65001,
+ rir=self.rir
)
self.remote_as = ASN.objects.create(
- number=65002,
+ asn=65002,
+ rir=self.rir
)
self.peer_group = BGPPeerGroup.objects.create(
name='peer_group'
diff --git a/netbox_bgp/urls.py b/netbox_bgp/urls.py
index b32ac79..b5802a2 100644
--- a/netbox_bgp/urls.py
+++ b/netbox_bgp/urls.py
@@ -1,10 +1,9 @@
from django.urls import path
from netbox.views.generic import ObjectChangeLogView
-from .models import ASN, BGPSession, Community, RoutingPolicy, BGPPeerGroup, RoutingPolicyRule
+from .models import BGPSession, Community, RoutingPolicy, BGPPeerGroup, RoutingPolicyRule
from .views import (
- ASNListView, ASNView, ASNBulkDeleteView, ASNEditView, ASNBulkEditView,
- ASNDeleteView, CommunityListView, CommunityEditView, CommunityView,
+ CommunityListView, CommunityEditView, CommunityView,
CommunityBulkEditView, CommunityBulkDeleteView, CommunityDeleteView,
BGPSessionListView, BGPSessionEditView, BGPSessionBulkDeleteView,
BGPSessionView, BGPSessionDeleteView, BGPSessionAddView,
@@ -16,14 +15,6 @@
)
urlpatterns = [
- path('asn/', ASNListView.as_view(), name='asn_list'),
- path('asn/add/', ASNEditView.as_view(), name='asn_add'),
- path('asn/edit/', ASNBulkEditView.as_view(), name='asn_bulk_edit'),
- path('asn/delete/', ASNBulkDeleteView.as_view(), name='asn_bulk_delete'),
- path('asn/
/', ASNView.as_view(), name='asn'),
- path('asn//edit/', ASNEditView.as_view(), name='asn_edit'),
- path('asn//delete/', ASNDeleteView.as_view(), name='asn_delete'),
- path('asn//changelog/', ObjectChangeLogView.as_view(), name='asn_changelog', kwargs={'model': ASN}),
# Community
path('community/', CommunityListView.as_view(), name='community_list'),
path('community/add/', CommunityEditView.as_view(), name='community_add'),
@@ -42,7 +33,6 @@
path('session//delete/', BGPSessionDeleteView.as_view(), name='bgpsession_delete'),
path('session//changelog/', ObjectChangeLogView.as_view(), name='bgpsession_changelog', kwargs={'model': BGPSession}),
# Routing Policies
-
path('routing-policy/', RoutingPolicyListView.as_view(), name='routingpolicy_list'),
path('routing-policy/add/', RoutingPolicyEditView.as_view(), name='routingpolicy_add'),
path('routing-policy/delete/', RoutingPolicyBulkDeleteView.as_view(), name='routingpolicy_bulk_delete'),
diff --git a/netbox_bgp/views.py b/netbox_bgp/views.py
index d7abb73..6a5d2a9 100644
--- a/netbox_bgp/views.py
+++ b/netbox_bgp/views.py
@@ -3,62 +3,20 @@
from netbox.views import generic
from .filters import (
- ASNFilterSet, CommunityFilterSet, BGPSessionFilterSet,
+ CommunityFilterSet, BGPSessionFilterSet,
RoutingPolicyFilterSet, BGPPeerGroupFilterSet
)
-from .models import ASN, Community, BGPSession, RoutingPolicy, BGPPeerGroup, RoutingPolicyRule
+from .models import Community, BGPSession, RoutingPolicy, BGPPeerGroup, RoutingPolicyRule
from .tables import (
- ASNTable, CommunityTable, BGPSessionTable, RoutingPolicyTable, BGPPeerGroupTable, RoutingPolicyRuleTable
+ CommunityTable, BGPSessionTable, RoutingPolicyTable, BGPPeerGroupTable, RoutingPolicyRuleTable
)
from .forms import (
- ASNFilterForm, ASNBulkEditForm, ASNForm, CommunityForm,
- CommunityFilterForm, CommunityBulkEditForm, BGPSessionForm,
+ CommunityForm, CommunityFilterForm, CommunityBulkEditForm, BGPSessionForm,
BGPSessionFilterForm, BGPSessionAddForm, RoutingPolicyFilterForm,
RoutingPolicyForm, BGPPeerGroupFilterForm, BGPPeerGroupForm, RoutingPolicyRuleForm
)
-class ASNListView(generic.ObjectListView):
- queryset = ASN.objects.all()
- filterset = ASNFilterSet
- filterset_form = ASNFilterForm
- table = ASNTable
- action_buttons = ('add',)
-
-
-class ASNView(generic.ObjectView):
- queryset = ASN.objects.all()
- template_name = 'netbox_bgp/asn.html'
-
- def get_extra_context(self, request, instance):
- sess = BGPSession.objects.filter(remote_as=instance) | BGPSession.objects.filter(local_as=instance)
- sess_table = BGPSessionTable(sess)
- return {
- 'related_session_table': sess_table
- }
-
-
-class ASNEditView(generic.ObjectEditView):
- queryset = ASN.objects.all()
- form = ASNForm
-
-
-class ASNBulkDeleteView(generic.BulkDeleteView):
- queryset = ASN.objects.all()
- table = ASNTable
-
-
-class ASNBulkEditView(generic.BulkEditView):
- queryset = ASN.objects.all()
- filterset = ASNFilterSet
- table = ASNTable
- form = ASNBulkEditForm
-
-
-class ASNDeleteView(generic.ObjectDeleteView):
- queryset = ASN.objects.all()
-
-
class CommunityListView(generic.ObjectListView):
queryset = Community.objects.all()
filterset = CommunityFilterSet