From a06fd2813f5b709eadaf80c0fcd9debd39de7fca Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Fri, 22 Feb 2019 13:59:14 -0500 Subject: [PATCH] Remove unused code and variables out of serializers - logging: we don't actually log anything here, we can add it back later if we do log anything - Remove FileContentSerializer, we don't use that anywhere. We use the FileSerializer. - Remove support for POSTing basically an entire playbook in one shot. We don't use this and it is probably not a realistic use of the endpoint. Change-Id: I8a5820442dff3237e4af90327867637e4b912a9d --- ara/api/serializers.py | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/ara/api/serializers.py b/ara/api/serializers.py index a86403c7..13427b14 100644 --- a/ara/api/serializers.py +++ b/ara/api/serializers.py @@ -15,16 +15,10 @@ # You should have received a copy of the GNU General Public License # along with ARA. If not, see . -import logging - from rest_framework import serializers from ara.api import fields as ara_fields, models -DATE_FORMAT = "(iso-8601: 2016-05-06T17:20:25.749489-04:00)" -DURATION_FORMAT = "([DD] [HH:[MM:]]ss[.uuuuuu])" -logger = logging.getLogger("ara.api.serializers") - class DurationSerializer(serializers.ModelSerializer): """ @@ -43,12 +37,6 @@ class DurationSerializer(serializers.ModelSerializer): return obj.ended - obj.started -class FileContentSerializer(serializers.ModelSerializer): - class Meta: - model = models.FileContent - fields = "__all__" - - class FileSerializer(serializers.ModelSerializer): class Meta: model = models.File @@ -154,26 +142,9 @@ class PlaybookSerializer(DurationSerializer): fields = "__all__" arguments = ara_fields.CompressedObjectField(default=ara_fields.EMPTY_DICT) - files = FileSerializer(many=True, default=[]) - hosts = HostSerializer(many=True, default=[]) - labels = LabelSerializer(many=True, default=[]) + files = FileSerializer(many=True, read_only=True, default=[]) + hosts = HostSerializer(many=True, read_only=True, default=[]) + labels = LabelSerializer(many=True, read_only=True, default=[]) tasks = SimpleTaskSerializer(many=True, read_only=True, default=[]) plays = SimplePlaySerializer(many=True, read_only=True, default=[]) records = RecordSerializer(many=True, read_only=True, default=[]) - - def create(self, validated_data): - # Create the playbook without the file and label references for now - files = validated_data.pop("files") - hosts = validated_data.pop("hosts") - labels = validated_data.pop("labels") - playbook = models.Playbook.objects.create(**validated_data) - - # Add the files, hosts and the labels in - for file_ in files: - playbook.hosts.add(models.File.objects.create(**file_)) - for host in hosts: - playbook.hosts.add(models.Host.objects.create(**host)) - for label in labels: - playbook.labels.add(models.Label.objects.create(**label)) - - return playbook