Merge pull request #9 from k01ek/develop

minor fixes

Author: k01ek

Makefile

@@ -47,6 +47,13 @@ makemigrations:
 	run netbox python manage.py makemigrations --name ${BUILD_NAME}
 	docker-compose -f ${COMPOSE_FILE} -p ${BUILD_NAME} down
 
+build:
+	python3 -m pip install --upgrade build
+	python3 -m build
+
+pypipub:
+	python3 -m pip install --user --upgrade twine
+	python3 -m twine upload dist/*
 
 relpatch:
 	$(eval GSTATUS := $(shell git status --porcelain))

docs/img/asn.png

@@ -18,8 +18,10 @@ class Meta:
         fields = ['number', 'id', 'status', 'description', 'site', 'tenant', 'tags']
 
 
-class BGPSessionSerializer(ModelSerializer):
+class BGPSessionSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     status = ChoiceField(choices=SessionStatusChoices, required=False)
+    site = NestedSiteSerializer(required=False, allow_null=True)
+    tenant = NestedTenantSerializer(required=False, allow_null=True)
 
     class Meta:
         model = BGPSession

docs/img/bgp_sess.png

@@ -0,0 +1,43 @@
+# Generated by Django 3.1.3 on 2021-04-21 05:11
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netbox_bgp', '0007_netbox_bgp'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BGPPeerGroup',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('created', models.DateField(auto_now_add=True, null=True)),
+                ('last_updated', models.DateTimeField(auto_now=True, null=True)),
+                ('name', models.CharField(max_length=100)),
+                ('slug', models.SlugField(max_length=100)),
+                ('description', models.CharField(blank=True, max_length=200)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AlterField(
+            model_name='asn',
+            name='number',
+            field=models.PositiveBigIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4294967294)]),
+        ),
+        migrations.AlterField(
+            model_name='community',
+            name='number',
+            field=models.PositiveBigIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4294967294)]),
+        ),
+        migrations.AddField(
+            model_name='bgpsession',
+            name='peer_group',
+            field=models.ManyToManyField(blank=True, null=True, to='netbox_bgp.BGPPeerGroup'),
+        ),
+    ]

docs/img/bgp_sess_list.png

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.3 on 2021-04-21 05:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netbox_bgp', '0008_netbox_bgp'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bgpsession',
+            name='peer_group',
+            field=models.ManyToManyField(blank=True, to='netbox_bgp.BGPPeerGroup'),
+        ),
+    ]

docs/img/commun.png

@@ -77,10 +77,28 @@ def __str__(self):
         return self.name
 
 
+class BGPPeerGroup(ChangeLoggedModel):
+    """
+    """
+    name = models.CharField(
+        max_length=100
+    )
+    slug = models.SlugField(
+        max_length=100
+    )
+    description = models.CharField(
+        max_length=200,
+        blank=True
+    )
+
+    def __str__(self):
+        return self.name
+
+
 class BGPBase(ChangeLoggedModel):
     """
     """
-    number = models.PositiveIntegerField(
+    number = models.PositiveBigIntegerField(
         validators=[MinValueValidator(1), MaxValueValidator(4294967294)],
         null=True,
         blank=True
@@ -221,6 +239,10 @@ class BGPSession(ChangeLoggedModel):
         max_length=200,
         blank=True
     )
+    peer_group = models.ManyToManyField(
+        BGPPeerGroup,
+        blank=True,
+    )
     afi_safi = None  # for future use
     tags = TaggableManager(through=TaggedItem)