Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile-diode-netbox-plugin
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM netboxcommunity/netbox:v4.1.11-3.0.2
FROM netboxcommunity/netbox:v4.2.3-3.1.1

COPY ./netbox/configuration/ /etc/netbox/config/
RUN chmod 755 /etc/netbox/config/* && \
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: diode-netbox-plugin
services:
netbox: &netbox
image: netboxcommunity/netbox:v4.1.11-3.0.2-diode-netbox-plugin
image: netboxcommunity/netbox:v4.2.3-3.1.1-diode-netbox-plugin
build:
context: .
dockerfile: Dockerfile-diode-netbox-plugin
Expand Down
3 changes: 3 additions & 0 deletions netbox-plugin.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
version: 0.1
package_name: netboxlabs-diode-netbox-plugin
compatibility:
- release: 0.7.0
netbox_min: 4.2.3
netbox_max: 4.2.3
- release: 0.6.0
netbox_min: 4.1.0
netbox_max: 4.1.3
Expand Down
2 changes: 1 addition & 1 deletion netbox_diode_plugin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class NetBoxDiodePluginConfig(PluginConfig):
description = "Diode plugin for NetBox."
version = version_semver()
base_url = "diode"
min_version = "3.7.2"
min_version = "4.2.3"
default_settings = {
# Auto-provision users for Diode plugin
"auto_provision_users": False,
Expand Down
34 changes: 30 additions & 4 deletions netbox_diode_plugin/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,27 @@ class Meta:
class DiodePrefixSerializer(PrefixSerializer):
"""Diode Prefix Serializer."""

site = DiodeSiteSerializer()
status = serializers.CharField()
site = serializers.SerializerMethodField(read_only=True)

class Meta:
"""Meta class."""

model = PrefixSerializer.Meta.model
fields = PrefixSerializer.Meta.fields
fields = PrefixSerializer.Meta.fields + ["site"]

def get_site(self, obj):
"""Get the site from the instance scope."""
if obj.scope is None:
return None

scope_model_meta = obj.scope_type.model_class()._meta
if scope_model_meta.app_label == "dcim" and scope_model_meta.model_name == "site":
serializer = get_serializer_for_model(obj.scope)
context = {'request': self.context['request']}
return serializer(obj.scope, nested=True, context=context).data

return None


class DiodeClusterGroupSerializer(ClusterGroupSerializer):
Expand Down Expand Up @@ -311,13 +324,26 @@ class DiodeClusterSerializer(ClusterSerializer):
type = DiodeClusterTypeSerializer()
group = DiodeClusterGroupSerializer()
status = serializers.CharField()
site = DiodeSiteSerializer()
site = serializers.SerializerMethodField(read_only=True)

class Meta:
"""Meta class."""

model = ClusterSerializer.Meta.model
fields = ClusterSerializer.Meta.fields
fields = ClusterSerializer.Meta.fields + ["site"]

def get_site(self, obj):
"""Get the site from the instance scope."""
if obj.scope is None:
return None

scope_model_meta = obj.scope_type.model_class()._meta
if scope_model_meta.app_label == "dcim" and scope_model_meta.model_name == "site":
serializer = get_serializer_for_model(obj.scope)
context = {'request': self.context['request']}
return serializer(obj.scope, nested=True, context=context).data

return None


class DiodeVirtualMachineSerializer(VirtualMachineSerializer):
Expand Down
Loading