Add Domain support.

closes #3008 (based on PR #2920) Co-authored by: Grant Gainey <ggainey@redhat.com>
pulp · Apr 17, 2023 · e54ae55 · e54ae55
1 parent 2ed7370
commit e54ae55
Show file tree

Hide file tree

Showing 22 changed files with 330 additions and 71 deletions.
diff --git a/CHANGES/3008.feature b/CHANGES/3008.feature
@@ -0,0 +1 @@
+Added support for Domains.
diff --git a/pulp_rpm/app/__init__.py b/pulp_rpm/app/__init__.py
@@ -10,3 +10,4 @@ class PulpRpmPluginAppConfig(PulpPluginAppConfig):
     label = "rpm"
     version = "3.20.0.dev"
     python_package_name = "pulp-rpm"
+    domain_compatible = True
diff --git a/pulp_rpm/app/migrations/0049_domains.py b/pulp_rpm/app/migrations/0049_domains.py
@@ -0,0 +1,115 @@
+# Generated by Django 3.2.18 on 2023-04-05 16:39
+
+from django.db import migrations, models
+import django.db.models.deletion
+import pulpcore.app.util
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0102_add_domain_relations'),
+        ('rpm', '0048_artifacts_dependencies_fix'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='distributiontree',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_distributiontree', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='modulemd',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_modulemd', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='modulemddefaults',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_modulemddefaults', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='modulemdobsolete',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_modulemdobsolete', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='package',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_package', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='packagecategory',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_packagecategory', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='packageenvironment',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_packageenvironment', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='packagegroup',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_packagegroup', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='packagelangpacks',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_packagelangpacks', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='repometadatafile',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_repometadatafile', to='core.domain'),
+        ),
+        migrations.AddField(
+            model_name='updaterecord',
+            name='_pulp_domain',
+            field=models.ForeignKey(default=pulpcore.app.util.get_domain_pk, on_delete=django.db.models.deletion.PROTECT, related_name='rpm_updaterecord', to='core.domain'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='distributiontree',
+            unique_together={('_pulp_domain', 'digest')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='modulemd',
+            unique_together={('_pulp_domain', 'name', 'stream', 'version', 'context', 'arch')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='modulemddefaults',
+            unique_together={('_pulp_domain', 'digest')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='modulemdobsolete',
+            unique_together={('_pulp_domain', 'modified', 'module_name', 'module_stream')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='package',
+            unique_together={('_pulp_domain', 'name', 'epoch', 'version', 'release', 'arch', 'checksum_type', 'pkgId')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='packagecategory',
+            unique_together={('_pulp_domain', 'digest')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='packageenvironment',
+            unique_together={('_pulp_domain', 'digest')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='packagegroup',
+            unique_together={('_pulp_domain', 'digest')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='packagelangpacks',
+            unique_together={('_pulp_domain', 'digest')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='repometadatafile',
+            unique_together={('_pulp_domain', 'data_type', 'checksum', 'relative_path')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='updaterecord',
+            unique_together={('_pulp_domain', 'digest')},
+        ),
+    ]
diff --git a/pulp_rpm/app/models/advisory.py b/pulp_rpm/app/models/advisory.py
@@ -8,6 +8,7 @@
     BaseModel,
     Content,
 )
+from pulpcore.plugin.util import get_domain_pk
 
 from pulp_rpm.app.constants import (
     CR_UPDATE_COLLECTION_ATTRS,
@@ -102,6 +103,8 @@ class UpdateRecord(Content):
     # UpdateCollection or UpdateCollectionPackage.
     digest = models.TextField(unique=True)
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     @classmethod
     def natural_key_fields(cls):
         """
@@ -228,6 +231,7 @@ def get_module_list(self):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        unique_together = ("_pulp_domain", "digest")
 
 
 class UpdateCollection(BaseModel):

diff --git a/pulp_rpm/app/models/comps.py b/pulp_rpm/app/models/comps.py
@@ -5,6 +5,7 @@
 from django.db import models
 
 from pulpcore.plugin.models import Content
+from pulpcore.plugin.util import get_domain_pk
 
 from pulp_rpm.app.constants import (
     LIBCOMPS_CATEGORY_ATTRS,
@@ -77,8 +78,11 @@ class PackageGroup(Content):
 
     repo_key_fields = ("id",)
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        unique_together = ("_pulp_domain", "digest")
 
     @classmethod
     def natural_key_fields(cls):
@@ -234,8 +238,11 @@ class PackageCategory(Content):
 
     repo_key_fields = ("id",)
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        unique_together = ("_pulp_domain", "digest")
 
     @classmethod
     def natural_key_fields(cls):
@@ -361,8 +368,11 @@ class PackageEnvironment(Content):
 
     repo_key_fields = ("id",)
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        unique_together = ("_pulp_domain", "digest")
 
     @classmethod
     def natural_key_fields(cls):
@@ -465,8 +475,11 @@ class PackageLangpacks(Content):
 
     digest = models.TextField(unique=True)
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        unique_together = ("_pulp_domain", "digest")
 
     @classmethod
     def natural_key_fields(cls):

diff --git a/pulp_rpm/app/models/custom_metadata.py b/pulp_rpm/app/models/custom_metadata.py
@@ -3,6 +3,7 @@
 from django.db import models
 
 from pulpcore.plugin.models import Content
+from pulpcore.plugin.util import get_domain_pk
 from pulp_rpm.app.constants import CHECKSUM_CHOICES
 
 log = getLogger(__name__)
@@ -32,9 +33,11 @@ class RepoMetadataFile(Content):
 
     repo_key_fields = ("data_type",)
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = ("data_type", "checksum", "relative_path")
+        unique_together = ("_pulp_domain", "data_type", "checksum", "relative_path")
 
     @property
     def unsupported_metadata_type(self):

diff --git a/pulp_rpm/app/models/distribution.py b/pulp_rpm/app/models/distribution.py
@@ -12,6 +12,7 @@
     ContentArtifact,
     Repository,
 )
+from pulpcore.plugin.util import get_domain_pk
 
 log = getLogger(__name__)
 
@@ -94,6 +95,8 @@ class DistributionTree(Content):
 
     digest = models.TextField(null=False)
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     def repositories(self):
         """
         Return the subrepos in this DistributionTree.
@@ -134,7 +137,7 @@ def artifacts(self):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = ("digest",)
+        unique_together = ("_pulp_domain", "digest")
 
 
 class Checksum(BaseModel):

diff --git a/pulp_rpm/app/models/modulemd.py b/pulp_rpm/app/models/modulemd.py
@@ -3,6 +3,7 @@
 from django.db import models
 
 from pulpcore.plugin.models import Content
+from pulpcore.plugin.util import get_domain_pk
 
 from pulp_rpm.app.models.package import Package
 
@@ -65,9 +66,11 @@ class Modulemd(Content):
 
     snippet = models.TextField()
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = ("name", "stream", "version", "context", "arch")
+        unique_together = ("_pulp_domain", "name", "stream", "version", "context", "arch")
 
 
 class ModulemdDefaults(Content):
@@ -98,6 +101,8 @@ class ModulemdDefaults(Content):
 
     repo_key_fields = ("module",)
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     @classmethod
     def natural_key_fields(cls):
         """
@@ -107,6 +112,7 @@ def natural_key_fields(cls):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        unique_together = ("_pulp_domain", "digest")
 
 
 class ModulemdObsolete(Content):
@@ -151,6 +157,8 @@ class ModulemdObsolete(Content):
 
     snippet = models.TextField()
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = ("modified", "module_name", "module_stream")
+        unique_together = ("_pulp_domain", "modified", "module_name", "module_stream")
diff --git a/pulp_rpm/app/models/package.py b/pulp_rpm/app/models/package.py
@@ -8,6 +8,7 @@
 from django.db.models.functions import RowNumber
 
 from pulpcore.plugin.models import Content, ContentManager
+from pulpcore.plugin.util import get_domain_pk
 
 from pulp_rpm.app.constants import (
     CHECKSUM_CHOICES,
@@ -236,6 +237,8 @@ class Package(Content):
     # E.g. glibc-2.26.11.3.2.nosrc.rpm vs glibc-2.26.11.3.2.src.rpm
     repo_key_fields = ("name", "epoch", "version", "release", "arch", "location_href")
 
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
+
     @property
     def filename(self):
         """
@@ -283,7 +286,16 @@ def nevra_short(self):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = ("name", "epoch", "version", "release", "arch", "checksum_type", "pkgId")
+        unique_together = (
+            "_pulp_domain",
+            "name",
+            "epoch",
+            "version",
+            "release",
+            "arch",
+            "checksum_type",
+            "pkgId",
+        )
 
     class ReadonlyMeta:
         readonly = ["evr"]

diff --git a/pulp_rpm/app/models/repository.py b/pulp_rpm/app/models/repository.py
@@ -454,7 +454,7 @@ def content_handler(self, path):
                 return
             base_url = "{}/".format(
                 urlpath_sanitize(
-                    settings.CONTENT_ORIGIN, settings.CONTENT_PATH_PREFIX, self.base_path
+                    settings.CONTENT_ORIGIN, settings.CONTENT_PATH_PREFIX, self.pulp_domain.name, self.base_path
                 )
             )
             val = textwrap.dedent(

diff --git a/pulp_rpm/app/serializers/advisory.py b/pulp_rpm/app/serializers/advisory.py
@@ -10,6 +10,7 @@
     ModelSerializer,
     NoArtifactContentUploadSerializer,
 )
+from pulpcore.plugin.util import get_domain
 
 from pulp_rpm.app.advisory import hash_update_record
 from pulp_rpm.app.fields import (
@@ -231,6 +232,15 @@ def validate(self, data):
         validated_data = super().validate(update_record_data)
         return validated_data
 
+    # pulpcore 3.22 feature
+    # when uploading content second time I don't get error but already existing content
+    def retrieve(self, validated_data):
+        content = UpdateRecord.objects.filter(
+            id=validated_data["id"],
+            pulp_domain=get_domain(),
+        )
+        return content.first()
+
     class Meta:
         fields = NoArtifactContentUploadSerializer.Meta.fields + (
             "id",

diff --git a/pulp_rpm/app/serializers/comps.py b/pulp_rpm/app/serializers/comps.py
@@ -177,5 +177,13 @@ class CompsXmlSerializer(serializers.Serializer):
         write_only=True,
     )
 
+    # TODO: determine what comps is uploaded
+    # def retrieve(self, validated_data):
+    #     content = UpdateRecord.objects.filter(
+    #         digest=validated_data["id"],
+    #         pulp_domain=get_domain(),
+    #     )
+    #     return content.first()
+
     class Meta:
         fields = ("file", "repository", "replace")