Enable user to filter tasks by created_resources #229

lubosmj · 2019-07-23T15:45:06Z

closes #4931
https://pulp.plan.io/issues/4931

codecov · 2019-07-23T15:58:31Z

Codecov Report

Merging #229 into master will increase coverage by 0.07%.
The diff coverage is 89.65%.

@@            Coverage Diff             @@
##           master     #229      +/-   ##
==========================================
+ Coverage   67.66%   67.74%   +0.07%     
==========================================
  Files          69       69              
  Lines        3272     3289      +17     
==========================================
+ Hits         2214     2228      +14     
- Misses       1058     1061       +3

Impacted Files	Coverage Δ
pulpcore/app/viewsets/task.py	`93.58% <100%> (+0.08%)`	⬆️
pulpcore/app/viewsets/custom_filters.py	`92.66% <89.28%> (-1.17%)`	⬇️
pulpcore/app/models/base.py	`73.58% <0%> (-3.34%)`	⬇️
pulpcore/app/serializers/repository.py	`97.64% <0%> (-1.18%)`	⬇️
pulpcore/app/viewsets/repository.py	`98.58% <0%> (-0.71%)`	⬇️
pulpcore/content/handler.py	`62.76% <0%> (+0.53%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dd3ba8d...b96864d. Read the comment docs.

nixocio · 2019-08-13T13:12:38Z

pulpcore/tests/functional/api/test_tasks.py

+
+
+class FilterTaskCreatedResourcesTestCase(unittest.TestCase):
+    """Perform filtering over reserved resources."""


Suggested change

"""Perform filtering over reserved resources."""

"""Perform filtering over created resources."""

nixocio · 2019-08-13T13:47:24Z

pulpcore/tests/functional/api/test_tasks.py

+
+
+class FilterTaskCreatedResourcesContentTestCase(unittest.TestCase):
+    """Perform filtering for contents of created resources."""


If this work has a related pulp.plan.io issue it would be nice to add as part of the docstring. It is very helpful later on.

Suggested change

"""Perform filtering for contents of created resources."""

"""Perform filtering for contents of created resources.

This test targets the following issue:

* `Pulp #xxx <https://pulp.plan.io/issues/xxxx>`

"""

nixocio · 2019-08-13T13:53:01Z

pulpcore/tests/functional/api/test_tasks.py

+        cls.client = api.Client(config.get_config(), api.page_handler)
+
+        cls.repository = cls.client.post(REPO_PATH, gen_repo())
+        response = cls.client.post(cls.repository['_versions_href'])


That is interesting. Goal here is to create a task. But I was expecting to be necessary to pass a few parameters to this endpoint: add_content_units, remove_content_units, or base_path. It seems that they are not mandatory.

https://docs.pulpproject.org/en/3.0/nightly/restapi.html#operation/repositories_versions_list

nixocio · 2019-08-13T13:54:08Z

pulpcore/tests/functional/api/test_tasks.py

+            'created_resources': self.task['created_resources'][0]
+        }
+        results = self.client.get(TASKS_PATH, params=filter_params)
+        self.assertEqual(len(results), 1)


Suggested change

self.assertEqual(len(results), 1)

self.assertEqual(len(results), 1, results)

ipanova · 2019-08-13T14:50:36Z

pulpcore/app/viewsets/task.py

@@ -28,6 +32,7 @@ class TaskFilter(BaseFilterSet):
    started_at = IsoDateTimeFilter(field_name='started_at')
    finished_at = IsoDateTimeFilter(field_name='finished_at')
    parent = HyperlinkRelatedFilter()
+    created_resources = RepositoryGenericRelationFilter()


created resources can be not only repository versions but many other things like distributions, content, etc

$ http GET :24817/pulp/api/v3/tasks/?created_resources=/pulp/api/v3/distributions/docker/docker/ac1cbc69-1b1b-4108-90cd-45952dc2d60e/ HTTP/1.1 400 Bad Request Allow: GET, HEAD, OPTIONS Connection: close Content-Length: 97 Content-Type: application/json Date: Tue, 13 Aug 2019 14:51:16 GMT Server: gunicorn/19.9.0 Vary: Accept, Cookie X-Frame-Options: SAMEORIGIN [ "URI not valid: /pulp/api/v3/distributions/docker/docker/ac1cbc69-1b1b-4108-90cd-45952dc2d60e/" ]

ipanova

the filter needs to be extended to other resources that repo version

asmacdo · 2019-08-21T17:56:51Z

pulpcore/app/viewsets/custom_filters.py

+        Loop through the QuerySet and retrieve objects from a database which
+        are matching a type and a URI of a corresponding created resource.
+        """
+        for task in qs:


Heres another pattern we can try:

from django.urls import resolve match = resolve("/pulp/api/v3/repositories/38f857e4-92c5-4550-a087-7ce1a37f58a9/versions/1/") match.func.cls.get_resource( "/pulp/api/v3/repositories/38f857e4-92c5-4550-a087-7ce1a37f58a9/versions/1/", match.func.cls.queryset.model )

Out: <Repository: 3e361f06-b81a-4c15-92af-3715d72d91a4; Version: 1>

Which can be trimmed:

match = resolve(value) return NamedModelViewSet.get_resource(value, match.func.cls.queryset.model)

It looks great! Will it work in every scenario, like filtering distributions, contents, repository versions, and so on?

I will definitely give it a try tomorrow. Thank you!

It should, but I only tried it with repo versions because I had some lying around.

I have tested it manually and it seems to be working fine.

closes pulp#4931 https://pulp.plan.io/issues/4931

ipanova

it works! thank you 🍺

lubosmj force-pushed the created-res-filter-4931 branch from 70b6cf1 to 5f2ed8f Compare August 12, 2019 15:19

lubosmj requested a review from a team August 12, 2019 15:19

nixocio reviewed Aug 13, 2019

View reviewed changes

lubosmj force-pushed the created-res-filter-4931 branch from 5f2ed8f to 7d75eb7 Compare August 13, 2019 13:24

nixocio reviewed Aug 13, 2019

View reviewed changes

ipanova reviewed Aug 13, 2019

View reviewed changes

ipanova requested changes Aug 13, 2019

View reviewed changes

lubosmj force-pushed the created-res-filter-4931 branch 2 times, most recently from bc1489f to a169fe9 Compare August 14, 2019 18:09

lubosmj mentioned this pull request Aug 16, 2019

Assert added contents instead of created resources pulp/pulp_docker#402

Merged

lubosmj force-pushed the created-res-filter-4931 branch 2 times, most recently from f89b220 to f5d6416 Compare August 21, 2019 15:57

asmacdo reviewed Aug 21, 2019

View reviewed changes

lubosmj force-pushed the created-res-filter-4931 branch 5 times, most recently from a10bbb8 to b96864d Compare August 22, 2019 10:23

Enable user to filter tasks by created_resources

2ed3ed0

closes pulp#4931 https://pulp.plan.io/issues/4931

lubosmj force-pushed the created-res-filter-4931 branch from b96864d to 2ed3ed0 Compare August 22, 2019 10:35

ipanova approved these changes Aug 22, 2019

View reviewed changes

ipanova merged commit 62ee868 into pulp:master Aug 22, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable user to filter tasks by created_resources #229

Enable user to filter tasks by created_resources #229

lubosmj commented Jul 23, 2019

codecov bot commented Jul 23, 2019 •

edited

Loading

nixocio Aug 13, 2019

nixocio Aug 13, 2019

nixocio Aug 13, 2019

nixocio Aug 13, 2019

ipanova Aug 13, 2019

ipanova Aug 13, 2019

ipanova left a comment

asmacdo Aug 21, 2019

asmacdo Aug 21, 2019

lubosmj Aug 21, 2019 •

edited

Loading

asmacdo Aug 21, 2019

lubosmj Aug 22, 2019

ipanova left a comment



		class FilterTaskCreatedResourcesTestCase(unittest.TestCase):
		"""Perform filtering over reserved resources."""

	"""Perform filtering over reserved resources."""
	"""Perform filtering over created resources."""



		class FilterTaskCreatedResourcesContentTestCase(unittest.TestCase):
		"""Perform filtering for contents of created resources."""

	self.assertEqual(len(results), 1)
	self.assertEqual(len(results), 1, results)

Enable user to filter tasks by created_resources #229

Enable user to filter tasks by created_resources #229

Conversation

lubosmj commented Jul 23, 2019

codecov bot commented Jul 23, 2019 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ipanova left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lubosmj Aug 21, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ipanova left a comment

Choose a reason for hiding this comment

codecov bot commented Jul 23, 2019 •

edited

Loading

lubosmj Aug 21, 2019 •

edited

Loading