katello 3.16.2 → 3.17.0.rc1

data/app/models/katello/pool.rb

@@ -112,6 +112,23 @@ module Katello
       Pool.joins(:subscription).order("subscription.name")
     end
 
+    apipie :class, desc: "A class representing #{model_name.human} object" do
+      name 'Pool'
+      refs 'Pool'
+      sections only: %w[all additional]
+      prop_group :katello_idname_props, Katello::Model, meta: { friendly_name: 'pool' }
+      property :available, Integer, desc: 'Returns number of available subscriptions'
+      property :quantity, Integer, desc: 'Returns number of all subscriptions'
+      property :consumed, Integer, desc: 'Returns number of consumed subscriptions'
+      property :product_id, String, desc: 'Returns ID of the product'
+      property :account_number, Integer, desc: 'Returns subscription account number'
+      property :contract_number, Integer, desc: 'Returns subscription contract number'
+      property :type, String, desc: 'Returns type of the pool, e.g. "NORMAL"'
+      property :organization, 'Organization', desc: 'Returns organization to which the pool belongs'
+      property :start_date, ActiveSupport::TimeWithZone, desc: 'Returns subscription start date'
+      property :end_date, ActiveSupport::TimeWithZone, desc: 'Returns subscription end date'
+      property :days_until_expiration, Integer, desc: 'Returns number of days until expiration'
+    end
     class Jail < ::Safemode::Jail
       allow :id, :name, :available, :quantity, :product_id, :contract_number, :type, :account_number, :start_date, :end_date, :organization, :consumed, :days_until_expiration
     end

data/app/models/katello/product.rb

@@ -245,6 +245,12 @@ module Katello
       end
     end
 
+    apipie :class, desc: "A class representing #{model_name.human} object" do
+      name 'Product'
+      refs 'Product'
+      sections only: %w[all additional]
+      prop_group :katello_basic_props, Katello::Model, meta: { friendly_name: 'Product' }
+    end
     class Jail < ::Safemode::Jail
       allow :name, :label
     end

data/app/models/katello/purpose_addons_status.rb

@@ -1,5 +1,6 @@
 module Katello
   class PurposeAddonsStatus < HostStatus::Status
+    UNKNOWN = Katello::PurposeStatus::UNKNOWN
     def self.status_name
       N_('Addons')
     end

data/app/models/katello/purpose_role_status.rb

@@ -1,5 +1,6 @@
 module Katello
   class PurposeRoleStatus < HostStatus::Status
+    UNKNOWN = Katello::PurposeStatus::UNKNOWN
     def self.status_name
       N_('Role')
     end

data/app/models/katello/purpose_sla_status.rb

@@ -1,5 +1,6 @@
 module Katello
   class PurposeSlaStatus < HostStatus::Status
+    UNKNOWN = Katello::PurposeStatus::UNKNOWN
     def self.status_name
       N_('Service Level')
     end

data/app/models/katello/purpose_usage_status.rb

@@ -1,5 +1,6 @@
 module Katello
   class PurposeUsageStatus < HostStatus::Status
+    UNKNOWN = Katello::PurposeStatus::UNKNOWN
     def self.status_name
       N_('Usage')
     end

data/app/models/katello/repository.rb

@@ -92,9 +92,11 @@ module Katello
     has_many :kickstart_content_facets, :class_name => "Katello::Host::ContentFacet", :foreign_key => :kickstart_repository_id,
                           :inverse_of => :kickstart_repository, :dependent => :nullify
 
-    has_many :kickstart_hostgroups, :class_name => "::Hostgroup", :foreign_key => :kickstart_repository_id,
+    has_many :kickstart_hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet", :foreign_key => :kickstart_repository_id,
              :inverse_of => :kickstart_repository, :dependent => :nullify
 
+    has_many :kickstart_hostgroups, :class_name => "::Hostgroup", :through => :kickstart_hostgroup_content_facets
+
     has_many :repository_module_streams, class_name: "Katello::RepositoryModuleStream", dependent: :delete_all
     has_many :module_streams, through: :repository_module_streams
 
@@ -133,7 +135,6 @@ module Katello
     scope :in_published_environments, -> { in_content_views(Katello::ContentView.non_default).where.not(:environment_id => nil) }
     scope :order_by_root, ->(attr) { joins(:root).order("#{Katello::RootRepository.table_name}.#{attr}") }
     scope :with_content, ->(content) { joins(Katello::RepositoryTypeManager.find_content_type(content).model_class.repository_association_class.name.demodulize.underscore.pluralize.to_sym).distinct }
-    scope :by_rpm_count, -> { left_joins(:repository_rpms).group(:id).order("count(katello_repository_rpms.id) ASC") } # smallest count first
 
     scoped_search :on => :name, :relation => :root, :complete_value => true
     scoped_search :rename => :product, :on => :name, :relation => :product, :complete_value => true
@@ -593,10 +594,6 @@ module Katello
       environment
     end
 
-    def self.smart_proxy_syncable
-      where.not(:environment_id => nil)
-    end
-
     def exist_for_environment?(environment, content_view, attribute = nil)
       if environment.present? && content_view.in_environment?(environment)
         repos = content_view.version(environment).repos(environment)

data/app/models/katello/root_repository.rb

@@ -1,6 +1,6 @@
 module Katello
   class RootRepository < Katello::Model
-    audited
+    audited :except => [:content_id]
     serialize :ignorable_content
     serialize :docker_tags_whitelist
 
@@ -65,6 +65,7 @@ module Katello
     validate :ensure_valid_docker_tags_whitelist
     validate :ensure_content_attribute_restrictions
     validate :ensure_valid_upstream_authorization
+    validate :ensure_auto_enablement_not_set
     validate :ensure_no_checksum_on_demand
     validates :url, presence: true, if: :ostree?
     validates :checksum_type, :inclusion => {:in => CHECKSUM_TYPES}, :allow_blank => true
@@ -104,16 +105,6 @@ module Katello
     }
     delegate :redhat?, :provider, :organization, to: :product
 
-    # Note - Audit hook added to find records based on column except associations to display audit information
-    def self.audit_hook_to_find_records(name, change, _audit)
-      if name =~ /_id$/
-        case name
-        when 'content_id'
-          Katello::Content.find_by(:cp_content_id => change)
-        end
-      end
-    end
-
     def library_instance
       repositories.in_default_view.first
     end
@@ -234,6 +225,11 @@ module Katello
       end
     end
 
+    def ensure_auto_enablement_not_set
+      return if new_record? || !auto_enabled_changed?
+      errors.add(:auto_enabled, N_("Auto Enablement may only be set on custom repositories.")) if redhat?
+    end
+
     def custom_content_path
       parts = []
       # We generate repo path only for custom product content. We add this
@@ -330,16 +326,28 @@ module Katello
 
     def format_arches
       if content_type == ::Katello::Repository::DEB_TYPE
-        # FIXME: This should be set to self.deb_architectures but it needs to have the
-        # subscription-manager PR https://github.com/candlepin/subscription-manager/pull/2213
-        # merged. Otherwise subscription-manager returns _NO_ debian repository as described in
-        # https://community.theforeman.org/t/katello-3-16-1-1-el7-subscription-manager-doesnt-create-rhsm-repos-for-ubuntu/20928/38
-        nil
+        self.deb_architectures
       else
         self.arch == "noarch" ? nil : self.arch
       end
     end
 
+    def content_enablements
+      product.root_repositories.map do |repo|
+        repo_content = { id: repo.content_id }
+        repo_content[:enabled] = repo.auto_enabled? if repo == self
+        repo_content
+      end
+    end
+
+    apipie :class, desc: 'A class representing Repository object' do
+      name 'Repository'
+      refs 'Repository'
+      sections only: %w[all additional]
+      prop_group :katello_basic_props, Katello::Model, meta: { friendly_name: 'Repository' }
+      property :docker_upstream_name, String, desc: 'Returns name of the upstream docker repository'
+      property :url, String, desc: 'Returns repository source URL'
+    end
     class Jail < ::Safemode::Jail
       allow :name, :label, :docker_upstream_name, :url
     end

data/app/models/katello/subscription_status.rb

@@ -22,7 +22,7 @@ module Katello
       when UNSUBSCRIBED_HYPERVISOR
         N_("Unsubscribed hypervisor")
       when DISABLED
-        N_("Disabled")
+        N_("Simple Content Access")
       else
         N_("Unknown subscription status")
       end

data/app/models/katello/trace_status.rb

@@ -3,7 +3,7 @@ module Katello
     REQUIRE_REBOOT = 2
     REQUIRE_PROCESS_RESTART = 1
     UP_TO_DATE = 0
-
+    UNKNOWN = -1
     def self.status_name
       N_("Traces")
     end

data/app/models/setting/content.rb

@@ -92,7 +92,7 @@ class Setting::Content < Setting
       self.set('check_services_before_actions', N_("Whether or not to check the status of backend services such as pulp and candlepin prior to performing some actions."),
                true, N_('Check services before actions')),
       self.set('foreman_proxy_content_batch_size', N_("How many repositories should be synced concurrently on the capsule.  A smaller number may lead to longer sync times.  A larger number will increase dynflow load."),
-               100, N_('Batch size to sync repositories in.')),
+               25, N_('Batch size to sync repositories in.')),
       self.set('foreman_proxy_content_auto_sync', N_("Whether or not to auto sync the Smart Proxies after a Content View promotion."),
                true, N_('Sync Smart Proxies after Content View promotion')),
       self.set('default_download_policy', N_("Default download policy for custom repositories (either 'immediate', 'on_demand', or 'background')"), "immediate",
@@ -149,7 +149,11 @@ class Setting::Content < Setting
       self.set('host_tasks_workers_pool_size', N_("Amount of workers in the pool to handle the execution of host-related tasks. When set to 0, the default queue will be used instead. Restart of the dynflowd/foreman-tasks service is required."),
                5, N_('Host Tasks Workers Pool Size')),
       self.set('applicability_batch_size', N_("Number of host applicability calculations to process per task."),
-               50, N_('Applicability Batch Size'))
+               50, N_('Applicability Batch Size')),
+      self.set('autosearch_while_typing', N_('For pages that support it, automatically perform search while typing in search input.'),
+               true, N_('Autosearch')),
+      self.set('autosearch_delay', N_('If Autosearch is enabled, delay in milliseconds before executing searches while typing.'),
+               500, N_('Autosearch delay'))
     ]
   end
 

data/app/services/cert/certs.rb

@@ -9,19 +9,11 @@ module Cert
     end
 
     def self.ssl_client_cert
-      @ssl_client_cert ||= OpenSSL::X509::Certificate.new(File.open(ssl_client_cert_filename, 'r').read)
-    end
-
-    def self.ssl_client_cert_filename
-      Setting['pulp_client_cert']
+      @ssl_client_cert ||= OpenSSL::X509::Certificate.new(File.open(Setting['pulp_client_cert'], 'r').read)
     end
 
     def self.ssl_client_key
-      @ssl_client_key ||= OpenSSL::PKey::RSA.new(File.open(ssl_client_key_filename, 'r').read)
-    end
-
-    def self.ssl_client_key_filename
-      Setting['pulp_client_key']
+      @ssl_client_key ||= OpenSSL::PKey::RSA.new(File.open(Setting['pulp_client_key'], 'r').read)
     end
 
     def self.verify_ueber_cert(organization)

data/app/services/katello/event_daemon.rb

@@ -1,5 +1,8 @@
 module Katello
   class EventDaemon
+    @services = {}
+    @cache = ActiveSupport::Cache::MemoryStore.new
+
     class Monitor
       def initialize(service_classes)
         @service_classes = service_classes
@@ -44,7 +47,6 @@ module Katello
     class << self
       def initialize
         FileUtils.touch(lock_file)
-        @cache = ActiveSupport::Cache::MemoryStore.new
       end
 
       def settings
@@ -80,7 +82,7 @@ module Katello
         return unless pid == Process.pid
         @monitor_thread.kill
         @cache.clear
-        services.values.each(&:close)
+        @services.values.each(&:close)
         File.unlink(pid_file) if pid_file && File.exist?(pid_file)
       end
 
@@ -114,7 +116,7 @@ module Katello
 
       def start_monitor_thread
         @monitor_thread = Thread.new do
-          Monitor.new(services.values).start
+          Monitor.new(@services.values).start
         end
       end
 
@@ -125,11 +127,8 @@ module Katello
         end
       end
 
-      def services
-        {
-          candlepin_events: ::Katello::CandlepinEventListener,
-          katello_events: ::Katello::EventMonitor::PollerThread
-        }
+      def register_service(name, klass)
+        @services[name] = klass
       end
     end
   end

data/app/services/katello/host_status_manager.rb

@@ -0,0 +1,13 @@
+module Katello
+  class HostStatusManager
+    STATUSES = [
+      Katello::ErrataStatus,
+      Katello::SubscriptionStatus,
+      Katello::PurposeSlaStatus,
+      Katello::PurposeRoleStatus,
+      Katello::PurposeUsageStatus,
+      Katello::PurposeAddonsStatus,
+      Katello::PurposeStatus,
+      Katello::TraceStatus].freeze
+  end
+end

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

@@ -117,7 +117,7 @@ module Katello
           relative_path = pulp3_api.distributions_api.read(href).base_path
 
           dist_ref = Katello::Pulp3::DistributionReference.find_or_initialize_by(:path => relative_path)
-          if (distribution_repo = Katello::Repository.find_by(:relative_path => relative_path) || Katello::Repository.find_by(:container_repository_name => relative_path))
+          if (distribution_repo = Katello::Repository.find_by(:relative_path => relative_path))
             dist_ref.href = href
             dist_ref.repository_id = distribution_repo.id
             dist_ref.save!

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

@@ -3,13 +3,10 @@ require 'pulp_rpm_client'
 module Katello
   module Pulp3
     class Repository
-      # rubocop:disable Metrics/ClassLength
       class Yum < ::Katello::Pulp3::Repository
         include Katello::Util::Errata
         include Katello::Util::PulpcoreContentFilters
 
-        UNIT_LIMIT = 10_000
-
         def remote_options
           if root.url.blank?
             common_remote_options.merge(url: nil, policy: root.download_policy)
@@ -34,6 +31,10 @@ module Katello
           }
         end
 
+        def sync_params
+          {remote: repo.remote_href, mirror: repo.root.mirror_on_sync, optimize: false}
+        end
+
         def mirror_remote_options
           policy = smart_proxy.download_policy
 
@@ -62,12 +63,6 @@ module Katello
           end
         end
 
-        def sync_url_params(sync_options)
-          params = super
-          params[:optimize] = sync_options[:optimize] if sync_options.key?(:optimize)
-          params
-        end
-
         def self.distribution_bootable?(distribution)
           file_paths = distribution.results.first.images.map(&:path)
           file_paths.any? do |path|
@@ -107,70 +102,14 @@ module Katello
                 data.config << config
               end
             end
-            tasks << copy_content_chunked(data)
+            # FIXME: data's content being [] causes all content to be copied back
+            tasks << api.copy_api.copy_content(data)
           else
             tasks << remove_all_content_from_mapping(repo_id_map)
           end
           tasks.flatten
         end
 
-        def copy_api_data_dup(data)
-          data_dup = PulpRpmClient::Copy.new
-          data_dup.dependency_solving = data.dependency_solving
-          data_dup.config = []
-          data.config.each do |repo_config|
-            config_hash = {
-              source_repo_version: repo_config[:source_repo_version],
-              dest_repo: repo_config[:dest_repo],
-              content: []
-            }
-            config_hash[:dest_base_version] = repo_config[:dest_base_version] if repo_config[:dest_base_version]
-            data_dup.config << config_hash
-          end
-          data_dup
-        end
-
-        def copy_content_chunked(data)
-          tasks = []
-          # Don't chunk if there aren't enough content units
-          if data.config.sum { |repo_config| repo_config[:content].size } <= UNIT_LIMIT
-            return api.copy_api.copy_content(data)
-          end
-
-          unit_copy_counter = 0
-          i = 0
-          leftover_units = data.config.first[:content].deep_dup
-
-          # Copy data and clear its content fields
-          data_dup = copy_api_data_dup(data)
-
-          while i < data_dup.config.size
-            # Copy all units within repo or only some?
-            if leftover_units.length < UNIT_LIMIT - unit_copy_counter
-              copy_amount = leftover_units.length
-            else
-              copy_amount = UNIT_LIMIT - unit_copy_counter
-            end
-
-            data_dup.config[i][:content] = leftover_units.pop(copy_amount)
-            unit_copy_counter += copy_amount
-            if unit_copy_counter != 0
-              tasks << api.copy_api.copy_content(data_dup)
-              unit_copy_counter = 0
-            end
-
-            if leftover_units.empty?
-              # Nothing more to copy -- clear current config's content
-              data_dup.config[i][:content] = []
-              i += 1
-              # Fetch unit list for next data config
-              leftover_units = data.config[i][:content].deep_dup unless i == data_dup.config.size
-            end
-          end
-
-          tasks
-        end
-
         def remove_all_content_from_mapping(repo_id_map)
           tasks = []
           repo_id_map.each do |_source_repo_ids, dest_repo_id_map|
@@ -208,11 +147,6 @@ module Katello
           api.repositories_api.modify(repo_href, data)
         end
 
-        def repair(repository_version_href)
-          data = PulpRpmClient::RepositoryVersion.new
-          api.repository_versions_api.repair(repository_version_href, data)
-        end
-
         def remove_all_content
           data = PulpRpmClient::RepositoryAddRemoveContent.new(
             remove_content_units: ['*'])

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

@@ -1,4 +1,5 @@
 require "pulpcore_client"
+
 module Katello
   module Pulp3
     class Repository
@@ -187,21 +188,21 @@ module Katello
         api.repositories_api.read(repository_reference.try(:repository_href))
       end
 
-      def delete_repository(repo_reference = repository_reference)
-        href = repo_reference.try(:repository_href)
-        repo_reference.try(:destroy)
+      def delete(href = repository_reference.try(:repository_href))
+        repository_reference.try(:destroy)
         ignore_404_exception { api.repositories_api.delete(href) } if href
       end
 
-      def sync(options = {})
-        repository_sync_url_data = api.class.repository_sync_url_class.new(sync_url_params(options))
-        [api.repositories_api.sync(repository_reference.repository_href, repository_sync_url_data)]
+      def sync_params
+        {remote: repo.remote_href, mirror: repo.root.mirror_on_sync}
       end
 
-      def sync_url_params(_sync_options)
-        params = {remote: repo.remote_href, mirror: repo.root.mirror_on_sync}
-        params[:skip_types] = skip_types if skip_types
-        params
+      def sync
+        sync_url_params = sync_params
+        skip_type_param = skip_types
+        sync_url_params[:skip_types] = skip_type_param if skip_type_param
+        repository_sync_url_data = api.class.repository_sync_url_class.new(sync_url_params)
+        [api.repositories_api.sync(repository_reference.repository_href, repository_sync_url_data)]
       end
 
       def create_publication

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

@@ -10,7 +10,7 @@ module Katello
         repo_map = {}
 
         smart_proxy_helper = ::Katello::SmartProxyHelper.new(smart_proxy)
-        katello_pulp_ids = smart_proxy_helper.combined_repos_available_to_capsule.map(&:pulp_id)
+        katello_pulp_ids = smart_proxy_helper.repos_available_to_capsule.map(&:pulp_id)
         pulp3_enabled_repo_types.each do |repo_type|
           api = repo_type.pulp3_service_class.api(smart_proxy)
           repo_map[api] = api.list_all.reject { |capsule_repo| katello_pulp_ids.include? capsule_repo.name }

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

@@ -79,7 +79,7 @@ module Katello
 
       def error
         if task_data[:state] == CANCELED
-          _("Task canceled")
+          self.new(_("Task canceled"))
         elsif task_data[:state] == FAILED
           if task_data[:error][:description].blank?
             _("Pulp task error")
@@ -90,8 +90,8 @@ module Katello
       end
 
       def cancel
-        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
-        tasks_api.tasks_cancel(task_data['pulp_href'], data)
+        data = PulpcoreClient::Task.new(state: 'canceled')
+        tasks_api.tasks_cancel(pulp_task['pulp_href'], data)
         #the main task may have completed, so cancel spawned tasks too
         task_data['spawned_tasks']&.each { |spawned| tasks_api.tasks_cancel(spawned['pulp_href'], data) }
       end

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

@@ -73,12 +73,6 @@ module Katello
       end
 
       def cancel
-        tasks_api = ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
-        tasks_response = tasks_api.list(task_group: task_group_data['pulp_href'])
-        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
-        tasks_response.results.collect do |result|
-          tasks_api.tasks_cancel(result.pulp_href, data)
-        end
       end
     end
   end

data/app/services/katello/smart_proxy_helper.rb

@@ -13,31 +13,34 @@ module Katello
       @smart_proxy.pulp_master?
     end
 
-    def lifecycle_environment_check(environment = nil, repository = nil)
-      environment = repository.environment if repository
+    def repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
+      ret = []
+      if repository
+        environment = repository.environment
+        ret = [repository]
+      else
+        yum_repos = fetch_repos_available_to_capsule(environment, content_view) || []
+        puppet_envs = fetch_puppet_environments_available_to_capsule(environment, content_view) || []
+        ret = yum_repos + puppet_envs
+      end
 
       if environment && !self.smart_proxy.lifecycle_environments.include?(environment)
         fail _("Lifecycle environment '%{environment}' is not attached to this capsule.") % { :environment => environment.name }
       end
-    end
 
-    def combined_repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
-      lifecycle_environment_check(environment, repository)
-      if repository
-        [repository]
-      else
-        repositories_available_to_capsule(environment, content_view) + puppet_environments_available_to_capsule(environment, content_view)
-      end
+      ret
     end
 
-    def repositories_available_to_capsule(environments, content_view)
+    private
+
+    def fetch_repos_available_to_capsule(environments = nil, content_view = nil)
       environments = @smart_proxy.lifecycle_environments if environments.nil?
       yum_repos = Katello::Repository.in_environment(environments)
       yum_repos = yum_repos.in_content_views([content_view]) if content_view
-      yum_repos.smart_proxy_syncable
+      yum_repos.select(&:node_syncable?)
     end
 
-    def puppet_environments_available_to_capsule(environments, content_view)
+    def fetch_puppet_environments_available_to_capsule(environments = nil, content_view = nil)
       environments = @smart_proxy.lifecycle_environments if environments.nil?
       puppet_environments = Katello::ContentViewPuppetEnvironment.in_environment(environments)
       puppet_environments = puppet_environments.in_content_view(content_view) if content_view

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

@@ -42,7 +42,7 @@
         <a ng-click="syncCapsule(true)">
           <span translate><strong>Complete Sync</strong></span>
           <p> A Complete Sync will sync repositories even if the upstream metadata appears to have no change.<br>
-              Complete Sync is only relevant for yum repositories and will take longer than an optimized sync.</p>
+              Complete Sync is only relevant for yum/deb repositories and will take longer than an optimized sync.</p>
         </a>
       </li>
     </ul>

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

@@ -6,7 +6,7 @@ attributes :pulp_id => :backend_identifier
 attributes :relative_path, :container_repository_name, :full_path, :library_instance_id
 
 glue(@object.root) do
-  attributes :content_type, :url, :arch, :content_id
+  attributes :content_type, :url, :arch, :content_id, :auto_enabled
   attributes :major, :minor
 
   child :product do |_product|

data/config/routes/api/rhsm.rb

@@ -21,7 +21,6 @@ Katello::Engine.routes.draw do
       match '/owners/:organization_id/environments' => 'candlepin_proxies#rhsm_index', :via => :get
       match '/owners/:organization_id/pools' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_pools_path
       match '/owners/:organization_id/servicelevels' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_servicelevels_path
-      match '/owners/:organization_id/system_purpose' => 'candlepin_proxies#get', :via => :get, :as => :proxy_owner_system_purpose_path
       match '/environments/:environment_id/consumers' => 'candlepin_proxies#consumer_create', :via => :post
       match '/consumers/:id' => 'candlepin_proxies#consumer_show', :via => :get
       match '/consumers/:id' => 'candlepin_proxies#regenerate_identity_certificates', :via => :post

data/config/routes/api/v2.rb

@@ -304,6 +304,12 @@ Katello::Engine.routes.draw do
           end
         end
 
+        api_resources :traces, :only => [], :controller => 'host_tracer' do
+          collection do
+            put :resolve
+          end
+        end
+
         api_resources :srpms, :only => [:index, :show], :controller => 'srpms' do
           collection do
             get :auto_complete_search
@@ -349,6 +355,8 @@ Katello::Engine.routes.draw do
               delete :destroy
               put :update
               get :ping
+              match '/simple_content_access/enable', :to => 'upstream_subscriptions#enable_simple_content_access', :via => :put
+              match '/simple_content_access/disable', :to => 'upstream_subscriptions#disable_simple_content_access', :via => :put
             end
           end
         end
@@ -386,7 +394,6 @@ Katello::Engine.routes.draw do
             put :remove_docker_manifests, :action => :remove_content
             put :remove_content
             post :sync
-            post :verify_checksum
             post :export
             post :upload_content
             put :import_uploads
@@ -416,7 +423,6 @@ Katello::Engine.routes.draw do
           collection do
             match '/bulk/destroy' => 'products_bulk_actions#destroy_products', :via => :put
             match '/bulk/sync' => 'products_bulk_actions#sync_products', :via => :put
-            match '/bulk/verify_checksum' => 'products_bulk_actions#verify_checksum_products', :via => :put
             match '/bulk/sync_plan' => 'products_bulk_actions#update_sync_plans', :via => :put
             match '/bulk/http_proxy' => 'products_bulk_actions#update_http_proxy', :via => :put
           end

data/config/routes/overrides.rb

@@ -77,7 +77,6 @@ Foreman::Application.routes.draw do
             match '/bulk/environment_content_view' => 'hosts_bulk_actions#environment_content_view', :via => :put
             match '/bulk/release_version' => 'hosts_bulk_actions#release_version', :via => :put
             match '/bulk/traces' => 'hosts_bulk_actions#traces', :via => :post
-            match '/bulk/resolve_traces' => 'hosts_bulk_actions#resolve_traces', :via => :put
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
             match '/bulk/module_streams' => 'hosts_bulk_actions#module_streams', :via => :post
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
@@ -115,9 +114,6 @@ Foreman::Application.routes.draw do
           end
 
           resources :traces, :only => [:index], :controller => :host_tracer do
-            collection do
-              put :resolve
-            end
           end
         end
       end