mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Improve script output serialization

Browse Source
This commit is contained in:
Jeremy Stretch
2019-10-29 16:17:59 -04:00
parent 1cfb8aea23
commit 93d28e6a72
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/extras/api/serializers.py
View File

@ -230,6 +230,22 @@ class ScriptInputSerializer(serializers.Serializer):
commit = serializers.BooleanField() commit = serializers.BooleanField()
class ScriptLogMessageSerializer(serializers.Serializer):
status = serializers.SerializerMethodField(read_only=True)
message = serializers.SerializerMethodField(read_only=True)
def get_status(self, instance):
return LOG_LEVEL_CODES.get(instance[0])
def get_message(self, instance):
return instance[1]
class ScriptOutputSerializer(serializers.Serializer):
log = ScriptLogMessageSerializer(many=True, read_only=True)
output = serializers.CharField(read_only=True)
# #
# Change logging # Change logging
# #

13
netbox/extras/api/views.py
View File

@ -262,13 +262,16 @@ class ScriptViewSet(ViewSet):
Run a Script identified as "<module>.<script>". Run a Script identified as "<module>.<script>".
""" """
script = self._get_script(pk)() script = self._get_script(pk)()
serializer = serializers.ScriptInputSerializer(data=request.data) input_serializer = serializers.ScriptInputSerializer(data=request.data)
if serializer.is_valid(): if input_serializer.is_valid():
script.run(serializer.data['data']) output = script.run(input_serializer.data['data'])
return Response(script.log) script.output = output
output_serializer = serializers.ScriptOutputSerializer(script)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) return Response(output_serializer.data)
return Response(input_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
# #