Nest the by-digest URLs into a subdir to prevent them from drowning out the normal URLs

Author: sdherr

pulp_deb/app/models/content/content.py

@@ -100,6 +100,7 @@ def filename(self, component="", layout=LAYOUT_TYPES.NESTED_ALPHABETICALLY):
                 component,
                 self.sha256[0:2],
                 self.sha256[2:6],
+                "by-digest",
                 "{}.{}".format(self.name, self.SUFFIX),
             )
 
@@ -227,7 +228,9 @@ def derived_dir(self, component="", layout=LAYOUT_TYPES.NESTED_ALPHABETICALLY):
             return os.path.join("pool", component, sourcename[0], sourcename)
         else:  # NESTED_BY_DIGEST or NESTED_BY_BOTH
             sha256 = self.sha256
-            return os.path.join("pool", component, sha256[0:2], sha256[2:6], sourcename)
+            return os.path.join(
+                "pool", component, "by-digest", sha256[0:2], sha256[2:6], sourcename
+            )
 
     def derived_path(self, name, component="", layout=LAYOUT_TYPES.NESTED_ALPHABETICALLY):
         """Assemble filename in pool directory."""

pulp_deb/tests/functional/api/test_publish.py

@@ -242,7 +242,7 @@ def test_publish_layout(
     if "layout" not in publication_args or publication_args["layout"] == "nested_alphabetically":
         expected = r"pool/asgard/[a-z]/"
     else:  # nested_by_digest or nested_by_both
-        expected = r"pool/asgard/[0-9a-f]{2}/[0-9a-f]{4}/"
+        expected = r"pool/asgard/by-digest/[0-9a-f]{2}/[0-9a-f]{4}/"
 
     # Verify than an expected Package index exists, and that the expected URL is
     # generated and that the package is actually available.

pulp_deb/tests/unit/test_models.py

@@ -61,7 +61,8 @@ def test_filename_by_digest(self):
         """Test that the pool filename of a package is correct."""
         for layout in [LAYOUT_TYPES.NESTED_BY_DIGEST, LAYOUT_TYPES.NESTED_BY_BOTH]:
             self.assertEqual(
-                self.package1.filename(layout=layout), "pool/ee/ff11/aegir_0.1-edda0_sea.deb"
+                self.package1.filename(layout=layout),
+                "pool/by-digest/ee/ff11/aegir_0.1-edda0_sea.deb"
             )
 
     def test_filename_with_component(self):
@@ -75,7 +76,7 @@ def test_filename_with_component_and_by_digest(self):
         for layout in [LAYOUT_TYPES.NESTED_BY_DIGEST, LAYOUT_TYPES.NESTED_BY_BOTH]:
             self.assertEqual(
                 self.package1.filename("joetunn", layout=layout),
-                "pool/joetunn/ee/ff11/aegir_0.1-edda0_sea.deb",
+                "pool/joetunn/by-digest/ee/ff11/aegir_0.1-edda0_sea.deb",
             )
 
     def test_to822(self):