katello 4.6.2.1 → 4.7.0.rc1

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

@@ -37,12 +37,22 @@ module Katello
         def create_params(metadata_product)
           {
             gpg_key_id: gpg_key_id(metadata_product),
-            name: metadata_product.name,
+            name: find_unique_name(metadata_product),
             label: metadata_product.label,
             description: metadata_product.description
           }
         end
 
+        def find_unique_name(metadata_product)
+          name = metadata_product.name
+          i = 1
+          while @products_in_library.where(name: name).exists?
+            name = "#{metadata_product.name} #{i}"
+            i += 1
+          end
+          name
+        end
+
         def update_params(metadata_product)
           params = {
             gpg_key_id: gpg_key_id(metadata_product),

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

@@ -4,11 +4,16 @@ module Katello
       class ImportableRepositories
         attr_reader :creatable, :updatable
 
-        def initialize(organization:, metadata_repositories:)
+        def initialize(organization:,
+                       metadata_repositories:,
+                       syncable_format: false,
+                       path: nil)
           @organization = organization
           @metadata_repositories = metadata_repositories
           @creatable = []
           @updatable = []
+          @syncable_format = syncable_format
+          @path = path
         end
 
         def generate!
@@ -41,15 +46,29 @@ module Katello
                 basearch: repo.arch,
                 releasever: repo.minor
               }
-              creatable << { product: product, content: product_content, substitutions: substitutions }
+              creatable << { product: product,
+                             content: product_content,
+                             substitutions: substitutions,
+                             override_url: fetch_feed_url(repo)
+                           }
             else
-              creatable << { repository: product.add_repo(create_repo_params(repo)) }
+              creatable << { repository: product.add_repo(create_repo_params(repo, product)) }
             end
           end
         end
 
         private
 
+        def find_unique_name(metadata_repo, product)
+          name = metadata_repo.name
+          i = 1
+          while product.root_repositories.where(name: name).exists?
+            name = "#{metadata_repo.name} #{i}"
+            i += 1
+          end
+          name
+        end
+
         def product_for_metadata_repo(repo)
           if repo.redhat && repo.product.cp_id
             @organization.products.includes(:root_repositories).find_by(cp_id: repo.product.cp_id)
@@ -74,9 +93,8 @@ module Katello
           end
         end
 
-        def create_repo_params(metadata_repo)
+        def create_repo_params(metadata_repo, product)
           keys = [
-            :name,
             :label,
             :description,
             :arch,
@@ -90,16 +108,26 @@ module Katello
             :mirroring_policy
           ]
 
-          params = {}
+          params = { name: find_unique_name(metadata_repo, product) }
           params[:gpg_key_id] = gpg_key_id(metadata_repo)
-
           keys.each do |key|
             params[key] = metadata_repo.send(key)
           end
-
+          url = fetch_feed_url(metadata_repo)
+          params[:url] = url if url
           params
         end
 
+        def fetch_feed_url(metadata_repo)
+          return unless @syncable_format
+          uri = URI(@path)
+          if uri.scheme.blank? || uri.scheme == "file"
+            "file://#{uri.path.chomp('/')}#{metadata_repo.content.url}"
+          else
+            "#{@path.chomp('/')}#{metadata_repo.content.url}"
+          end
+        end
+
         def update_repo_params(metadata_repo)
           keys = [
             :description,
@@ -112,8 +140,9 @@ module Katello
             :download_policy,
             :mirroring_policy
           ]
-
           params = {}
+          url = fetch_feed_url(metadata_repo)
+          params[:url] = url if url
           params[:gpg_key_id] = gpg_key_id(metadata_repo)
 
           keys.each do |key|

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

@@ -23,7 +23,6 @@ module Katello
                   incremental: from_content_view_version.present?,
                   format: export_service.format
           }
-
           unless from_content_view_version.blank?
             ret[:from_content_view_version] = from_content_view_version.slice(:major, :minor)
           end
@@ -45,10 +44,11 @@ module Katello
 
         def generate_repository_metadata(repo)
           repo.slice(:name, :label, :description, :arch, :content_type, :unprotected,
-                     :checksum_type, :os_versions, :major, :minor, :download_policy, :mirroring_policy).
+                     :checksum_type, :os_versions, :major, :minor,
+                     :download_policy, :mirroring_policy).
             merge(product: generate_product_metadata(repo.product),
                   gpg_key: generate_gpg_metadata(repo.gpg_key),
-                  content: generate_content_metadata(repo.content),
+                  content: generate_content_metadata(repo),
                   redhat: repo.redhat?)
         end
 
@@ -63,9 +63,16 @@ module Katello
           gpg.slice(:name, :content_type, :content)
         end
 
-        def generate_content_metadata(content)
+        def generate_content_metadata(repo)
+          content = repo.content
           return {} if content.blank?
-          { id: content.cp_content_id, label: content.label }
+          content_data = Katello::Content.substitute_content_path(arch: repo.arch,
+                                                                   releasever: repo.minor,
+                                                                   content_path: content.content_url)
+          { id: content.cp_content_id,
+            label: content.label,
+            url: content_data[:path]
+          }
         end
 
         def zip_gpg_keys(entities)

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

@@ -20,7 +20,8 @@ module Katello
                     :gpg_keys,
                     :content_view,
                     :content_view_version,
-                    :from_content_view_version
+                    :from_content_view_version,
+                    :format
 
         def initialize(metadata:)
           @toc = metadata[:toc]
@@ -30,6 +31,11 @@ module Katello
           @content_view = parse_content_view(metadata[:content_view]) if metadata[:content_view]
           @content_view_version = parse_content_view_version(metadata[:content_view_version]) if metadata[:content_view_version]
           @from_content_view_version = parse_content_view_version(metadata[:from_content_view_version]) if metadata[:from_content_view_version]
+          @format = metadata[:format]
+        end
+
+        def syncable_format?
+          @format == ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE
         end
 
         private
@@ -76,6 +82,11 @@ module Katello
 
         def parse_repositories(repositories)
           repositories.map do |pulp_name, repo|
+            if repo[:content]
+              content =  MetadataRepositoryContent.new(id: repo[:content][:id],
+                                                       label: repo[:content][:label],
+                                                       url: repo[:content][:url])
+            end
             MetadataRepository.new(
               pulp_name: pulp_name,
               name: repo[:name],
@@ -93,7 +104,7 @@ module Katello
               redhat: repo[:redhat],
               product: product_for_repo(repo),
               gpg_key: gpg_key_for_repo(repo),
-              content: repo[:content] ? MetadataRepositoryContent.new(id: repo[:content][:id], label: repo[:content][:label]) : nil
+              content: content
             )
           rescue => e
             raise _("Invalid repository in the metadata %{repo} error=%{error}") % { repo: repo, error: e.message }

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

@@ -24,7 +24,11 @@ module Katello
         end
 
         def generate_repository_exporter_path
-          _org, _content, content_path = repository.library_instance_or_self.relative_path.split("/", 3)
+          if repository.docker?
+            content_path = repository.library_instance_or_self.relative_path
+          else
+            _org, _content, content_path = repository.library_instance_or_self.relative_path.split("/", 3)
+          end
           content_path = content_path.sub(%r|^/|, '')
           "#{generate_exporter_path}/#{content_path}".gsub(/\s/, '_')
         end

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

@@ -17,6 +17,9 @@ module Katello
           repository_type = Katello::Repository.find(opts[:repository_id]).repository_type
           content_type = opts[:content_type]
           self.content_api(repository_type, content_type).create(relative_path, opts)
+        elsif self.content_type == 'rpm' || self.content_type == 'srpm'
+          # The pulp_rpm API bindings expect relative_path to be within the options hash.
+          self.content_api.create(opts)
         else
           self.content_api.create(relative_path, opts)
         end

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

@@ -200,7 +200,7 @@ module Katello
 
       def sync_url_params(_sync_options)
         params = {remote: repo.remote_href, mirror: repo.root.mirroring_policy == Katello::RootRepository::MIRRORING_POLICY_CONTENT}
-        params[:skip_types] = skip_types if (skip_types && repo.root.mirroring_policy != Katello::RootRepository::MIRRORING_POLICY_COMPLETE)
+        params[:skip_types] = skip_types if skip_types
         params
       end
 
@@ -418,27 +418,39 @@ module Katello
       end
 
       def ssl_remote_options
+        options = {}
         if root.redhat? && root.cdn_configuration.redhat_cdn?
-          {
+          options = {
             client_cert: root.product.certificate,
             client_key: root.product.key,
             ca_cert: Katello::Repository.feed_ca_cert(root.url)
           }
+        elsif root.redhat? && root.cdn_configuration.custom_cdn?
+          options = {
+            ca_cert: root.cdn_configuration.ssl_ca
+          }
         elsif root.redhat? && root.cdn_configuration.network_sync?
-          {
+          options = {
             client_cert: root.cdn_configuration.ssl_cert,
             client_key: root.cdn_configuration.ssl_key,
             ca_cert: root.cdn_configuration.ssl_ca
           }
         elsif root.custom?
-          {
+          options = {
             client_cert: root.ssl_client_cert&.content,
             client_key: root.ssl_client_key&.content,
             ca_cert: root.ssl_ca_cert&.content
           }
-        else
-          {}
         end
+        append_proxy_cacert(options) if options.key?(:cacert)
+        options
+      end
+
+      def append_proxy_cacert(options)
+        if root.http_proxy&.cacert && options.key?(:cacert)
+          options[:cacert] += "\n#{root.http_proxy&.cacert}"
+        end
+        options
       end
 
       def lookup_version(href)

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

@@ -132,7 +132,6 @@ module Katello
         sync_params = repo_service.sync_url_params(options)
         sync_params[:remote] = remote_href
         if repo.yum?
-          sync_params.delete(:skip_types) if sync_params[:skip_types]
           sync_params[:sync_policy] = 'mirror_complete'
         else
           sync_params.delete(:sync_policy)

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

@@ -26,7 +26,7 @@ module Katello
           api = repo_type.pulp3_api(smart_proxy)
           version_hrefs = api.repository_versions
           orphan_version_hrefs = api.list_all.collect do |pulp_repo|
-            mirror_repo_versions = api.versions_list_for_repository(pulp_repo.pulp_href, ordering: ['-pulp_created'])
+            mirror_repo_versions = api.versions_list_for_repository(pulp_repo.pulp_href, ordering: :_created)
             version_hrefs = mirror_repo_versions.select { |repo_version| repo_version.number != 0 }.collect { |version| version.pulp_href }
 
             version_hrefs - [pulp_repo.latest_version_href]
@@ -83,7 +83,7 @@ module Katello
 
           remotes.each do |remote|
             if !repo_names.include?(remote.name) && !acs_remotes.include?(remote.pulp_href)
-              tasks << api.delete_remote(remote.pulp_href)
+              tasks << api.delete_remote(href: remote.pulp_href)
             end
           end
         end

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

@@ -50,6 +50,10 @@ module Katello
         ::Katello::Pulp3::Api::Core.new(@smart_proxy).task_groups_api
       end
 
+      def tasks_api
+        ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
+      end
+
       def done?
         task_group_data['all_tasks_dispatched'] == true && IN_PROGRESS_STATES.all? { |state| task_group_data[state] == 0 }
       end
@@ -74,12 +78,25 @@ module Katello
       def error
         return if task_group_data[WAITING] > 0 || task_group_data[RUNNING] > 0
         if task_group_data[FAILED] > 0
-          "#{task_group_data[FAILED]} subtask(s) failed for task group #{@href}."
+          messages = query_task_group_errors(task_group_data)
+          return "#{task_group_data[FAILED]} subtask(s) failed for task group #{@href}.\nErrors:\n #{messages.join("\n")}"
         elsif task_group_data[CANCELLED] > 0
           "#{task_group_data[CANCELLED]} subtask(s) cancelled for task group #{@href}."
         end
       end
 
+      def query_task_group_errors(task_group_data)
+        messages = []
+        tasks_api = core_api.tasks_api
+        tasks_response = core_api.class.fetch_from_list do |page_opts|
+          tasks_api.list(page_opts.merge(task_group: task_group_data['pulp_href'], state__in: [FAILED]))
+        end
+        tasks_response.collect do |result|
+          messages << result.error
+        end
+        return messages
+      end
+
       def core_api
         ::Katello::Pulp3::Api::Core.new(@smart_proxy)
       end

data/app/services/katello/repository_type.rb

@@ -174,7 +174,9 @@ module Katello
           label: label,
           generic_browser: generic_browser,
           generic: false,
-          removable: removable
+          removable: removable,
+          uploadable: uploadable,
+          indexed: index && index_on_pulp3
         }
       end
 
@@ -230,7 +232,7 @@ module Katello
     end
 
     class GenericRemoteOption
-      attr_accessor :name, :title, :type, :description, :input_type, :delimiter
+      attr_accessor :name, :title, :type, :description, :input_type, :delimiter, :default
 
       def initialize(options)
         self.name = options[:name]
@@ -239,6 +241,7 @@ module Katello
         self.description = options[:description]
         self.input_type = options[:input_type]
         self.delimiter = options[:delimiter]
+        self.default = options[:default]
       end
     end
 

data/app/services/katello/repository_type_manager.rb

@@ -139,9 +139,10 @@ module Katello
         enabled_repository_types[katello_label]
       end
 
-      def find_content_type(katello_label)
+      def find_content_type(katello_label, indexable = false)
         enabled_repository_types.values.each do |repo_type|
-          repo_type.content_types.each do |content_type|
+          content_types = indexable ? repo_type.content_types_to_index : repo_type.content_types
+          content_types.each do |content_type|
             return content_type if content_type.label == katello_label.to_s
           end
         end
@@ -167,7 +168,7 @@ module Katello
       def check_content_matches_repo_type!(repository, content_type)
         repo_content_types = repository.repository_type.content_types.collect { |type| type.label }
         unless repo_content_types.include?(content_type)
-          fail _("Content type %{content_type} is incompatible with repositories of type %{repo_type}") %
+          fail HttpErrors::BadRequest, _("Content type %{content_type} is incompatible with repositories of type %{repo_type}") %
                  { content_type: content_type, repo_type: repository.content_type }
         end
       end

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

@@ -3,7 +3,7 @@
 </h4>
 
 <% organizations = Organization.current.present? ? [Organization.current] : User.current.allowed_organizations %>
-<% histories = Katello::ContentViewHistory.includes(:content_view_version => [:content_view]).includes(:task, :environment).in_organizations(organizations) %>
+<% histories = Katello::ContentViewHistory.includes(:content_view_version => [:content_view]).includes(:task, :environment).in_organizations(organizations).where("#{Katello::ContentView.table_name}.generated_for" => :none) %>
 <% histories = histories.readable.limit(6) %>
 
 <% if histories.empty? %>

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

@@ -10,3 +10,9 @@ feature: katello_change_content_source
 #!/bin/sh
 
 <%= change_content_source(@host, foreman_server_ca_cert) %>
+
+if [ -f /etc/yggdrasil/config.toml ]; then
+  cp /etc/yggdrasil/config.toml /etc/yggdrasil/config.toml.bak
+  export YGGDRASIL_RESTART_DELAY=10
+  <%= snippet 'remote_execution_pull_setup' %>
+fi

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

@@ -10,10 +10,16 @@ template_inputs:
   description: Filter criteria for packages to be updated.
   input_type: user
   required: false
+- name: Selected update versions
+  description: JSON string of selected package versions to be updated, in the format [ nvra ]. Leave blank to upgrade to latest available version.
+  input_type: user
+  required: false
+  value_type: plain
 %>
 <% package_names = @host.package_names_for_job_template(
   action: 'update',
-  search: input('Packages search query')
+  search: input('Packages search query'),
+  versions: input('Selected update versions')
 ) -%>
 
 <%= render_template('Package Action - Script Default', :action => 'update', :package => package_names.join(' ')) %>

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

@@ -1,8 +1,8 @@
 extends 'katello/api/v2/common/identifier'
 
 if @object.respond_to?(:alternate_content_source_type)
-  if @object.custom?
-    attributes :name, :alternate_content_source_type, :content_type, :base_url, :subpaths, :upstream_username, :smart_proxies, :verify_ssl
+  if @object.custom? || @object.rhui?
+    attributes :name, :alternate_content_source_type, :content_type, :base_url, :subpaths, :upstream_username, :smart_proxies, :verify_ssl, :use_http_proxies
     child :ssl_ca_cert => :ssl_ca_cert do |_object|
       attributes :id, :name
     end
@@ -15,7 +15,7 @@ if @object.respond_to?(:alternate_content_source_type)
       attributes :id, :name
     end
   elsif @object.simplified?
-    attributes :name, :alternate_content_source_type, :content_type, :products, :smart_proxies
+    attributes :name, :alternate_content_source_type, :content_type, :products, :smart_proxies, :use_http_proxies
   end
 end
 
@@ -28,7 +28,7 @@ child :latest_dynflow_refresh_task => :last_refresh do |_object|
   end
 end
 
-if params.key?(:include_permissions)
+if ::Foreman::Cast.to_bool(params.fetch(:include_permissions, false))
   node :permissions do |alternate_content_source|
     {
       :view_alternate_content_sources => alternate_content_source.readable?,

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

@@ -1,6 +1,7 @@
 object false
 
 extends "katello/api/v2/common/index"
+extends 'katello/api/v2/alternate_content_sources/permissions'
 
 child @collection[:results] => :results do
   extends "katello/api/v2/alternate_content_sources/base"

data/app/views/katello/api/v2/alternate_content_sources/permissions.rabl

@@ -0,0 +1,11 @@
+collection @alternate_content_sources
+
+if ::Foreman::Cast.to_bool(params.fetch(:include_permissions, false))
+  user = User.current # current_user is not available here
+  node do
+    node(:can_create) { user.can?("create_alternate_content_sources") }
+    node(:can_edit) { user.can?("edit_alternate_content_sources") }
+    node(:can_delete) { user.can?("destroy_alternate_content_sources") }
+    node(:can_view) { user.can?("view_alternate_content_sources") }
+  end
+end

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

@@ -31,6 +31,18 @@ child :root_repositories => :gpg_key_repos do
   end
 end
 
+child :ssl_ca_alternate_content_sources => :ssl_ca_alternate_content_sources do
+  attributes :id, :name
+end
+
+child :ssl_client_alternate_content_sources => :ssl_client_alternate_content_sources do
+  attributes :id, :name
+end
+
+child :ssl_client_key_alternate_content_sources => :ssl_client_key_alternate_content_sources do
+  attributes :id, :name
+end
+
 child :ssl_ca_products => :ssl_ca_products do
   attributes :id, :cp_id, :name
   node :repository_count do |product|

data/app/views/katello/api/v2/content_views/permissions.rabl

@@ -4,5 +4,6 @@ if params.key?(:include_permissions)
   user = User.current # current_user is not available here
   node do
     node(:can_create) { user.can?("create_content_views") }
+    node(:can_view) { user.can?("view_content_views") }
   end
 end

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

@@ -2,5 +2,5 @@ object @resource
 
 attributes :id, :name
 attributes :nvrea, :nvra
-attributes :upgradable_version
+attributes :upgradable_versions
 attributes :rpm_id

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

@@ -6,6 +6,13 @@ child :artifacts => :artifacts do
   attributes :id, :name
 end
 
+child :profiles => :profiles do
+  attributes :id, :name
+  child :rpms => :rpms do
+    attributes :id, :name
+  end
+end
+
 child :library_repositories => :repositories do
   attributes :id, :name
   glue :product do

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

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/repositories/base'
+  node :comparison do |result|
+    result.comparison_repositories
+  end
+end

data/app/views/katello/api/v2/smart_proxies/pulp_info.json.rabl

@@ -1,2 +1,3 @@
 attributes :download_policy
 attributes :supported_pulp_types
+attributes :lifecycle_environments

data/app/views/katello/hosts/_errata_counts.html.erb

@@ -0,0 +1,46 @@
+<a href="/content_hosts/<%= host.id %>/errata">
+  <span class="aligned-errata-count">
+    <span class="errata-count <%= counts[:security].to_i.positive? ? 'red' : 'black' %>">
+      <span>
+        <%= counts[:security] || 0 %>
+      </span>
+      <i class="fa fa-warning inline-icon" title="<%= _('Security') %>"></i>
+    </span>
+    <span class="errata-count <%= counts[:bugfix].to_i.positive? ? 'yellow' : 'black' %>">
+      <span>
+        <%= counts[:bugfix] || 0 %>
+      </span>
+      <i class="fa fa-bug inline-icon" title="<%= _('Bug Fix') %>"></i>
+    </span>
+    <span class="errata-count <%= counts[:enhancement].to_i.positive? ? 'yellow' : 'black' %>">
+      <span>
+        <%= counts[:enhancement] || 0 %>
+      </span>
+      <i class="fa fa-plus-square inline-icon" title="<%= _('Enhancement') %>"></i>
+    </span>
+  </span>
+</a>
+<% if !host.operatingsystem_name&.match(/Debian|Ubuntu/) %>
+<a href="/content_hosts/<%= host.id %>/packages/applicable">
+  <span class="aligned-errata-count">
+    <span class="errata-count <%= host.content_facet_attributes&.upgradable_rpm_count&.positive? ? 'green' : 'black' %>"
+      <span>
+        <%= host.content_facet_attributes&.upgradable_rpm_count || 0 %>
+      </span>
+      <i class="fa fa-cube inline-icon" title="<%= _('RPM package updates') %>"></i>
+    </span>
+  </span>
+</a>
+<% end %>
+<% if host.operatingsystem_name&.match(/Debian|Ubuntu/) %>
+<a href="/content_hosts/<%= host.id %>/debs/applicable">
+  <span class="aligned-errata-count">
+    <span class="errata-count <%= host.content_facet_attributes&.upgradable_deb_count&.positive? ? 'green' : 'black' %>"
+      <span>
+        <%= host.content_facet_attributes&.upgradable_deb_count || 0 %>
+      </span>
+      <i class="fa fa-cube inline-icon" title="<%= _('DEB package updates') %>"></i>
+    </span>
+  </span>
+</a>
+<% end %>

data/app/views/overrides/activation_keys/_host_synced_content_select.html.erb

@@ -1,5 +1,6 @@
 <%
 kickstart_repo_id = using_hostgroups_page? ? kickstart_repository_id(@hostgroup) : kickstart_repository_id(@host, :selected_host_group => @hostgroup)
+kickstart_repo_id = 'unset' if kickstart_repo_id.blank?
 host = using_hostgroups_page? ? @hostgroup : @host
 kickstart_options = kickstart_repository_options(host, :selected_host_group => @hostgroup)
 ks_repo_select_id =  using_hostgroups_page? ? :host_group_kickstart_repository_id : :host_kickstart_repository_id

data/app/views/overrides/smart_proxies/_acs_http_proxy.html.erb

@@ -0,0 +1,6 @@
+<%# I'm thinking that creating test ACS remotes is not worth it for HTTP proxies because
+    we're editing 'n' remotes rather than just one. At sync time, if a remote fails to
+    update, the user can look at the error in Dynflow and likely figure out that something
+    is wrong with the HTTP proxy config. %>
+<%= select_f(f, :http_proxy_id, ::HttpProxy.all, :id, :name, {:include_blank => true}, {:label => _("Alternate Content Source HTTP Proxy"),
+    :label_help => _('Traffic for all alternate content sources associated with this smart proxy will go through the chosen HTTP proxy.')}) %>

data/config/initializers/monkeys.rb

@@ -2,3 +2,4 @@
 require 'monkeys/anemone'
 require 'monkeys/ar_postgres_evr_t'
 require 'monkeys/fx_sqlite_skip'
+require 'monkeys/try_pulp_container_path'

data/config/routes/api/v2.rb

@@ -252,6 +252,7 @@ Katello::Engine.routes.draw do
           end
           api_resources :products, :only => [:index]
           api_resources :repositories, :only => [:index]
+          api_resources :alternate_content_sources, :only => [:index]
           api_resources :subscriptions, :only => [:index] do
             collection do
               match '/available' => 'subscriptions#available', :via => :get
@@ -322,6 +323,7 @@ Katello::Engine.routes.draw do
             get :auto_complete_search
             get :repository_types
             get :content_types
+            get :compare
           end
           member do
             put :republish