From 927c012fc9f8b625642aeecabd5989bb909f6c3c Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Thu, 4 Jun 2020 09:34:22 -0500 Subject: [PATCH 1/2] #4674 - Fix available-ips and available-prefixes swagger definitions --- netbox/ipam/api/views.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index dd3652b1f..70065fd96 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -74,12 +74,8 @@ class PrefixViewSet(CustomFieldModelViewSet): serializer_class = serializers.PrefixSerializer filterset_class = filters.PrefixFilterSet - @swagger_auto_schema( - methods=['get', 'post'], - responses={ - 200: serializers.AvailablePrefixSerializer(many=True), - } - ) + @swagger_auto_schema(method='get', responses={200: serializers.AvailablePrefixSerializer(many=True)}) + @swagger_auto_schema(method='post', responses={201: serializers.AvailablePrefixSerializer(many=False)}) @action(detail=True, url_path='available-prefixes', methods=['get', 'post']) @advisory_lock(ADVISORY_LOCK_KEYS['available-prefixes']) def available_prefixes(self, request, pk=None): @@ -158,12 +154,9 @@ class PrefixViewSet(CustomFieldModelViewSet): return Response(serializer.data) - @swagger_auto_schema( - methods=['get', 'post'], - responses={ - 200: serializers.AvailableIPSerializer(many=True), - } - ) + @swagger_auto_schema(method='get', responses={200: serializers.AvailableIPSerializer(many=True)}) + @swagger_auto_schema(method='post', responses={201: serializers.AvailableIPSerializer(many=False)}, + request_body=serializers.AvailableIPSerializer(many=False)) @action(detail=True, url_path='available-ips', methods=['get', 'post']) @advisory_lock(ADVISORY_LOCK_KEYS['available-ips']) def available_ips(self, request, pk=None): From 5330914431a0367ab6e65205b6edcf0daa0c6549 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Thu, 4 Jun 2020 09:42:00 -0500 Subject: [PATCH 2/2] #4674 - Correct many=False to many=True on the response serializers --- netbox/ipam/api/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index 70065fd96..076e1f86f 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -75,7 +75,7 @@ class PrefixViewSet(CustomFieldModelViewSet): filterset_class = filters.PrefixFilterSet @swagger_auto_schema(method='get', responses={200: serializers.AvailablePrefixSerializer(many=True)}) - @swagger_auto_schema(method='post', responses={201: serializers.AvailablePrefixSerializer(many=False)}) + @swagger_auto_schema(method='post', responses={201: serializers.AvailablePrefixSerializer(many=True)}) @action(detail=True, url_path='available-prefixes', methods=['get', 'post']) @advisory_lock(ADVISORY_LOCK_KEYS['available-prefixes']) def available_prefixes(self, request, pk=None): @@ -155,7 +155,7 @@ class PrefixViewSet(CustomFieldModelViewSet): return Response(serializer.data) @swagger_auto_schema(method='get', responses={200: serializers.AvailableIPSerializer(many=True)}) - @swagger_auto_schema(method='post', responses={201: serializers.AvailableIPSerializer(many=False)}, + @swagger_auto_schema(method='post', responses={201: serializers.AvailableIPSerializer(many=True)}, request_body=serializers.AvailableIPSerializer(many=False)) @action(detail=True, url_path='available-ips', methods=['get', 'post']) @advisory_lock(ADVISORY_LOCK_KEYS['available-ips'])