Skip to content

Commit

Permalink
Merge pull request #106 from k01ek/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
k01ek authored Sep 16, 2022
2 parents 3132f73 + 34e6420 commit e5a930c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PYTHON_VER?=3.8
NETBOX_VER?=v3.2.9
NETBOX_VER?=v3.3.3

NAME=netbox-bgp

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This plugin provide following Models:
* BGP Communities
* BGP Sessions
* Routing Policy
* Prefix Lists (new in 0.7.0)
* Prefix Lists

## Compatibility

Expand All @@ -17,6 +17,7 @@ This plugin provide following Models:
| NetBox 3.0 | 0.4.3 |
| NetBox 3.1 | 0.5.0 |
| NetBox 3.2 | >= 0.6.0 |
| NetBox 3.3 | >= 0.8.1 |

## Installation

Expand Down
2 changes: 1 addition & 1 deletion netbox_bgp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class BGPConfig(PluginConfig):
base_url = 'bgp'
required_settings = []
min_version = '3.2.0'
max_version = '3.2.99'
max_version = '3.3.99'
default_settings = {
'device_ext_page': 'right',
}
Expand Down
10 changes: 8 additions & 2 deletions netbox_bgp/api/serializers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
from rest_framework.serializers import HyperlinkedIdentityField, ValidationError
from rest_framework.relations import PrimaryKeyRelatedField

from netbox.api import ChoiceField, WritableNestedSerializer
# for netbox 3.3
try:
from netbox.api import ChoiceField, WritableNestedSerializer
except ImportError:
from netbox.api.fields import ChoiceField
from netbox.api.serializers.nested import WritableNestedSerializer

from netbox.api.serializers import NetBoxModelSerializer
from dcim.api.nested_serializers import NestedSiteSerializer, NestedDeviceSerializer
from tenancy.api.nested_serializers import NestedTenantSerializer
Expand All @@ -10,7 +16,7 @@

from netbox_bgp.models import (
BGPSession, RoutingPolicy, BGPPeerGroup,
Community, RoutingPolicyRule, PrefixList, PrefixListRule,
Community, RoutingPolicyRule, PrefixList, PrefixListRule,
)

from netbox_bgp.choices import CommunityStatusChoices, SessionStatusChoices
Expand Down
2 changes: 1 addition & 1 deletion netbox_bgp/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.8.0"
__version__ = "0.8.1"

0 comments on commit e5a930c

Please sign in to comment.