Skip to content

Commit

Permalink
Fix policy schema for generic list remote
Browse files Browse the repository at this point in the history
  • Loading branch information
mdellweg committed Jan 6, 2025
1 parent 6b9a035 commit dc902a8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
1 change: 1 addition & 0 deletions pulpcore/app/serializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
)
from .purge import PurgeSerializer
from .repository import (
GenericRemoteSerializer,
RemoteSerializer,
RepositorySerializer,
RepositorySyncURLSerializer,
Expand Down
12 changes: 11 additions & 1 deletion pulpcore/app/serializers/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,9 @@ class RemoteSerializer(ModelSerializer, HiddenFieldsMixin):
)
policy = serializers.ChoiceField(
help_text="The policy to use when downloading content.",
choices=((models.Remote.IMMEDIATE, "When syncing, download all metadata and content now.")),
choices=(
(models.Remote.IMMEDIATE, "When syncing, download all metadata and content now."),
),
default=models.Remote.IMMEDIATE,
)

Expand Down Expand Up @@ -323,6 +325,14 @@ class Meta:
)


class GenericRemoteSerializer(RemoteSerializer):
policy = serializers.ChoiceField(
help_text="The policy to use when downloading content.",
choices=models.Remote.POLICY_CHOICES,
default=models.Remote.IMMEDIATE,
)


class RepositorySyncURLSerializer(ValidateFieldsMixin, serializers.Serializer):
remote = DetailRelatedField(
required=False,
Expand Down
3 changes: 2 additions & 1 deletion pulpcore/app/viewsets/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from pulpcore.app.response import OperationPostponedResponse
from pulpcore.app.serializers import (
AsyncOperationResponseSerializer,
GenericRemoteSerializer,
RemoteSerializer,
RepairSerializer,
RepositorySerializer,
Expand Down Expand Up @@ -330,7 +331,7 @@ class Meta:
class ListRemoteViewSet(NamedModelViewSet, mixins.ListModelMixin):
endpoint_name = "remotes"
queryset = Remote.objects.all()
serializer_class = RemoteSerializer
serializer_class = GenericRemoteSerializer
filterset_class = RemoteFilter

DEFAULT_ACCESS_POLICY = {
Expand Down

0 comments on commit dc902a8

Please sign in to comment.