Merge branch 'develop' into develop-2.7

2020-01-09 15:27:06 -05:00
parent 1d3651e255 6019260374
commit a2ead6af94
38 changed files with 4690 additions and 403 deletions
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -412,6 +412,10 @@ class DeviceWithConfigContextSerializer(DeviceSerializer):
        return obj.get_config_context()


+class DeviceNAPALMSerializer(serializers.Serializer):
+    method = serializers.DictField()
+
+
 class ConsoleServerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
    device = NestedDeviceSerializer()
    type = ChoiceField(