Renaming _type to pulp_type

ref #5454 https://pulp.plan.io/issues/5454 Required PR: pulp/pulpcore#317 Required PR: pulp/pulpcore-plugin#137 Required PR: pulp/pulp-smash#1220
pulp · Oct 3, 2019 · 61b96b3 · 61b96b3
1 parent 7ad5a68
commit 61b96b3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/CHANGES/5454.feature b/CHANGES/5454.feature
@@ -0,0 +1 @@
+Change `_type` to `pulp_type`
diff --git a/docs/_static/api.json b/docs/_static/api.json
@@ -1271,7 +1271,7 @@
                     "format": "date-time",
                     "readOnly": true
                 },
-                "_type": {
+                "pulp_type": {
                     "title": " type",
                     "type": "string",
                     "readOnly": true,
@@ -1329,7 +1329,7 @@
                     "format": "date-time",
                     "readOnly": true
                 },
-                "_type": {
+                "pulp_type": {
                     "title": " type",
                     "type": "string",
                     "readOnly": true,
@@ -1414,7 +1414,7 @@
                     "format": "date-time",
                     "readOnly": true
                 },
-                "_type": {
+                "pulp_type": {
                     "title": " type",
                     "type": "string",
                     "readOnly": true,
@@ -1693,7 +1693,7 @@
                     "format": "date-time",
                     "readOnly": true
                 },
-                "_type": {
+                "pulp_type": {
                     "title": " type",
                     "type": "string",
                     "readOnly": true,

diff --git a/docs/workflows/sync.rst b/docs/workflows/sync.rst
@@ -44,7 +44,7 @@ Remote GET Response::
        "pulp_created": "2019-09-05T14:29:44.267406Z",
        "pulp_href": "/pulp/api/v3/remotes/docker/docker/1cc699b7-24fd-4944-bde7-86aed8ac12fa/",
        "pulp_last_updated": "2019-09-05T14:29:44.267428Z",
-       "_type": "docker.docker",
+       "pulp_type": "docker.docker",
        "download_concurrency": 20,
        "name": "my-hello-repo",
        "policy": "immediate",

diff --git a/pulp_docker/app/tasks/recursive_add.py b/pulp_docker/app/tasks/recursive_add.py
@@ -55,7 +55,7 @@ def recursive_add_content(repository_pk, content_units):
     latest_version = RepositoryVersion.latest(repository)
     if latest_version:
         tags_in_repo = latest_version.content.filter(
-            _type="docker.tag"
+            pulp_type="docker.tag"
         )
         tags_to_replace = Tag.objects.filter(
             pk__in=tags_in_repo,

diff --git a/pulp_docker/app/tasks/recursive_remove.py b/pulp_docker/app/tasks/recursive_remove.py
@@ -32,12 +32,12 @@ def recursive_remove_content(repository_pk, content_units):
     latest_version = RepositoryVersion.latest(repository)
     latest_content = latest_version.content.all() if latest_version else Content.objects.none()
 
-    tags_in_repo = Q(pk__in=latest_content.filter(_type='docker.tag'))
-    manifests_in_repo = Q(pk__in=latest_content.filter(_type='docker.manifest'))
+    tags_in_repo = Q(pk__in=latest_content.filter(pulp_type='docker.tag'))
+    manifests_in_repo = Q(pk__in=latest_content.filter(pulp_type='docker.manifest'))
     user_provided_content = Q(pk__in=content_units)
     type_manifest_list = Q(media_type=MEDIA_TYPE.MANIFEST_LIST)
     type_manifest = Q(media_type__in=[MEDIA_TYPE.MANIFEST_V1, MEDIA_TYPE.MANIFEST_V2])
-    blobs_in_repo = Q(pk__in=latest_content.filter(_type='docker.blob'))
+    blobs_in_repo = Q(pk__in=latest_content.filter(pulp_type='docker.blob'))
 
     # Tags do not have must_remain because they are the highest level content.
     tags_to_remove = Tag.objects.filter(user_provided_content & tags_in_repo)

diff --git a/pulp_docker/app/tasks/untag.py b/pulp_docker/app/tasks/untag.py
@@ -10,7 +10,7 @@ def untag_image(tag, repository_pk):
     latest_version = RepositoryVersion.latest(repository)
 
     tags_in_latest_repository = latest_version.content.filter(
-        _type="docker.tag"
+        pulp_type="docker.tag"
     )
 
     tags_to_remove = Tag.objects.filter(

diff --git a/pulp_docker/app/viewsets.py b/pulp_docker/app/viewsets.py
@@ -316,7 +316,7 @@ def create(self, request):
         source_latest = serializer.validated_data['source_repository_version']
         destination = serializer.validated_data['destination_repository']
         content_tags_in_repo = source_latest.content.filter(
-            _type="docker.tag"
+            pulp_type="docker.tag"
         )
         tags_in_repo = models.Tag.objects.filter(
             pk__in=content_tags_in_repo,
@@ -357,7 +357,7 @@ def create(self, request):
         source_latest = serializer.validated_data['source_repository_version']
         destination = serializer.validated_data['destination_repository']
         content_manifests_in_repo = source_latest.content.filter(
-            _type="docker.manifest"
+            pulp_type="docker.manifest"
         )
         manifests_in_repo = models.Manifest.objects.filter(
             pk__in=content_manifests_in_repo,