Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mutable Prototype #389

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions pulp_ansible/app/tasks/modify.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
from pulpcore.plugin.models import Content, RepositoryVersion

from pulp_ansible.app.models import AnsibleRepository, MutableCollectionMetadata


def add_and_remove(repository_pk, add_content_units, remove_content_units, base_version_pk=None):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Used in synclist - "custom" sync between repositories

"""
Create a new repository version by adding and then removing content units.

Args:
repository_pk (int): The primary key for a Repository for which a new Repository Version
should be created.
add_content_units (list): List of PKs for :class:`~pulpcore.app.Content` that
should be added to the previous Repository Version for this Repository.
remove_content_units (list): List of PKs for:class:`~pulpcore.app.Content` that
should be removed from the previous Repository Version for this Repository.
base_version_pk (int): the primary key for a RepositoryVersion whose content will be used
as the initial set of content for our new RepositoryVersion
"""
repository = AnsibleRepository.objects.get(pk=repository_pk)

if base_version_pk:
base_version = RepositoryVersion.objects.get(pk=base_version_pk)
else:
base_version = None

if "*" in remove_content_units:
latest = repository.latest_version()
if latest:
remove_content_units = latest.content.values_list("pk", flat=True)
else:
remove_content_units = []

to_add = []
with repository.new_version(base_version=base_version) as new_version:
new_version.remove_content(Content.objects.filter(pk__in=remove_content_units))
new_version.add_content(Content.objects.filter(pk__in=add_content_units))

for collection_id, deprecated in MutableCollectionMetadata.objects.filter(
repository_version__repository=repository, collection__versions__in=add_content_units
).values_list("collection_id", "deprecated"):
to_add.append(
MutableCollectionMetadata(
repository_version=new_version,
collection_id=collection_id,
deprecated=deprecated,
)
)

if to_add:
MutableCollectionMetadata.objects.bulk_create(to_add, ignore_conflicts=True)
54 changes: 51 additions & 3 deletions pulp_ansible/app/viewsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
from rest_framework.filters import OrderingFilter
from rest_framework.parsers import FormParser, MultiPartParser

from pulpcore.plugin.actions import ModifyRepositoryActionMixin
from pulpcore.plugin.actions import RepositoryAddRemoveContentSerializer
from pulpcore.plugin.exceptions import DigestValidationError
from pulpcore.plugin.models import PulpTemporaryFile
from pulpcore.plugin.models import Content, PulpTemporaryFile, RepositoryVersion
from pulpcore.plugin.serializers import (
AsyncOperationResponseSerializer,
RepositorySyncURLSerializer,
Expand Down Expand Up @@ -55,6 +55,7 @@
TagSerializer,
)
from .tasks.collections import sync as collection_sync
from .tasks.modify import add_and_remove
from .tasks.roles import synchronize as role_sync


Expand Down Expand Up @@ -205,7 +206,7 @@ class RoleRemoteViewSet(RemoteViewSet):
serializer_class = RoleRemoteSerializer


class AnsibleRepositoryViewSet(RepositoryViewSet, ModifyRepositoryActionMixin):
class AnsibleRepositoryViewSet(RepositoryViewSet):
"""
ViewSet for Ansible Repositories.
"""
Expand Down Expand Up @@ -245,6 +246,53 @@ def sync(self, request, pk):
)
return OperationPostponedResponse(result, request)

@extend_schema(
description="Trigger an asynchronous task to create a new repository version.",
summary="Modify Repository Content",
responses={202: AsyncOperationResponseSerializer},
)
@action(detail=True, methods=["post"], serializer_class=RepositoryAddRemoveContentSerializer)
def modify(self, request, pk):
"""
Queues a task that creates a new RepositoryVersion by adding and removing content units.
"""
add_content_units = []
remove_content_units = []
repository = self.get_object()
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)

if "base_version" in request.data:
base_version_pk = self.get_resource(request.data["base_version"], RepositoryVersion).pk
else:
base_version_pk = None

if "add_content_units" in request.data:
for url in request.data["add_content_units"]:
content = self.get_resource(url, Content)
add_content_units.append(content.pk)

if "remove_content_units" in request.data:
for url in request.data["remove_content_units"]:
if url == "*":
remove_content_units = [url]
break
else:
content = self.get_resource(url, Content)
remove_content_units.append(content.pk)

result = enqueue_with_reservation(
add_and_remove,
[repository],
kwargs={
"repository_pk": pk,
"base_version_pk": base_version_pk,
"add_content_units": add_content_units,
"remove_content_units": remove_content_units,
},
)
return OperationPostponedResponse(result, request)


class AnsibleRepositoryVersionViewSet(RepositoryVersionViewSet):
"""
Expand Down