Fixes #36820 - translate modulemd content counts

Katello · Oct 16, 2023 · b762e44 · b762e44
1 parent a578284
commit b762e44
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/services/katello/pulp3/pulp_content_unit.rb b/app/services/katello/pulp3/pulp_content_unit.rb
@@ -7,6 +7,7 @@ class PulpContentUnit
       # Any class that extends this class should define:
       # Class#update_model
 
+      # rubocop:disable Metrics/MethodLength
       def self.katello_name_from_pulpcore_name(pulpcore_name, repo)
         # Counts shouldn't be needed for more than the default generic content unit type.
         if repo.generic?
@@ -25,6 +26,8 @@ def self.katello_name_from_pulpcore_name(pulpcore_name, repo)
           ::Katello::PackageGroup::CONTENT_TYPE
         when ::Katello::Pulp3::Erratum::PULPCORE_CONTENT_TYPE
           ::Katello::Erratum::CONTENT_TYPE
+        when ::Katello::Pulp3::ModuleStream::PULPCORE_CONTENT_TYPE
+          'module_stream'
         when ::Katello::Pulp3::DockerTag::PULPCORE_CONTENT_TYPE
           ::Katello::DockerTag::CONTENT_TYPE
         when ::Katello::Pulp3::DockerManifest::PULPCORE_CONTENT_TYPE
@@ -41,6 +44,7 @@ def self.katello_name_from_pulpcore_name(pulpcore_name, repo)
           pulpcore_name
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def self.content_api
         fail NotImplementedError

diff --git a/test/models/concerns/smart_proxy_extensions_test.rb b/test/models/concerns/smart_proxy_extensions_test.rb
@@ -103,7 +103,7 @@ def test_update_content_counts
       expected_counts = { "content_view_versions" =>
         { yum_repo.content_view_version.id.to_s =>
           { "repositories" =>
-            { yum_repo.id.to_s => { "erratum" => 4, "srpm" => 1, "rpm" => 31, "rpm.modulemd" => 7, "rpm.modulemd_defaults" => 3, "package_group" => 7, "rpm.packagecategory" => 1 },
+            { yum_repo.id.to_s => { "erratum" => 4, "srpm" => 1, "rpm" => 31, "module_stream" => 7, "rpm.modulemd_defaults" => 3, "package_group" => 7, "rpm.packagecategory" => 1 },
               file_repo.id.to_s => { "file" => 100 },
               ansible_repo.id.to_s => { "ansible.collection" => 802 },
               container_repo.id.to_s => { "container.blob" => 30, "docker_manifest_list" => 1, "docker_manifest" => 9, "docker_tag" => 5 },