katello 4.13.0 → 4.14.0.rc1

data/app/services/katello/candlepin/consumer.rb

@@ -136,26 +136,26 @@ module Katello
       def self.distribution_to_puppet_os(name)
         return ::Operatingsystem::REDHAT_ATOMIC_HOST_OS if name == ::Operatingsystem::REDHAT_ATOMIC_HOST_DISTRO_NAME
 
-        name = name.downcase
-        if name =~ /red\s*hat/
+        case name.downcase
+        when /red\s*hat/
           'RedHat'
-        elsif name =~ /centos/
+        when /centos/
           'CentOS'
-        elsif name =~ /fedora/
+        when /fedora/
           'Fedora'
-        elsif name =~ /sles/ || name =~ /suse.*enterprise.*/
+        when /sles/, /suse.*enterprise.*/
           'SLES'
-        elsif name =~ /debian/
+        when /debian/
           'Debian'
-        elsif name =~ /ubuntu/
+        when /ubuntu/
           'Ubuntu'
-        elsif name =~ /oracle/
+        when /oracle/
           'OracleLinux'
-        elsif name =~ /almalinux/
+        when /almalinux/
           'AlmaLinux'
-        elsif name =~ /rocky/
+        when /rocky/
           'Rocky'
-        elsif name =~ /amazon/
+        when /amazon/
           'Amazon'
         else
           'Unknown'

data/app/services/katello/candlepin/message_handler.rb

@@ -43,9 +43,10 @@ module Katello
       end
 
       def pool_id
-        if subject == 'pool.created' || subject == 'pool.deleted'
+        case subject
+        when 'pool.created', 'pool.deleted'
           content['entityId']
-        elsif subject == 'entitlement.created' ||  subject == 'entitlement.deleted'
+        when 'entitlement.created', 'entitlement.deleted'
           content['referenceId']
         end
       end

data/app/services/katello/content_unit_indexer.rb

@@ -38,6 +38,12 @@ module Katello
             end
           end
 
+          # Even after this bug (https://github.com/pulp/pulp_rpm/issues/2821) is fixed,
+          # it is possible to have duplicate errata asosociated to a repo.
+          if @content_type.label == 'erratum'
+            to_insert.uniq! { |row| row["pulp_id"] || row[:pulp_id] }
+          end
+
           next if to_insert.empty?
           insert_timestamps(to_insert)
           if @content_type.mutable

data/app/services/katello/pulp3/alternate_content_source.rb

@@ -3,9 +3,7 @@ module Katello
   module Pulp3
     class AlternateContentSource
       include Katello::Pulp3::ServiceCommon
-      attr_accessor :acs
-      attr_accessor :smart_proxy
-      attr_accessor :repository
+      attr_accessor :acs, :smart_proxy, :repository
 
       def initialize(acs, smart_proxy, repository = nil)
         @acs = acs

data/app/services/katello/pulp3/api/core.rb

@@ -264,7 +264,7 @@ module Katello
             (response.count && (page_opts['offset'] < response.count)) ||
                 page_opts["offset"] == 0)
             response = yield page_opts
-            results = results.concat(response.results)
+            results.concat(response.results)
             page_opts[:offset] += page_size
           end
 

data/app/services/katello/pulp3/api/docker.rb

@@ -19,6 +19,16 @@ module Katello
         def container_push_api
           PulpContainerClient::RepositoriesContainerPushApi.new(api_client)
         end
+
+        def container_push_repo_for_name(name)
+          # There should be only one repository in Pulp with the requested name
+          container_push_api.list(name: name)&.results&.first
+        end
+
+        def container_push_distribution_for_repository(repository_href)
+          # There should be only one repository in Pulp with the requested repository_href
+          distributions_api.list(repository: repository_href)&.results&.first
+        end
       end
     end
   end

data/app/services/katello/pulp3/content_view_version/export.rb

@@ -8,6 +8,7 @@ module Katello
         FORMATS = [SYNCABLE, IMPORTABLE].freeze
 
         attr_reader :smart_proxy, :content_view_version, :destination_server, :from_content_view_version, :repository, :base_path
+
         def self.create(options)
           if options.delete(:format) == SYNCABLE
             SyncableFormatExport.new(**options)

data/app/services/katello/pulp3/content_view_version/import.rb

@@ -107,9 +107,10 @@ module Katello
         end
 
         def import_cv_name_from_export(name:, generated_for:)
-          if generated_for == :library_import
+          case generated_for
+          when :library_import
             ::Katello::ContentView::IMPORT_LIBRARY
-          elsif generated_for == :repository_import
+          when :repository_import
             name.gsub(/^Export/, 'Import')
           else
             name
@@ -138,9 +139,10 @@ module Katello
             }
           end
 
-          if generated_for == :library_export
+          case generated_for
+          when :library_export
             generated_for = :library_import
-          elsif generated_for == :repository_export
+          when :repository_export
             generated_for = :repository_import
           end
 

data/app/services/katello/pulp3/content_view_version/importable_products.rb

@@ -54,12 +54,10 @@ module Katello
         end
 
         def update_params(metadata_product)
-          params = {
+          {
             gpg_key_id: gpg_key_id(metadata_product),
             description: metadata_product.description
           }
-
-          params
         end
 
         def gpg_key_id(metadata_product)

data/app/services/katello/pulp3/repository/apt.rb

@@ -51,16 +51,6 @@ module Katello
           popts
         end
 
-        def mirror_publication_options
-          {
-            # Since we are synchronizing the "default" distribution from the simple publisher on the server,
-            # it will be included in the structured publish. Therefore, we MUST NOT use the simple publisher
-            # on the proxy, since this would collide!
-            #simple: true,
-            structured: true # publish real suites (e.g. 'stable')
-          }
-        end
-
         def distribution_options(path)
           {
             base_path: path,
@@ -87,12 +77,10 @@ module Katello
               # Not needed during incremental update due to dest_base_version
               # -> Unless incrementally updating a CV repo that is a soft copy of its library instance.
               # -> I.e. no filters and not an incremental version.
-              unless dest_repo_id_map[:base_version]
-                # Don't perform extra content actions if the repo is a soft copy of its library instance.
-                # Taken care of by the IncrementalUpdate action.
-                unless dest_repo.soft_copy_of_library?
-                  tasks << remove_all_content_from_repo(dest_repo_href)
-                end
+              # Don't perform extra content actions if the repo is a soft copy of its library instance.
+              # Taken care of by the IncrementalUpdate action.
+              if !dest_repo_id_map[:base_version] && !dest_repo.soft_copy_of_library?
+                tasks << remove_all_content_from_repo(dest_repo_href)
               end
               source_repo_ids.each do |source_repo_id|
                 source_repo_version = ::Katello::Repository.find(source_repo_id).version_href

data/app/services/katello/pulp3/repository/yum.rb

@@ -22,7 +22,13 @@ module Katello
 
         def publication_options(repository_version)
           options = super(repository_version)
-          options.merge(checksum_type: root.checksum_type)
+          # To work around https://projects.theforeman.org/issues/37715
+          checksum_type = if root.checksum_type.nil?
+                            'sha256'
+                          else
+                            root.checksum_type
+                          end
+          options.merge(checksum_type: checksum_type)
         end
 
         def specific_create_options
@@ -57,10 +63,8 @@ module Katello
               :distribution_family => distribution.results.first.release_name,
               :distribution_bootable => self.class.distribution_bootable?(distribution)
             )
-            unless distribution.results.first.variants.empty?
-              unless distribution.results.first.variants.first.name.nil?
-                repo.update!(:distribution_variant => distribution.results.first.variants.map(&:name).join(','))
-              end
+            if !distribution.results.first.variants.empty? && !distribution.results.first.variants.first.name.nil?
+              repo.update!(:distribution_variant => distribution.results.first.variants.map(&:name).join(','))
             end
           end
         end

data/app/services/katello/pulp3/repository.rb

@@ -5,8 +5,8 @@ module Katello
     class Repository
       include Katello::Util::HttpProxy
       include Katello::Pulp3::ServiceCommon
-      attr_accessor :repo
-      attr_accessor :smart_proxy
+      attr_accessor :repo, :smart_proxy
+
       delegate :root, to: :repo
       delegate :pulp3_api, to: :smart_proxy
 

data/app/services/katello/pulp3/repository_mirror.rb

@@ -2,6 +2,7 @@ module Katello
   module Pulp3
     class RepositoryMirror
       attr_accessor :repo_service
+
       delegate :repo, to: :repo_service
       delegate :smart_proxy, to: :repo_service
 
@@ -166,21 +167,13 @@ module Katello
         uri.to_s
       end
 
-      def publication_options(repository_version)
-        popts = {repository_version: repository_version}
-        if (type_specific_options = repo_service.try(:mirror_publication_options))
-          popts.merge!(type_specific_options)
-        end
-        popts
-      end
-
       def create_publication
         if (href = version_href)
           if repo_service.repo.content_type == "deb"
             publication_data = api.publication_verbatim_class.new({repository_version: href})
             api.publications_verbatim_api.create(publication_data)
           else
-            publication_data = api.publication_class.new(publication_options(href))
+            publication_data = api.publication_class.new(repository_version: href)
             api.publications_api.create(publication_data)
           end
         end

data/app/services/katello/pulp3/task.rb

@@ -39,6 +39,7 @@ module Katello
       #needed for serialization in dynflow
 
       attr_reader :pulp_data
+
       delegate :[], :key?, :dig, :to_hash, :to => :task_data
 
       def initialize(smart_proxy, data)
@@ -105,9 +106,10 @@ module Katello
       end
 
       def error
-        if task_data[:state] == CANCELED
+        case task_data[:state]
+        when CANCELED
           _("Task canceled")
-        elsif task_data[:state] == FAILED
+        when FAILED
           if task_data[:error][:description].blank?
             _("Pulp task error")
           else

data/app/services/katello/registration_manager.rb

@@ -125,9 +125,11 @@ module Katello
       #  * organization_destroy: destroy some data associated with host, but
       #    leave items alone that will be removed later as part of org destroy
       #  * unregistering: unregister the host but don't destroy it
+      #  * keep_kickstart_repository: ensure the KS repo ID is not set to nil
       def unregister_host(host, options = {})
         organization_destroy = options.fetch(:organization_destroy, false)
         unregistering = options.fetch(:unregistering, false)
+        keep_kickstart_repository = options.fetch(:keep_kickstart_repository, false)
 
         # if the first operation fails, just raise the error since there's nothing to clean up yet.
         candlepin_consumer_destroy(host.subscription_facet.uuid) if !organization_destroy && host.subscription_facet.try(:uuid)
@@ -138,7 +140,11 @@ module Katello
         host.subscription_facet.try(:destroy!)
 
         if unregistering
-          remove_host_artifacts(host)
+          if keep_kickstart_repository
+            remove_host_artifacts(host, kickstart_repository_id: host&.content_facet&.kickstart_repository_id)
+          else
+            remove_host_artifacts(host)
+          end
         elsif organization_destroy
           host.content_facet.try(:destroy!)
           remove_host_artifacts(host, clear_content_facet: false)
@@ -152,7 +158,9 @@ module Katello
         new_host = host.new_record?
         unless new_host
           host.save!
-          unregister_host(host, :unregistering => true)
+          # Keep the kickstart repository ID so the host's Medium isn't unset
+          # Important for registering a host during provisioning
+          unregister_host(host, :unregistering => true, :keep_kickstart_repository => true)
           host.reload
         end
 
@@ -294,13 +302,15 @@ module Katello
         subscription_facet
       end
 
-      def remove_host_artifacts(host, clear_content_facet: true)
+      def remove_host_artifacts(host, clear_content_facet: true, kickstart_repository_id: nil)
+        Rails.logger.debug "Host ID: #{host.id}, clear_content_facet: #{clear_content_facet}, kickstart_repository_id: #{kickstart_repository_id}"
         if host.content_facet && clear_content_facet
           host.content_facet.bound_repositories = []
           host.content_facet.applicable_errata = []
           host.content_facet.uuid = nil
           host.content_facet.content_view_environments = []
           host.content_facet.content_source = ::SmartProxy.pulp_primary
+          host.content_facet.kickstart_repository_id = kickstart_repository_id
           host.content_facet.save!
           Rails.logger.debug "remove_host_artifacts: marking CVEs unchanged to prevent backend update"
           host.content_facet.mark_cves_unchanged

data/app/services/katello/repository_type.rb

@@ -17,7 +17,7 @@ module Katello
               :repositories_api_class, :api_class, :remotes_api_class, :repository_versions_api_class,
               :distributions_api_class, :remote_class, :repo_sync_url_class, :client_module_class,
               :distribution_class, :publication_class, :publications_api_class, :url_description,
-              :test_url, :test_url_root_options
+              :test_url, :test_url_root_options, :repo_discovery_class
 
     attr_accessor :metadata_publish_matching_check, :index_additional_data_proc
     attr_reader :id, :unique_content_per_repo

data/app/services/katello/smart_proxy_helper.rb

@@ -1,6 +1,7 @@
 module Katello
   class SmartProxyHelper
     attr_accessor :smart_proxy
+
     def initialize(smart_proxy)
       @smart_proxy = smart_proxy
     end

data/app/views/dashboard/_host_collection_widget.html.erb

@@ -18,13 +18,14 @@
       </tr>
     </thead>
     <tbody>
+      <% installable_only = Setting['errata_status_installable'] %>
       <% host_collections.each do |host_collection| %>
         <tr>
           <td>
-            <% if host_collection.security_updates? %>
-              <a href="/host_collections/<%= host_collection.id %>" style="text-align: center"><i class="label label-danger">&nbsp;</i></a>
-            <% elsif host_collection.bugzilla_updates? || host_collection.enhancement_updates? %>
-              <a href="/host_collections/<%= host_collection.id %>" style="text-align: center"><i class="label label-warning">&nbsp;</i></a>
+            <% if host_collection.security_updates?(installable_only: installable_only) %>
+              <a href="/host_collections/<%= host_collection.id %>" style="text-align: center" title="<%= installable_only ? _('Installable security errata') : _('Applicable security errata') %>"><i class="label label-danger">&nbsp;</i></a>
+            <% elsif host_collection.bugzilla_updates?(installable_only: installable_only) || host_collection.enhancement_updates?(installable_only: installable_only) %>
+              <a href="/host_collections/<%= host_collection.id %>" style="text-align: center" title="<%= installable_only ? _('Installable bugfix/enhancement errata') : _('Applicable bugfix/enhancement errata') %>"><i class="label label-warning">&nbsp;</i></a>
             <% else %>
               <a href="/host_collections/<%= host_collection.id %>" style="text-align: center"><i class="label label-success">&nbsp;</i></a>
             <% end %>

data/app/views/foreman/job_templates/install_errata.erb

@@ -14,6 +14,7 @@ foreign_input_sets:
 - template: Package Action - Script Default
   exclude: action,package
 %>
+<%= snippet_if_exists(template_name + " custom pre") %>
 <% if @host.operatingsystem.family == 'Suse' -%>
     <% advisories = input(:errata).split(',').join(' ') -%>
     <%= render_template('Package Action - Script Default', :action => 'install -n -t patch', :package => advisories) %>
@@ -21,3 +22,4 @@ foreign_input_sets:
     <% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') -%>
     <%= render_template('Package Action - Script Default', :action => 'update-minimal', :package => advisories) %>
 <% end -%>
+<%= snippet_if_exists(template_name + " custom post") %>

data/app/views/foreman/job_templates/install_errata_-_katello_ansible_default.erb

@@ -14,6 +14,7 @@ provider_type: Ansible
 kind: job_template
 %>
 
+<%= snippet_if_exists(template_name + " custom pre") %>
 <% if @host.operatingsystem.family == 'Suse' -%>
 <% advisories = input(:errata).split(',').join(' ') -%>
 <%= render_template('Run Command - Ansible Default', :command => "zypper -n install -t patch #{advisories}") %>
@@ -21,3 +22,4 @@ kind: job_template
 <% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') -%>
 <%= render_template('Run Command - Ansible Default', :command => "yum -y update-minimal #{advisories}") %>
 <% end -%>
+<%= snippet_if_exists(template_name + " custom post") %>

data/app/views/foreman/job_templates/install_errata_by_search_query.erb

@@ -19,9 +19,11 @@ foreign_input_sets:
 <% render_error(N_("No errata matching given search query")) if !input("Errata search query").blank? && advisory_ids.blank? -%>
 # RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
 
+<%= snippet_if_exists(template_name + " custom pre") %>
 <% if @host.operatingsystem.family == 'Suse' -%>
     <%= render_template('Package Action - Script Default', :action => 'install -n -t patch', :package => advisory_ids.join(' ')) %>
 <% else -%>
     <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') -%>
     <%= render_template('Package Action - Script Default', :action => 'update-minimal', :package => advisories) %>
 <% end -%>
+<%= snippet_if_exists(template_name + " custom post") %>

data/app/views/foreman/job_templates/install_errata_by_search_query_-_katello_ansible_default.erb

@@ -1,7 +1,7 @@
 <%#
 kind: job_template
 name: Install errata by search query - Katello Ansible Default
-job_category: Katello
+job_category: Katello via Ansible
 description_format: 'Install errata %{Errata search query}'
 feature: katello_errata_install_by_search
 provider_type: Ansible
@@ -16,9 +16,11 @@ template_inputs:
 <% render_error(N_("No errata matching given search query")) if !input("Errata search query").blank? && advisory_ids.blank? -%>
 # RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
 
+<%= snippet_if_exists(template_name + " custom pre") %>
 <% if @host.operatingsystem.family == 'Suse' -%>
 <%= render_template('Run Command - Ansible Default', :command => "zypper -n install -t patch #{advisory_ids.join(' ')}") %>
 <% else -%>
 <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') -%>
 <%= render_template('Run Command - Ansible Default', :command => "yum -y update-minimal #{advisories}") %>
 <% end -%>
+<%= snippet_if_exists(template_name + " custom post") %>

data/app/views/foreman/job_templates/install_packages_by_search_query_-_katello_ansible_default.erb

@@ -1,7 +1,7 @@
 <%#
 kind: job_template
 name: Install packages by search query - Katello Ansible Default
-job_category: Katello
+job_category: Katello via Ansible
 description_format: 'Install package(s) %{Package search query}'
 feature: katello_package_install_by_search
 provider_type: Ansible

data/app/views/foreman/job_templates/remove_packages_by_search_query_-_katello_ansible_default.erb

@@ -1,7 +1,7 @@
 <%#
 kind: job_template
 name: Remove packages by search query - Katello Ansible Default
-job_category: Katello
+job_category: Katello via Ansible
 description_format: 'Remove package(s) %{Packages search query}'
 feature: katello_package_remove_by_search
 provider_type: Ansible
@@ -19,7 +19,7 @@ template_inputs:
 - hosts: all
   tasks:
     - package:
-        name: 
+        name:
 <% package_names.each do |package_name| -%>
           - <%= package_name %>
 <% end -%>

data/app/views/foreman/job_templates/resolve_traces.erb

@@ -20,5 +20,9 @@ reboot = commands.delete('reboot')
 shutdown -r +1
 <% else -%>
 <%= commands.join("\n") %>
-sudo katello-tracer-upload
+RUN_TRACER_CMD='katello-tracer-upload'
+if [ "$(id -u)" -ne 0 ]; then
+  RUN_TRACER_CMD='sudo katello-tracer-upload'
+fi
+$RUN_TRACER_CMD
 <% end %>

data/app/views/foreman/job_templates/update_packages_by_search_query_-_katello_ansible_default.erb

@@ -1,7 +1,7 @@
 <%#
 kind: job_template
 name: Update packages by search query - Katello Ansible Default
-job_category: Katello
+job_category: Katello via Ansible
 description_format: 'Update package(s) %{Packages search query}'
 feature: katello_package_update_by_search
 provider_type: Ansible

data/app/views/foreman/job_templates/upload_profile.erb

@@ -10,6 +10,8 @@ feature: katello_upload_profile
 #!/bin/sh
 <% if @host.operatingsystem.family == 'Redhat' -%>
 dnf uploadprofile --force-upload
+<% elsif @host.operatingsystem.family == 'Suse' -%>
+katello-package-upload --force
 <% else -%>
 package-profile-upload --force-upload
 <% end -%>

data/app/views/foreman/smart_proxies/_reclaim_space.html.erb

@@ -1,10 +1,12 @@
 <div>
   <h3><%= _('Reclaim Space') %></h3>
-  <p translate>
-    <strong>Warning</strong>: reclaiming space will delete all cached content units in "On Demand" repositories on this Smart Proxy.<br>
-    Take precaution when cleaning custom repositories whose upstream parents don't keep old package versions.
-    Storage used by deleted repositories will be reclaimed during the next orphan cleanup run.
-  </p>
+  <% unless Setting[:hide_reclaim_space_warning] %>
+    <p translate>
+      <strong>Warning</strong>: reclaiming space will delete all cached content units in "On Demand" repositories on this Smart Proxy.<br>
+      Take precaution when cleaning custom repositories whose upstream parents don't keep old package versions.
+      Storage used by deleted repositories will be reclaimed during the next orphan cleanup run.
+    </p>
+  <% end %>
   <div class="button">
     <button class="btn btn-default" type="button" id="reclaimSpaceButton" ng-click="reclaimSpace()" translate>
       Reclaim Space

data/app/views/katello/api/v2/content_facet/base.json.rabl

@@ -10,13 +10,29 @@ attributes :applicable_module_stream_count, :upgradable_module_stream_count
 
 child :content_view_environments => :content_view_environments do
   node :content_view do |cve|
-    { id: cve.content_view.id, name: cve.content_view.name, composite: cve.content_view.composite }
+    {
+      id: cve.content_view&.id,
+      name: cve.content_view&.name,
+      composite: cve.content_view&.composite,
+      content_view_version: cve.content_view_version&.version,
+      content_view_version_id: cve.content_view_version&.id,
+      content_view_version_latest: cve.content_view_version&.latest?,
+      content_view_default: cve.content_view&.default?
+    }
   end
   node :lifecycle_environment do |cve|
-    { id: cve.lifecycle_environment.id, name: cve.lifecycle_environment.name }
+    {
+      id: cve.lifecycle_environment&.id,
+      name: cve.lifecycle_environment&.name,
+      lifecycle_environment_library: cve.lifecycle_environment&.library?
+    }
+  end
+  node :candlepin_name do |cve|
+    cve.candlepin_name
   end
 end
 
+# single cv/lce for backward compatibility
 node :content_view do |content_facet|
   content_view = content_facet.single_content_view
   if content_view.present?

data/app/views/katello/api/v2/packages/thindex.json.rabl

@@ -0,0 +1,6 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+child @collection[:results] => :results do |_results|
+  attributes :name, :id
+end

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -28,6 +28,8 @@ glue(@resource.root) do
   attributes :http_proxy_name
   attributes :retain_package_versions_count
   attributes :metadata_expire
+  attributes :allow_updates? => :allow_updates
+  attributes :is_container_push? => :is_container_push
 
   node :http_proxy do
     attributes :id => @resource.root&.http_proxy&.id, :name => @resource.root&.http_proxy&.name, :policy => @resource.root&.http_proxy_policy
@@ -58,14 +60,12 @@ attributes :promoted? => :promoted
 attributes :content_view_version_id, :library_instance_id
 attributes :last_contents_changed
 
-if @resource.is_a?(Katello::Repository)
-  if @resource.distribution_version || @resource.distribution_arch || @resource.distribution_family || @resource.distribution_variant
-    attributes :distribution_version
-    attributes :distribution_arch
-    attributes :distribution_bootable? => :distribution_bootable
-    attributes :distribution_family
-    attributes :distribution_variant
-  end
+if @resource.is_a?(Katello::Repository) && (@resource.distribution_version || @resource.distribution_arch || @resource.distribution_family || @resource.distribution_variant)
+  attributes :distribution_version
+  attributes :distribution_arch
+  attributes :distribution_bootable? => :distribution_bootable
+  attributes :distribution_family
+  attributes :distribution_variant
 end
 
 node :permissions do |repo|

data/app/views/katello/api/v2/repository_sets/show.json.rabl

@@ -65,7 +65,7 @@ node :enabled_content_override do |pc|
 end
 
 node :redhat do |pc|
-  if pc&.product&.respond_to? :redhat?
+  if pc&.product.respond_to? :redhat?
     pc.product.redhat?
   end
 end

data/app/views/katello/api/v2/subscription_facet/base.json.rabl

@@ -1,4 +1,4 @@
-attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage, :hypervisor
+attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage, :hypervisor, :convert2rhel_through_foreman
 
 child :user => :user do
   attributes :id, :login

data/app/views/katello/api/v2/subscriptions/index.json.rabl

@@ -6,5 +6,6 @@ extends 'katello/api/v2/subscriptions/permissions'
 
 child @collection[:results] => :results do
   attributes :quantity_attached
+  attributes :product_host_count
   extends "katello/api/v2/subscriptions/base"
 end

data/app/views/katello/api/v2/subscriptions/show.json.rabl

@@ -6,6 +6,7 @@ attributes :arch
 attributes :description
 attributes :support_type
 attributes :roles, :usage, :addons
+attributes :product_host_count
 
 node(:host_count) do |subscription|
   subscription.hosts.count