Use general_multi_delete from core.

closes #9562 https://pulp.plan.io/issues/9562
pulp · Nov 11, 2021 · b0231b2 · b0231b2
1 parent d6167a7
commit b0231b2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 29 deletions.
diff --git a/CHANGES/9562.misc b/CHANGES/9562.misc
@@ -0,0 +1 @@
+Use general_multi_delete from pulpcore.plugin.tasking
diff --git a/pulp_container/app/tasks/__init__.py b/pulp_container/app/tasks/__init__.py
@@ -1,4 +1,3 @@
-from .base import general_multi_delete  # noqa
 from .builder import build_image_from_containerfile  # noqa
 from .recursive_add import recursive_add_content  # noqa
 from .recursive_remove import recursive_remove_content  # noqa

diff --git a/pulp_container/app/tasks/base.py b/pulp_container/app/tasks/base.py
diff --git a/pulp_container/app/viewsets.py b/pulp_container/app/viewsets.py
@@ -28,7 +28,7 @@
     RepositorySyncURLSerializer,
 )
 from pulpcore.plugin.models import Artifact, Content
-from pulpcore.plugin.tasking import dispatch
+from pulpcore.plugin.tasking import dispatch, general_multi_delete
 from pulpcore.plugin.viewsets import (
     AsyncUpdateMixin,
     DistributionViewSet,
@@ -1222,7 +1222,7 @@ def destroy(self, request, pk, **kwargs):
             )
 
         async_result = dispatch(
-            tasks.general_multi_delete, exclusive_resources=reservations, args=(instance_ids,)
+            general_multi_delete, exclusive_resources=reservations, args=(instance_ids,)
         )
         return OperationPostponedResponse(async_result, request)
 
@@ -1392,6 +1392,6 @@ def destroy(self, request, pk, **kwargs):
             (str(namespace.pk), "container", "ContainerNamespaceSerializer"),
         )
         async_result = dispatch(
-            tasks.general_multi_delete, exclusive_resources=reservations, args=(instance_ids,)
+            general_multi_delete, exclusive_resources=reservations, args=(instance_ids,)
         )
         return OperationPostponedResponse(async_result, request)