katello 4.0.3 → 4.1.0.rc1

data/app/controllers/katello/api/v2/content_views_controller.rb

@@ -21,7 +21,7 @@ module Katello
       param :component_ids, Array, :desc => N_("List of component content view version ids for composite views")
       param :auto_publish, :bool, :desc => N_("Enable/Disable auto publish of composite view")
       param :solve_dependencies, :bool, :desc => N_("Solve RPM dependencies by default on Content View publish, defaults to false")
-      param :import_only, :bool, :desc => N_("Designate this Content View for importing from upstream servers only. Defaults to false") if pulp3_yum?
+      param :import_only, :bool, :desc => N_("Designate this Content View for importing from upstream servers only. Defaults to false")
     end
 
     def filtered_associations
@@ -31,10 +31,6 @@ module Katello
       }
     end
 
-    def self.pulp3_yum?
-      SmartProxy.pulp_primary&.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
-    end
-
     api :GET, "/organizations/:organization_id/content_views", N_("List content views")
     api :GET, "/content_views", N_("List content views")
     param :organization_id, :number, :desc => N_("organization identifier")
@@ -47,7 +43,7 @@ module Katello
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(ContentView)
     def index
-      content_view_includes = [:activation_keys, :content_view_puppet_modules, :content_view_versions,
+      content_view_includes = [:activation_keys, :content_view_versions,
                                :environments, :organization, :repositories]
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc, :includes => content_view_includes))
     end
@@ -72,10 +68,6 @@ module Katello
     param :composite, :bool, :desc => N_("Composite content view")
     param_group :content_view
     def create
-      if ::Foreman::Cast.to_bool(params[:content_view][:import_only])
-        fail HttpErrors::BadRequest, _("Import-only content views will be available in a future version.") unless self.class.pulp3_yum?
-      end
-
       @content_view = ContentView.create!(view_params) do |view|
         view.organization = @organization
         view.label ||= labelize_params(params[:content_view])
@@ -128,53 +120,6 @@ module Katello
       respond :resource => @content_view
     end
 
-    api :GET, "/content_views/:id/available_puppet_modules",
-        N_("Get puppet modules that are available to be added to the content view")
-    param :id, :number, :desc => N_("content view numeric identifier"), :required => true
-    param :name, String, :desc => N_("module name to restrict modules for"), :required => false
-    def available_puppet_modules
-      current_cv_puppet_modules = @content_view.content_view_puppet_modules.where("uuid is NOT NULL")
-      current_uuids = current_cv_puppet_modules.pluck(:uuid)
-      repositories = @content_view.organization.library.puppet_repositories
-      query = PuppetModule.in_repositories(repositories)
-      selected_latest_versions = []
-      if params[:name]
-        query = query.where(:name => params[:name])
-        if current_uuids.present?
-          module_by_name = current_cv_puppet_modules.find_by(:name => params[:name])
-          if module_by_name&.latest_in_modules_by_author?(query)
-            current_uuids.delete(module_by_name.uuid)
-            selected_latest_versions.push(module_by_name.uuid)
-          end
-        end
-      end
-      query = query.where("#{PuppetModule.table_name}.pulp_id NOT in (?)", current_uuids) if current_uuids.present?
-      custom_sort = ->(sort_query) { sort_query.order('author, name, sortable_version DESC') }
-      sorted_records = scoped_search(query, nil, nil, :resource_class => PuppetModule, :custom_sort => custom_sort)
-      if params[:name]
-        sorted_records_with_use_latest = add_use_latest_records(sorted_records[:results].to_a, selected_latest_versions)
-        sorted_records[:results] = sorted_records_with_use_latest
-        sorted_records[:total] = sorted_records_with_use_latest.count
-        sorted_records[:subtotal] = sorted_records_with_use_latest.count
-      end
-      respond_for_index :template => 'puppet_modules', :collection => sorted_records
-    end
-
-    api :GET, "/content_views/:id/available_puppet_module_names",
-        N_("Get puppet modules names that are available to be added to the content view")
-    param :id, :number, :desc => N_("content view numeric identifier"), :required => true
-    def available_puppet_module_names
-      current_names = @content_view.content_view_puppet_modules.where("name is NOT NULL").pluck(:name)
-
-      repos = @content_view.organization.library.puppet_repositories
-
-      modules = PuppetModule.in_repositories(repos)
-      modules = modules.where('name NOT in (?)', current_names) if current_names.present?
-
-      respond_for_index :template => '../puppet_modules/names',
-                        :collection => scoped_search(modules, 'name', 'ASC', :resource_class => PuppetModule, :group => :name)
-    end
-
     api :DELETE, "/content_views/:id/environments/:environment_id", N_("Remove a content view from an environment")
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
     param :environment_id, :number, :desc => N_("environment numeric identifier"), :required => true
@@ -246,7 +191,7 @@ module Katello
     end
 
     def view_params
-      attrs = [:name, :description, :force_puppet_environment, :auto_publish, :solve_dependencies, :import_only,
+      attrs = [:name, :description, :auto_publish, :solve_dependencies, :import_only,
                :default, :created_at, :updated_at, :next_version, {:component_ids => []}]
       attrs.push(:label, :composite) if action_name == "create"
       if (!@content_view || !@content_view.composite?)

data/app/controllers/katello/api/v2/host_errata_controller.rb

@@ -2,11 +2,12 @@ module Katello
   class Api::V2::HostErrataController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
 
-    before_action :find_host, :only => :index
-    before_action :find_host_editable, :except => :index
-    before_action :find_errata_ids, :only => :apply
-    before_action :find_environment, :only => :index
-    before_action :find_content_view, :only => :index
+    before_action :find_host, only: :index
+    before_action :find_host_editable, except: :index
+    before_action :find_errata_ids, only: :apply
+    before_action :find_environment, only: :index
+    before_action :find_content_view, only: :index
+    before_action :deprecate_katello_agent, only: :apply
 
     resource_description do
       api_version 'v2'
@@ -49,7 +50,7 @@ module Katello
       respond_for_index :collection => collection
     end
 
-    api :PUT, "/hosts/:host_id/errata/apply", N_("Schedule errata for installation")
+    api :PUT, "/hosts/:host_id/errata/apply", N_("Schedule errata for installation using katello-agent. %s") % katello_agent_deprecation_text, deprecated: true
     param :host_id, :number, :desc => N_("Host ID"), :required => true
     param :errata_ids, Array, :desc => N_("List of Errata ids to install. Will be removed in Katello 4.1."), :required => false, :deprecated => true
 

data/app/controllers/katello/api/v2/host_packages_controller.rb

@@ -27,7 +27,7 @@ module Katello
       respond_for_index(:collection => collection)
     end
 
-    api :PUT, "/hosts/:host_id/packages/install", N_("Install packages remotely")
+    api :PUT, "/hosts/:host_id/packages/install", N_("Install packages remotely using katello-agent. %s") % katello_agent_deprecation_text, deprecated: true
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param_group :packages_or_groups
     def install
@@ -45,7 +45,7 @@ module Katello
       end
     end
 
-    api :PUT, "/hosts/:host_id/packages/upgrade", N_("Update packages remotely")
+    api :PUT, "/hosts/:host_id/packages/upgrade", N_("Update packages remotely using katello-agent. %s") % katello_agent_deprecation_text, deprecated: true
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param :packages, Array, :desc => N_("list of packages names"), :required => true
     def upgrade
@@ -56,14 +56,14 @@ module Katello
       end
     end
 
-    api :PUT, "/hosts/:host_id/packages/upgrade_all", N_("Update packages remotely")
+    api :PUT, "/hosts/:host_id/packages/upgrade_all", N_("Update packages remotely using katello-agent. %s") % katello_agent_deprecation_text, deprecated: true
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     def upgrade_all
       task = async_task(::Actions::Katello::Host::Package::Update, @host, content: [])
       respond_for_async :resource => task
     end
 
-    api :PUT, "/hosts/:host_id/packages/remove", N_("Uninstall packages remotely")
+    api :PUT, "/hosts/:host_id/packages/remove", N_("Uninstall packages remotely using katello-agent. %s") % katello_agent_deprecation_text, deprecated: true
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param_group :packages_or_groups
     def remove

data/app/controllers/katello/api/v2/host_subscriptions_controller.rb

@@ -90,8 +90,8 @@ module Katello
     def params_to_rhsm_params
       rhsm_params = params.slice(:facts, :uuid, :name).to_unsafe_h
       rhsm_params[:releaseVer] = params['release_version'] if params['release_version']
-      rhsm_params[:usage] = parms['purpose_usage'] if params['purpose_usage']
-      rhsm_params[:role] = parms['purpose_role'] if params['purpose_role']
+      rhsm_params[:usage] = params['purpose_usage'] if params['purpose_usage']
+      rhsm_params[:role] = params['purpose_role'] if params['purpose_role']
       rhsm_params[:addOns] = params['purpose_addons'] if params['purpose_addons']
       rhsm_params[:serviceLevel] = params['service_level'] if params['service_level']
       rhsm_params[:guestIds] = params['hypervisor_guest_uuids'] if params[:hypervisor_guest_uuids]
@@ -147,6 +147,15 @@ module Katello
       respond_for_index(:collection => index_response(true), :template => "index")
     end
 
+    api :GET, "/hosts/:host_id/subscriptions/product_content", N_("Get content and overrides for the host")
+    param :host_id, String, :desc => N_("Id of the host"), :required => true
+    param :content_access_mode_all, :bool, :desc => N_("Get all content available, not just that provided by subscriptions")
+    param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the host's content view version")
+    def product_content
+      # note this is just there as a place holder for apipie.
+      # The routing would automatically redirect it to repository_sets#index
+    end
+
     api :PUT, "/hosts/:host_id/subscriptions/content_override", N_("Set content overrides for the host")
     param :host_id, String, :desc => N_("Id of the content host"), :required => true
     param :value, String, :desc => N_("Override to a boolean value or 'default'"), :required => false
@@ -163,26 +172,7 @@ module Katello
         validate_content_overrides_enabled(override_params)
       end
       sync_task(::Actions::Katello::Host::UpdateContentOverrides, @host, content_override_values, false)
-      product_content
-    end
-
-    api :GET, "/hosts/:host_id/subscriptions/product_content", N_("Get content and overrides for the host")
-    param :host_id, String, :desc => N_("Id of the host"), :required => true
-    param :content_access_mode_all, :bool, :desc => N_("Get all content available, not just that provided by subscriptions")
-    param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the host's content view version")
-    def product_content
-      content_access_mode_all = ::Foreman::Cast.to_bool(params[:content_access_mode_all])
-      content_access_mode_env = ::Foreman::Cast.to_bool(params[:content_access_mode_env])
-
-      content_finder = ProductContentFinder.new(
-          :consumable => @host.subscription_facet,
-          :match_subscription => !content_access_mode_all,
-          :match_environment => content_access_mode_env
-      )
-
-      content = content_finder.presenter_with_overrides(@host.subscription_facet.candlepin_consumer.content_overrides)
-
-      respond_for_index(:collection => full_result_response(content))
+      fetch_product_content
     end
 
     api :GET, "/hosts/:host_id/subscriptions/available_release_versions", N_("Show releases available for the content host")
@@ -194,6 +184,12 @@ module Katello
 
     private
 
+    def fetch_product_content
+      content_finder = ProductContentFinder.new(:consumable => @host.subscription_facet)
+      content = content_finder.presenter_with_overrides(@host.subscription_facet.candlepin_consumer.content_overrides)
+      respond_with_template_collection("index", 'repository_sets', :collection => full_result_response(content))
+    end
+
     def find_content_view_environment
       @content_view_environment = Katello::ContentViewEnvironment.where(:content_view_id => params[:content_view_id],
                                                                         :environment_id => params[:lifecycle_environment_id]).first

data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb

@@ -4,19 +4,19 @@ module Katello
     include Concerns::Api::V2::BulkHostsExtensions
     include Katello::Concerns::Api::V2::ContentOverridesController
 
-    before_action :find_host_collections, :only => [:bulk_add_host_collections, :bulk_remove_host_collections]
-    before_action :find_environment, :only => [:environment_content_view]
-    before_action :find_content_view, :only => [:environment_content_view]
-    before_action :find_editable_hosts, :except => [:destroy_hosts, :resolve_traces]
-    before_action :find_deletable_hosts, :only => [:destroy_hosts]
-    before_action :find_readable_hosts, :only => [:applicable_errata, :installable_errata, :available_incremental_updates]
-    before_action :find_errata, :only => [:available_incremental_updates]
-    before_action :find_organization, :only => [:add_subscriptions]
-    before_action :find_traces, :only => [:resolve_traces]
-    before_action :deprecate_katello_agent, :only => [:install_content, :update_content, :remove_content]
-
-    before_action :validate_content_action, :only => [:install_content, :update_content, :remove_content]
-    before_action :validate_organization, :only => [:add_subscriptions]
+    before_action :find_host_collections, only: [:bulk_add_host_collections, :bulk_remove_host_collections]
+    before_action :find_environment, only: [:environment_content_view]
+    before_action :find_content_view, only: [:environment_content_view]
+    before_action :find_editable_hosts, except: [:destroy_hosts, :resolve_traces]
+    before_action :find_deletable_hosts, only: [:destroy_hosts]
+    before_action :find_readable_hosts, only: [:applicable_errata, :installable_errata, :available_incremental_updates]
+    before_action :find_errata, only: [:available_incremental_updates]
+    before_action :find_organization, only: [:add_subscriptions]
+    before_action :find_traces, only: [:resolve_traces]
+    before_action :deprecate_katello_agent, only: [:install_content, :update_content, :remove_content]
+
+    before_action :validate_content_action, only: [:install_content, :update_content, :remove_content]
+    before_action :validate_organization, only: [:add_subscriptions]
 
     # disable *_count fields on erratum rabl, since they perform N+1 queries
     before_action :disable_erratum_hosts_count
@@ -115,7 +115,7 @@ module Katello
                                                      :resource_class => Erratum))
     end
 
-    api :PUT, "/hosts/bulk/install_content", N_("Install content on one or more hosts")
+    api :PUT, "/hosts/bulk/install_content", N_("Install content on one or more hosts using katello-agent. %s") % katello_agent_deprecation_text, deprecated: true
     param_group :bulk_params
     param :content_type, String,
           :desc => N_("The type of content.  The following types are supported: 'package', 'package_group' and 'errata'."),
@@ -125,7 +125,7 @@ module Katello
       content_action
     end
 
-    api :PUT, "/hosts/bulk/update_content", N_("Update content on one or more hosts")
+    api :PUT, "/hosts/bulk/update_content", N_("Update content on one or more hosts using katello-agent. %s") % katello_agent_deprecation_text, deprecated: true
     param_group :bulk_params
     param :content_type, String,
           :desc => N_("The type of content.  The following types are supported: 'package' and 'package_group."),
@@ -136,7 +136,7 @@ module Katello
       content_action
     end
 
-    api :PUT, "/hosts/bulk/remove_content", N_("Remove content on one or more hosts")
+    api :PUT, "/hosts/bulk/remove_content", N_("Remove content on one or more hosts using katello-agent. %s") % katello_agent_deprecation_text, deprecated: true
     param_group :bulk_params
     param :content_type, String,
           :desc => N_("The type of content.  The following types are supported: 'package' and 'package_group."),

data/app/controllers/katello/api/v2/organizations_controller.rb

@@ -69,7 +69,8 @@ module Katello
     param_group :resource
     def create
       @organization = Organization.new(resource_params)
-      sync_task(::Actions::Katello::Organization::Create, @organization)
+      creator = ::Katello::OrganizationCreator.new(@organization)
+      creator.create!
       @organization.reload
       # @taxonomy instance variable is necessary for foreman side
       # app/views/api/v2/taxonomies/show.json.rabl is using it.

data/app/controllers/katello/api/v2/package_groups_controller.rb

@@ -66,6 +66,10 @@ module Katello
       collection
     end
 
+    def all_for_content_view_filter(filter, _collection)
+      PackageGroup.joins(:repositories).merge(filter.applicable_repos)
+    end
+
     def default_sort
       %w(name asc)
     end

data/app/controllers/katello/api/v2/repositories_controller.rb

@@ -57,6 +57,8 @@ module Katello
       param :deb_architectures, String, :desc => N_("whitespace-separated list of architectures to be synced from deb-archive")
       param :ignorable_content, Array, :desc => N_("List of content units to ignore while syncing a yum repository. Must be subset of %s") % RootRepository::IGNORABLE_CONTENT_UNIT_TYPES.join(",")
       param :ansible_collection_requirements, String, :desc => N_("Contents of requirement yaml file to sync from URL")
+      param :ansible_collection_auth_url, String, :desc => N_("The URL to receive a session token from, e.g. used with Automation Hub.")
+      param :ansible_collection_auth_token, String, :desc => N_("The token key to use for authentication.")
       param :http_proxy_policy, ::Katello::RootRepository::HTTP_PROXY_POLICIES, :desc => N_("policies for HTTP proxy for content sync")
       param :http_proxy_id, :number, :desc => N_("ID of a HTTP Proxy")
       param :arch, String, :desc => N_("Architecture of content in the repository")
@@ -205,12 +207,6 @@ module Katello
           .where("#{OstreeBranch.table_name}.id" => OstreeBranch.with_identifiers(params[:ostree_branch_id]))
       end
 
-      if params[:puppet_module_id]
-        query = query
-                  .joins(:puppet_modules)
-                  .where("#{PuppetModule.table_name}.id" => PuppetModule.with_identifiers(params[:puppet_module_id]))
-      end
-
       query
     end
 
@@ -356,12 +352,11 @@ module Katello
 
     api :PUT, "/repositories/:id/remove_packages"
     api :PUT, "/repositories/:id/remove_docker_manifests"
-    api :PUT, "/repositories/:id/remove_puppet_modules"
     api :PUT, "/repositories/:id/remove_content"
     desc "Remove content from a repository"
     param :id, :number, :required => true, :desc => "repository ID"
     param 'ids', Array, :required => true, :desc => "Array of content ids to remove"
-    param :content_type, RepositoryTypeManager.removable_content_types.map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree', 'puppet_module', 'rpm', 'srpm')")
+    param :content_type, RepositoryTypeManager.removable_content_types.map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree', 'rpm', 'srpm')")
     param 'sync_capsule', :bool, :desc => N_("Whether or not to sync an external capsule after upload. Default: true")
     def remove_content
       sync_capsule = ::Foreman::Cast.to_bool(params.fetch(:sync_capsule, true))
@@ -372,7 +367,7 @@ module Katello
     api :POST, "/repositories/:id/upload_content", N_("Upload content into the repository")
     param :id, :number, :required => true, :desc => N_("repository ID")
     param :content, File, :required => true, :desc => N_("Content files to upload. Can be a single file or array of files.")
-    param :content_type, RepositoryTypeManager.uploadable_content_types.map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree', 'puppet_module', 'rpm', 'srpm')")
+    param :content_type, RepositoryTypeManager.uploadable_content_types.map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree', 'rpm', 'srpm')")
     def upload_content
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Container Image content.") if @repository.docker?
 
@@ -401,7 +396,7 @@ module Katello
     param :async, :bool, desc: N_("Do not wait for the ImportUpload action to finish. Default: false")
     param 'publish_repository', :bool, :desc => N_("Whether or not to regenerate the repository on disk. Default: true")
     param 'sync_capsule', :bool, :desc => N_("Whether or not to sync an external capsule after upload. Default: true")
-    param :content_type, RepositoryTypeManager.uploadable_content_types.map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree', 'puppet_module', 'rpm', 'srpm')")
+    param :content_type, RepositoryTypeManager.uploadable_content_types.map(&:label), :required => false, :desc => N_("content type ('deb', 'docker_manifest', 'file', 'ostree', 'rpm', 'srpm')")
     param :uploads, Array, :desc => N_("Array of uploads to import") do
       param 'id', String, :required => true
       param 'content_unit_id', String
@@ -482,7 +477,7 @@ module Katello
              ]
 
       keys += [{:docker_tags_whitelist => []}, :docker_upstream_name] if params[:action] == 'create' || @repository&.docker?
-      keys += [:ansible_collection_requirements] if params[:action] == 'create' || @repository&.ansible_collection?
+      keys += [:ansible_collection_requirements, :ansible_collection_auth_url, :ansible_collection_auth_token] if params[:action] == 'create' || @repository&.ansible_collection?
       keys += [:label, :content_type] if params[:action] == "create"
       if params[:action] == 'create' || @repository.custom?
         keys += [:url, :gpg_key_id, :ssl_ca_cert_id, :ssl_client_cert_id, :ssl_client_key_id, :unprotected, :name,
@@ -502,6 +497,7 @@ module Katello
     end
 
     # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def construct_repo_from_params(repo_params) # rubocop:disable Metrics/AbcSize
       root = @product.add_repo(repo_params.slice(:label, :name, :description, :url, :content_type, :arch, :unprotected,
                                                             :gpg_key, :ssl_ca_cert, :ssl_client_cert, :ssl_client_key,
@@ -513,7 +509,6 @@ module Katello
       root.upstream_username = repo_params[:upstream_username] if repo_params.key?(:upstream_username)
       root.upstream_password = repo_params[:upstream_password] if repo_params.key?(:upstream_password)
       root.ignorable_content = repo_params[:ignorable_content] if root.yum? && repo_params.key?(:ignorable_content)
-      root.ansible_collection_requirements = repo_params[:ansible_collection_requirements] if root.ansible_collection?
       root.http_proxy_policy = repo_params[:http_proxy_policy] if repo_params.key?(:http_proxy_policy)
       root.http_proxy_id = repo_params[:http_proxy_id] if repo_params.key?(:http_proxy_id)
       root.os_versions = repo_params.fetch(:os_versions, []) if root.yum?
@@ -528,6 +523,12 @@ module Katello
         root.deb_architectures = repo_params[:deb_architectures] if repo_params[:deb_architectures]
       end
 
+      if root.ansible_collection?
+        root.ansible_collection_requirements = repo_params[:ansible_collection_requirements] if repo_params[:ansible_collection_requirements]
+        root.ansible_collection_auth_url = repo_params[:ansible_collection_auth_url] if repo_params[:ansible_collection_auth_url]
+        root.ansible_collection_auth_token = repo_params[:ansible_collection_auth_token] if repo_params[:ansible_collection_auth_token]
+      end
+
       root
     end
     # rubocop:enable Metrics/CyclomaticComplexity

data/app/controllers/katello/api/v2/repository_sets_controller.rb

@@ -8,6 +8,9 @@ module Katello
     before_action :set_editable_product_scope, only: [:enable, :disable]
     before_action :find_product
     before_action :custom_product?
+    before_action :setup_params
+    before_action :find_authorized_activation_key, :only => [:index, :auto_complete_search]
+    before_action :find_authorized_host, :only => [:index, :auto_complete_search]
     before_action :find_organization
     before_action :find_product_content, :except => [:index, :auto_complete_search]
 
@@ -23,10 +26,18 @@ module Katello
     param :with_active_subscription, :bool, :required => false, :desc => N_("If true, only return repository sets that are associated with an active subscriptions")
     param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     param :with_custom, :bool, :required => false, :desc => N_("If true, return custom repository sets along with redhat repos")
+    param :activation_key_id, :number, :desc => N_("activation key identifier"), :required => false
+    param :host_id, :number, :desc => N_("Id of the host"), :required => false
+    param :content_access_mode_all, :bool, :desc => N_("Get all content available, not just that provided by subscriptions. Relevant for Activation Keys only")
+    param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the activation key's content view version. Relevant for Activation Keys only")
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(Katello::ProductContent)
     def index
-      respond(:collection => scoped_search(index_relation, :name, :asc, :resource_class => Katello::ProductContent))
+      collection = scoped_search(index_relation, :name, :asc, :resource_class => Katello::ProductContent)
+      collection[:results] = ProductContentFinder.wrap_with_overrides(
+          product_contents: collection[:results],
+          overrides: @consumable&.content_overrides)
+      respond(:collection => collection)
     end
 
     api :GET, "/repository_sets/:id", N_("Get info about a repository set")
@@ -100,7 +111,7 @@ module Katello
     protected
 
     def resource_class
-      Katello::Content
+      Katello::ProductContent
     end
 
     def index_relation
@@ -122,7 +133,20 @@ module Katello
 
       relation = relation.where(Katello::Content.table_name => {:name => params[:name]}) if params[:name].present?
       relation = relation.redhat unless ::Foreman::Cast.to_bool(params[:with_custom])
-      relation
+      index_relation_with_consumable_overrides(relation)
+    end
+
+    def index_relation_with_consumable_overrides(relation)
+      return relation if @consumable.blank?
+
+      content_access_mode_all = ::Foreman::Cast.to_bool(params[:content_access_mode_all])
+      content_access_mode_env = ::Foreman::Cast.to_bool(params[:content_access_mode_env])
+
+      content_finder = ProductContentFinder.new(
+          :match_subscription => !content_access_mode_all,
+          :match_environment => content_access_mode_env,
+          :consumable => @consumable)
+      relation.merge(content_finder.product_content)
     end
 
     def find_product_content
@@ -153,7 +177,7 @@ module Katello
     end
 
     def find_organization
-      @organization = @product&.organization || super
+      @organization = @product&.organization || @consumable&.organization || super
     end
 
     def custom_product?
@@ -163,5 +187,27 @@ module Katello
     def substitutions
       params.permit(:basearch, :releasever).to_h
     end
+
+    def find_authorized_activation_key
+      return unless params[:activation_key_id]
+      @activation_key = ActivationKey.readable.find_by(:id => params[:activation_key_id])
+      @consumable = @activation_key
+      throw_resource_not_found(name: 'activation_key', id: params[:activation_key_id]) if @activation_key.blank?
+    end
+
+    def find_authorized_host
+      return unless params[:host_id]
+      find_host_with_subscriptions(params[:host_id], :view_hosts)
+      @consumable = @host.subscription_facet
+    end
+
+    def setup_params
+      return unless params[:id]
+      if params[:entity] == :activation_key
+        params[:activation_key_id] ||= params[:id]
+      else
+        params[:host_id] ||= params[:id]
+      end
+    end
   end
 end

data/app/controllers/katello/api/v2/subscriptions_controller.rb

@@ -21,14 +21,19 @@ module Katello
     api :GET, "/activation_keys/:activation_key_id/subscriptions", N_("List an activation key's subscriptions")
     api :GET, "/subscriptions", N_("List subscriptions")
     param_group :search, Api::V2::ApiController
-    param :organization_id, :number, :desc => N_("Organization ID"), :required => false
+    param :organization_id, :number, :desc => N_("Organization ID"), :required => true
     param :host_id, String, :desc => N_("id of a host"), :required => false
     param :activation_key_id, String, :desc => N_("Activation key ID"), :required => false
+    param :name, String, :desc => N_("name of the subscription"), :required => false
     param :available_for, String, :desc => N_("Object to show subscriptions available for, either 'host' or 'activation_key'"), :required => false
     param :match_host, :bool, :desc => N_("Ignore subscriptions that are unavailable to the specified host")
     param :match_installed, :bool, :desc => N_("Return subscriptions that match installed products of the specified host")
     param :no_overlap, :bool, :desc => N_("Return subscriptions which do not overlap with a currently-attached subscription")
     def index
+      unless @organization || @activation_key
+        fail HttpErrors::NotFound, _("Organization Information not provided.")
+      end
+
       options = { resource_class: Pool, includes: [:subscription] }
       base_args = [index_relation.distinct, :name, :asc]
 
@@ -63,6 +68,7 @@ module Katello
       return for_host if params[:host_id]
       return available_for_activation_key if params[:available_for] == "activation_key"
       collection = Pool.readable
+      collection = collection.where("#{Katello::Subscription.table_name}.name" => params[:name]) if params[:name]
       collection = collection.where(:unmapped_guest => false)
       collection = collection.where(organization: Organization.find(params[:organization_id])) if params[:organization_id]
       collection = collection.for_activation_key(@activation_key) if params[:activation_key_id]

data/app/controllers/katello/concerns/api/api_controller.rb

@@ -17,6 +17,16 @@ module Katello
         User.current
       end
 
+      class_methods do
+        def katello_agent_deprecation_text
+          N_("NOTE: Katello-agent is deprecated and will be removed in %s. Consider using remote execution instead.") % katello_agent_removal_release
+        end
+
+        def katello_agent_removal_release
+          N_("a future release")
+        end
+      end
+
       protected
 
       def request_from_katello_cli?

data/app/controllers/katello/concerns/api/v2/registration_commands_controller_extensions.rb

@@ -0,0 +1,46 @@
+module Katello
+  module Concerns
+    module Api::V2::RegistrationCommandsControllerExtensions
+      extend ActiveSupport::Concern
+
+      module Overrides
+        def registration_args
+          args = super
+          args['activation_keys'] ||= []
+
+          if args['activation_key'].present?
+            args['activation_keys'] << args.delete('activation_key').split(',').map(&:strip).reject(&:blank?).join(',')
+          end
+
+          args['activation_keys'] = args['activation_keys'].join(',')
+          args.delete('activation_keys') if args['activation_keys'].empty?
+          args
+        end
+
+        def append_array_of_ids(hash_params)
+          return if registration_params['activation_key'].present? || registration_params['activation_keys'].present?
+          super
+        end
+      end
+
+      module ApiPieExtensions
+        extend ::Apipie::DSL::Concern
+
+        update_api(:create) do
+          param :registration_command, Hash do
+            param :activation_key, String, desc: N_('Activation key for subscription-manager client. Required for CentOS and Red Hat Enterprise Linux. Multiple keys add separated by comma, example: key1,key2,key3.'), deprecated: true
+            param :activation_keys, Array, required: true, desc: N_('Activation key(s) for subscription-manager client. Required for CentOS and Red Hat Enterprise Linux. Required only if host group has no activation keys')
+            param :lifecycle_environment_id, :number, required: false, desc: N_('Lifecycle environment for the host.')
+            param :force, :bool, required: false, desc: N_('Clear any previous registration and run subscription-manager with --force.')
+            param :ignore_subman_errors, :bool, required: false, desc: N_('Ignore subscription-manager errors for `subscription-manager register` command')
+          end
+        end
+      end
+
+      included do
+        prepend Overrides
+        include ApiPieExtensions
+      end
+    end
+  end
+end

data/app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb

@@ -16,6 +16,14 @@ module Katello
           super
         end
       end
+
+      def host_setup_extension
+        if params['host']['lifecycle_environment_id']
+          @host.update!(lifecycle_environment: KTEnvironment.readable.find(params['host']['lifecycle_environment_id']))
+        end
+
+        super
+      end
     end
   end
 end