Merge pull request #10 from k01ek/develop

Develop

Author: k01ek

.github/workflows/pub-pypi.yml

@@ -0,0 +1,35 @@
+name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build-n-publish:
+    name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@main
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.7
+    - name: Install pypa/build
+      run: >-
+        python -m
+        pip install
+        build
+        --user
+    - name: Build a binary wheel and a source tarball
+      run: >-
+        python -m
+        build
+        --sdist
+        --wheel
+        --outdir dist/
+        .
+    - name: Publish distribution 📦 to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

Makefile

@@ -1,5 +1,5 @@
 PYTHON_VER?=3.7
-NETBOX_VER?=v2.10.3
+NETBOX_VER?=v2.11.1
 
 NAME=netbox-bgp
 
@@ -47,12 +47,12 @@ makemigrations:
 	run netbox python manage.py makemigrations --name ${BUILD_NAME}
 	docker-compose -f ${COMPOSE_FILE} -p ${BUILD_NAME} down
 
-build:
+pbuild:
 	python3 -m pip install --upgrade build
 	python3 -m build
 
 pypipub:
-	python3 -m pip install --user --upgrade twine
+	python3 -m pip install --upgrade twine
 	python3 -m twine upload dist/*
 
 relpatch:

netbox_bgp/api/serializers.py

@@ -1,13 +1,55 @@
-from rest_framework.serializers import ModelSerializer
+from rest_framework.serializers import Serializer, HyperlinkedIdentityField
 
-from netbox.api import ChoiceField
+from netbox.api import ChoiceField, WritableNestedSerializer
 from dcim.api.nested_serializers import NestedSiteSerializer
 from tenancy.api.nested_serializers import NestedTenantSerializer
-from extras.api.serializers import TaggedObjectSerializer
-from extras.api.customfields import CustomFieldModelSerializer
+
+try:
+    from extras.api.customfields import CustomFieldModelSerializer
+except ImportError:
+    from netbox.api.serializers import CustomFieldModelSerializer
+
+from extras.models import Tag
 from netbox_bgp.models import ASN, ASNStatusChoices, BGPSession, SessionStatusChoices
 
 
+class NestedTagSerializer(WritableNestedSerializer):
+    url = HyperlinkedIdentityField(view_name='extras-api:tag-detail')
+
+    class Meta:
+        model = Tag
+        fields = ['id', 'url', 'name', 'slug', 'color']
+
+
+class TaggedObjectSerializer(Serializer):
+    tags = NestedTagSerializer(many=True, required=False)
+
+    def create(self, validated_data):
+        tags = validated_data.pop('tags', None)
+        instance = super().create(validated_data)
+
+        if tags is not None:
+            return self._save_tags(instance, tags)
+        return instance
+
+    def update(self, instance, validated_data):
+        tags = validated_data.pop('tags', None)
+        # Cache tags on instance for change logging
+        instance._tags = tags or []
+
+        instance = super().update(instance, validated_data)
+        if tags is not None:
+            return self._save_tags(instance, tags)
+        return instance
+
+    def _save_tags(self, instance, tags):
+        if tags:
+            instance.tags.set(*[t.name for t in tags])
+        else:
+            instance.tags.clear()
+        return instance
+
+
 class ASNSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     status = ChoiceField(choices=ASNStatusChoices, required=False)
     site = NestedSiteSerializer(required=False, allow_null=True)

netbox_bgp/migrations/0010_netbox_bgp.py

@@ -0,0 +1,48 @@
+# Generated by Django 3.2 on 2021-04-23 05:03
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netbox_bgp', '0009_netbox_bgp'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asn',
+            name='id',
+            field=models.BigAutoField(primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='asngroup',
+            name='id',
+            field=models.BigAutoField(primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='bgppeergroup',
+            name='id',
+            field=models.BigAutoField(primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='bgpsession',
+            name='id',
+            field=models.BigAutoField(primary_key=True, serialize=False),
+        ),
+        migrations.RemoveField(
+            model_name='bgpsession',
+            name='peer_group',
+        ),
+        migrations.AddField(
+            model_name='bgpsession',
+            name='peer_group',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='netbox_bgp.bgppeergroup'),
+        ),
+        migrations.AlterField(
+            model_name='community',
+            name='id',
+            field=models.BigAutoField(primary_key=True, serialize=False),
+        ),
+    ]

netbox_bgp/models.py

@@ -5,7 +5,11 @@
 
 from utilities.choices import ChoiceSet
 from utilities.querysets import RestrictedQuerySet
-from extras.models import ChangeLoggedModel, TaggedItem
+try:
+    from extras.models import ChangeLoggedModel
+except ImportError:
+    from netbox.models import ChangeLoggedModel
+from extras.models import TaggedItem
 from extras.utils import extras_features
 
 
@@ -239,9 +243,11 @@ class BGPSession(ChangeLoggedModel):
         max_length=200,
         blank=True
     )
-    peer_group = models.ManyToManyField(
+    peer_group = models.ForeignKey(
         BGPPeerGroup,
+        on_delete=models.SET_NULL,
         blank=True,
+        null=True
     )
     afi_safi = None  # for future use
     tags = TaggableManager(through=TaggedItem)

netbox_bgp/tables.py

@@ -1,15 +1,18 @@
 import django_tables2 as tables
 from django.utils.safestring import mark_safe
 
-from utilities.tables import (
-    BaseTable, ChoiceFieldColumn, ToggleColumn,
-)
-
-from tenancy.tables import COL_TENANT
+from utilities.tables import BaseTable, ChoiceFieldColumn, ToggleColumn
 
 from .models import ASN, Community, BGPSession
 
 AVAILABLE_LABEL = mark_safe('<span class="label label-success">Available</span>')
+COL_TENANT = """
+ {% if record.tenant %}
+     <a href="{{ record.tenant.get_absolute_url }}" title="{{ record.tenant.description }}">{{ record.tenant }}</a>
+ {% else %}
+     &mdash;
+ {% endif %}
+ """
 
 
 class ASNTable(BaseTable):

netbox_bgp/templates/netbox_bgp/asn.html

@@ -50,7 +50,13 @@
     {% endif %}    
 </div>
 <h1>{% block title %}AS{{ object }}{% endblock %}</h1>
-{% include 'inc/created_updated.html' %}
+<p>
+    <small class="text-muted">
+      Created {{ object.created }} &middot;
+      Updated <span title="{{ object.last_updated }}">{{ object.last_updated|timesince }}</span> ago
+    </small>
+    <span class="label label-default">{{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}</span>
+</p>
 <div class="pull-right noprint">
     {% custom_links object %}
 </div>

netbox_bgp/templates/netbox_bgp/bgpsession.html

@@ -50,7 +50,13 @@
     {% endif %}
 </div>
 <h1>{% block title %}BGP Session {{ object }}{% endblock %}</h1>
-{% include 'inc/created_updated.html' %}
+<p>
+    <small class="text-muted">
+      Created {{ object.created }} &middot;
+      Updated <span title="{{ object.last_updated }}">{{ object.last_updated|timesince }}</span> ago
+    </small>
+    <span class="label label-default">{{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}</span>
+</p>
 <div class="pull-right noprint">
     {% custom_links object %}
 </div>

netbox_bgp/templates/netbox_bgp/community.html

@@ -50,7 +50,13 @@
     {% endif %}    
 </div>
 <h1>{% block title %}{{ object }}{% endblock %}</h1>
-{% include 'inc/created_updated.html' %}
+<p>
+    <small class="text-muted">
+      Created {{ object.created }} &middot;
+      Updated <span title="{{ object.last_updated }}">{{ object.last_updated|timesince }}</span> ago
+    </small>
+    <span class="label label-default">{{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}</span>
+</p>
 <div class="pull-right noprint">
     {% custom_links object %}
 </div>

netbox_bgp/version.py

@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.2.0"