katello 3.4.5 → 3.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6decdc9453fd01ddb91c38c97e6404c2f34cc783
-  data.tar.gz: 73716c2989e80487d5adbe8cf9cf638296ab924f
+  metadata.gz: 197daf28e10fa953b9af390cfb2032282e21cc3c
+  data.tar.gz: ab856dbc2c77fb57a3275adec5059d63c25432ba
 SHA512:
-  metadata.gz: 7b47b7ced813970a5a2b46d993c076f10e4ea82be0952b9f39be28f1146f3b1b3f7c3088ee611451374a3f3f2f84b8267a42c2d01596111c89e715afdb569187
-  data.tar.gz: 01775bd60e7f80c929ad14c2328482d9ecd38f30224b0411c9b3f425a7d9b81ea41529105a9a644da68d212d3d7b3fe807c29bbf788f6b1ffa9e414ebd5505c3
+  metadata.gz: e0f7b7e00932a884f30e7b4239322c994ad12fc952fa78a4d437bc9e005824de3c472d515bf9cb8a6d2af88c3fd40fdea5a8766ae25658b0ca5096f58664f999
+  data.tar.gz: d5bf3847cb11fd990a81e52d8fbde811322671d5498a8d547ac1ab4d2fff47ec11d75417befcd9972b27004056853d6fd26a0bb592a50521f8a0e19e922c4d83

data/README.md

@@ -67,6 +67,10 @@ That's rather unfortunate. But don't worry! We can help. Just file a bug
 
 See the [developer documentation](http://www.katello.org/developers/index.html).
 
+## Annotated Pulp and Candlepin Workflows and test Scenarios
+
+See the [annotation docs](./test/scenarios/README.md) for more information.
+
 ## Contact & Resources
 
  * [Katello.org](http://katello.org)

data/app/assets/stylesheets/katello/katello.scss

@@ -1,3 +1,10 @@
+/**
+ * = require "katello/jquery.loadmask.css"
+ * = require "katello/jquery-ui-1.8.11.custom.css"
+ * = require "katello/jquery.treeTable.css"
+ * = require "katello/ui.spinner.css"
+ */
+
 @import "katello/overrides";
 @import "katello/katello_base";
 @import "katello/look";
@@ -7,11 +14,6 @@
 @import "katello/widgets/tabs";
 @import "katello/katello_sprites";
 
-@import "katello/jquery.loadmask";
-@import "katello/jquery-ui-1.8.11.custom";
-@import "katello/jquery.treeTable";
-@import "katello/ui.spinner";
-
 @import "katello/contents";
 @import "katello/generic";
 @import "katello/notifications";

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

@@ -97,8 +97,8 @@ module Katello
       @activation_key.content_overrides.each do |content|
         @new_activation_key.set_content_override(content['contentLabel'], content[:name], content[:value])
       end
-      @activation_key.subscriptions.each do |subscription|
-        @new_activation_key.subscribe(subscription[:id])
+      @activation_key.pools.each do |pool|
+        @new_activation_key.subscribe(pool[:id])
       end
       respond_for_show(:resource => @new_activation_key)
     end
@@ -228,7 +228,7 @@ module Katello
       end
 
       content_override_values = content_overrides.map do |override_params|
-        validate_content_overrides_enabled(override_params, @activation_key)
+        validate_content_overrides_enabled(override_params)
       end
       @activation_key.set_content_overrides(content_override_values)
       respond_for_show(:resource => @activation_key)

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

@@ -48,7 +48,9 @@ module Katello
       search_options[0].blank?
     end
 
+    # rubocop:disable Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/PerceivedComplexity
     def scoped_search(query, default_sort_by, default_sort_order, options = {})
       resource = options[:resource_class] || resource_class
@@ -65,12 +67,18 @@ module Katello
       query = query.select(group).group(group) if group
       sub_total = total.zero? ? 0 : scoped_search_total(query, group)
 
+      if params[:order]
+        (params[:sort_by], params[:sort_order]) = params[:order].split(' ')
+      end
+
       sort_attr = params[:sort_by] || default_sort_by
 
       if sort_attr
         sort_order = (params[:sort_order] || default_sort_order).to_s.downcase
         sort_order = default_sort_order unless ['desc', 'asc'].include?(sort_order)
         query = query.order(sort_attr => sort_order.to_sym)
+        params[:sort_by] = sort_attr
+        params[:sort_order] = sort_order
       elsif options[:custom_sort]
         query = options[:custom_sort].call(query)
       end

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

@@ -49,9 +49,14 @@ module Katello
     api :POST, '/capsules/:id/content/sync', N_('Synchronize the content to the smart proxy')
     param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
     param :environment_id, Integer, :desc => N_('Id of the environment to limit the synchronization on')
+    param :skip_metadata_check, :bool, :desc => N_('Skip metadata check on each repository on the smart proxy')
     def sync
       find_environment if params[:environment_id]
-      task = async_task(::Actions::Katello::CapsuleContent::Sync, capsule_content.capsule, :environment_id => @environment.try(:id))
+      skip_metadata_check = ::Foreman::Cast.to_bool(params[:skip_metadata_check])
+      task = async_task(::Actions::Katello::CapsuleContent::Sync,
+                        capsule_content.capsule,
+                        :environment_id => @environment.try(:id),
+                        :skip_metadata_check => skip_metadata_check)
       respond_for_async :resource => task
     end
 

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

@@ -23,7 +23,7 @@ module Katello
     param :name, [String, Array], :desc => N_("package, package group, or docker tag names")
     param :uuid, String, :desc => N_("package group: uuid")
     param :version, String, :desc => N_("package: version")
-    param :arch, String, :desc => N_("package: architecture")
+    param :architecture, String, :desc => N_("package: architecture")
     param :min_version, String, :desc => N_("package: minimum version")
     param :max_version, String, :desc => N_("package: maximum version")
     param :errata_id, String, :desc => N_("erratum: id")
@@ -68,6 +68,7 @@ module Katello
     param :id, :identifier, :desc => N_("rule identifier"), :required => true
     param :name, String, :desc => N_("package, package group, or docker tag: name")
     param :version, String, :desc => N_("package: version")
+    param :architecture, String, :desc => N_("package: architecture")
     param :min_version, String, :desc => N_("package: minimum version")
     param :max_version, String, :desc => N_("package: maximum version")
     param :errata_id, String, :desc => N_("erratum: id")

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

@@ -76,7 +76,7 @@ module Katello
     param :iso_mb_size, :number, :desc => N_("maximum size of each ISO in MB"), :required => false
     param :since, Date, :desc => N_("Optional date of last export (ex: 2010-01-01T12:00:00Z)"), :required => false
     def export
-      if !params[:export_to_iso].present? && params[:iso_mb_size].present?
+      if params[:export_to_iso].blank? && params[:iso_mb_size].present?
         fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
       end
 

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

@@ -40,7 +40,7 @@ module Katello
       content_views = ContentView.readable
       content_views = content_views.where(:organization_id => @organization.id) if @organization
       content_views = content_views.in_environment(@environment) if @environment
-      content_views = content_views.non_default if params[:nondefault]
+      content_views = ::Foreman::Cast.to_bool(params[:nondefault]) ? content_views.non_default : content_views.default if params[:nondefault]
       content_views = ::Foreman::Cast.to_bool(params[:noncomposite]) ? content_views.non_composite : content_views.composite if params[:noncomposite]
       content_views = ::Foreman::Cast.to_bool(params[:composite]) ? content_views.composite : content_views.non_composite if params[:composite]
       content_views = content_views.where(:name => params[:name]) if params[:name]

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

@@ -27,7 +27,7 @@ module Katello
     api :GET, "/organizations/:organization_id/host_collections", N_("List host collections within an organization")
     api :GET, "/activation_keys/:activation_key_id/host_collections", N_("List host collections in an activation key")
     param_group :search, Api::V2::ApiController
-    param :organization_id, :number, :desc => N_("organization identifier"), :required => false
+    param :organization_id, :number, :desc => N_("organization identifier"), :required => true
     param :name, String, :desc => N_("host collection name to filter by")
     param :activation_key_id, :identifier, :desc => N_("activation key identifier")
     param :host_id, :identifier, :desc => N_("Filter products by host id")

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

@@ -159,7 +159,7 @@ module Katello
       end
 
       content_override_values = content_overrides.map do |override_params|
-        validate_content_overrides_enabled(override_params, @host)
+        validate_content_overrides_enabled(override_params)
       end
       sync_task(::Actions::Katello::Host::UpdateContentOverrides, @host, content_override_values, false)
       product_content
@@ -195,7 +195,7 @@ module Katello
     end
 
     def check_subscriptions
-      fail HttpErrors::BadRequest, _("subscriptions not specified") if params[:subscriptions].nil? || params[:subscriptions].empty?
+      fail HttpErrors::BadRequest, _("subscriptions not specified") if params[:subscriptions].blank?
     end
 
     def find_host

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

@@ -12,7 +12,7 @@ module Katello
     api :GET, "/hosts/:host_id/tracer", N_("List servises that need restarting on the host")
     param :host_id, :identifier, :required => true, :desc => N_("ID of the host")
     def index
-      collection = scoped_search(index_relation.uniq, :application, :asc, :resource_class => ::Katello::HostTracer)
+      collection = scoped_search(index_relation, :application, :asc, :resource_class => ::Katello::HostTracer)
       respond_for_index(:collection => collection)
     end
 

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

@@ -6,9 +6,9 @@ module Katello
     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, :applicable_errata]
+    before_action :find_editable_hosts, :except => [:destroy_hosts, :installable_errata]
     before_action :find_deletable_hosts, :only => [:destroy_hosts]
-    before_action :find_readable_hosts, :only => [:applicable_errata, :available_incremental_updates]
+    before_action :find_readable_hosts, :only => [:installable_errata, :available_incremental_updates]
     before_action :find_errata, :only => [:available_incremental_updates]
 
     before_action :validate_content_action, :only => [:install_content, :update_content, :remove_content]
@@ -91,8 +91,8 @@ module Katello
                        :resource => { 'displayMessages' => display_messages }
     end
 
-    api :POST, "/hosts/bulk/applicable_errata",
-        N_("Fetch applicable errata for a host.")
+    api :POST, "/hosts/bulk/installable_errata",
+        N_("Fetch installable errata for a host.")
     param_group :bulk_params
     def installable_errata
       respond_for_index(:collection => scoped_search(Katello::Erratum.installable_for_hosts(@hosts), 'updated', 'desc',
@@ -176,7 +176,7 @@ module Katello
       respond_for_async :resource => task
     end
 
-    api :PUT, "/hosts/bulk/subscriptions/content_overrides", N_("Set content overrides to one or more hosts")
+    api :PUT, "/hosts/bulk/content_overrides", N_("Set content overrides to one or more hosts")
     param_group :bulk_params
     param :content_overrides, Array, :desc => N_("Array of Content override parameters") do
       param :content_label, String, :desc => N_("Label of the content"), :required => true
@@ -190,7 +190,7 @@ module Katello
         validate_content_overrides_enabled(content_override_params)
       end
 
-      task = async_task(::Actions::BulkAction, ::Actions::Katello::Host::UpdateContentOverrides, @hosts, content_override_values)
+      task = async_task(::Actions::BulkAction, ::Actions::Katello::Host::UpdateContentOverrides, @hosts, content_override_values, false)
       respond_for_async :resource => task
     end
 

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

@@ -143,11 +143,11 @@ module Katello
         gpg_key = @gpg_key
       end
       repo_params[:label] = labelize_params(repo_params)
+      repo_params[:arch] = repo_params[:arch] || 'noarch'
       repo_params[:url] = nil if repo_params[:url].blank?
-      unprotected =  repo_params.key?(:unprotected) ? repo_params[:unprotected] : true
-      repository = @product.add_repo(repo_params[:label], repo_params[:name], repo_params[:url],
-                                     repo_params[:content_type], unprotected,
-                                     gpg_key, repository_params[:checksum_type], repo_params[:download_policy])
+      repo_params[:unprotected] = repo_params.key?(:unprotected) ? repo_params[:unprotected] : true
+      repo_params[:gpg_key] = gpg_key
+      repository = @product.add_repo(Hash[repo_params.slice(:label, :name, :url, :content_type, :arch, :unprotected, :gpg_key, :checksum_type, :download_policy).map { |k, v| [k.to_sym, v] }])
       repository.docker_upstream_name = repo_params[:docker_upstream_name] if repo_params[:docker_upstream_name]
       repository.mirror_on_sync = ::Foreman::Cast.to_bool(repo_params[:mirror_on_sync]) if repo_params.key?(:mirror_on_sync)
       repository.verify_ssl_on_sync = ::Foreman::Cast.to_bool(repo_params[:verify_ssl_on_sync]) if repo_params.key?(:verify_ssl_on_sync)
@@ -217,7 +217,7 @@ module Katello
     param :iso_mb_size, :number, :desc => N_("maximum size of each ISO in MB"), :required => false
     param :since, Date, :desc => N_("Optional date of last export (ex: 2010-01-01T12:00:00Z)"), :required => false
     def export
-      if !params[:export_to_iso].present? && params[:iso_mb_size].present?
+      if params[:export_to_iso].blank? && params[:iso_mb_size].present?
         fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
       end
 
@@ -325,7 +325,6 @@ module Katello
       else
         fail HttpErrors::BadRequest, _("No file uploaded")
       end
-
     rescue Katello::Errors::InvalidRepositoryContent => error
       respond_for_exception(
         error,
@@ -418,7 +417,7 @@ module Katello
     end
 
     def repository_params
-      keys = [:download_policy, :mirror_on_sync, :verify_ssl_on_sync, :upstream_password, :upstream_username,
+      keys = [:download_policy, :mirror_on_sync, :arch, :verify_ssl_on_sync, :upstream_password, :upstream_username,
               :ostree_upstream_sync_depth, :ostree_upstream_sync_policy
              ]
       keys += [:label, :content_type] if params[:action] == "create"

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

@@ -2,7 +2,8 @@ module Katello
   class Api::V2::RepositorySetsController < Api::V2::ApiController
     respond_to :json
 
-    before_action :find_product
+    before_action :find_product, :except => [:index]
+    before_action :find_optional_product, :only => [:index]
     before_action :custom_product?
     before_action :find_product_content, :except => [:index]
 
@@ -16,7 +17,11 @@ module Katello
     param_group :search, Api::V2::ApiController
     def index
       collection = {}
-      collection[:results] = @product.displayable_product_contents
+      if @product.nil?
+        collection[:results] = available_repository_sets
+      else
+        collection[:results] = @product.displayable_product_contents
+      end
       # filter on name if it is provided
       collection[:results] = collection[:results].select { |pc| pc.content.name == params[:name] } if params[:name]
       collection[:subtotal] = collection[:results].size
@@ -83,18 +88,34 @@ module Katello
       fail HttpErrors::NotFound, _("Couldn't find repository set with id '%s'.") % params[:id] if @product_content.nil?
     end
 
-    def find_product
+    def find_optional_product
       @product = Product.find_by(:id => params[:product_id])
+      @organization = @product.organization unless @product.nil?
+      find_organization if @organization.nil?
+      @product
+    end
+
+    def find_product
+      @product = find_optional_product
       fail HttpErrors::NotFound, _("Couldn't find product with id '%s'") % params[:product_id] if @product.nil?
       @organization = @product.organization
     end
 
     def custom_product?
-      fail _('Repository sets are not available for custom products.') if @product.custom?
+      fail _('Repository sets are not available for custom products.') if @product && @product.custom?
     end
 
     def substitutions
       params.slice(:basearch, :releasever)
     end
+
+    def available_repository_sets
+      repository_sets = @organization.products.enabled.uniq.flat_map do |product|
+        product.available_content
+      end
+      repository_sets.uniq.sort_by do |repository_set|
+        repository_set.content.name.downcase
+      end
+    end
   end
 end

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

@@ -3,8 +3,7 @@ module Katello
     module Api::V2::ContentOverridesController
       extend ActiveSupport::Concern
 
-      # overriden_object => pass it either an activation key or content host
-      def validate_content_overrides_enabled(content_params, overriden_object = nil)
+      def validate_content_overrides_enabled(content_params)
         name = content_params[:name] || "enabled"
         compare_value = content_params[:value].to_s.downcase
         remove = content_params.key?(:remove) ? ::Foreman::Cast.to_bool(content_params[:remove]) : nil
@@ -16,8 +15,7 @@ module Katello
           fail HttpErrors::BadRequest, _("Value must either be a boolean or 'default' for 'enabled'")
         end
 
-        if content_label.blank? || (overriden_object &&
-                                    !overriden_object.valid_content_override_label?(content_label))
+        if content_label.blank?
           fail HttpErrors::BadRequest, _("Invalid content label: %s") % content_params[:content_label]
         end
 

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

@@ -1,50 +1,33 @@
 module Katello
   module Concerns
     module Api::V2::HostgroupsControllerExtensions
-      extend ActiveSupport::Concern
+      module ApiPieExtensions
+        extend ::Apipie::DSL::Concern
 
-      included do
-        def_param_group :hostgroup do
-          param :hostgroup, Hash, :required => true, :action_aware => true do
-            param :name, String, :required => true, :desc => N_('Name of the host group')
-            param :parent_id, :number, :desc => N_('Parent ID of the host group')
-            param :environment_id, :number, :desc => N_('Environment ID')
-            param :compute_profile_id, :number, :desc => N_('Compute profile ID')
-            param :operatingsystem_id, :number, :desc => N_('Operating system ID')
-            param :architecture_id, :number, :desc => N_('Architecture ID')
-            param :pxe_loader, Operatingsystem.all_loaders, :desc => N_("DHCP filename option (Grub2/PXELinux by default)")
-            param :medium_id, :number, :desc => N_('Media ID')
-            param :ptable_id, :number, :desc => N_('Partition table ID')
-            param :puppet_ca_proxy_id, :number, :desc => N_('Puppet CA proxy ID')
-            param :subnet_id, :number, :desc => N_('Subnet ID')
-            param :domain_id, :number, :desc => N_('Domain ID')
-            param :realm_id, :number, :desc => N_('Realm ID')
-            param :puppet_proxy_id, :number, :desc => N_('Puppet proxy ID')
-            param :root_pass, String, :desc => N_('Root password on provisioned hosts')
+        update_api(:create, :update) do
+          param :hostgroup, Hash do
             param :content_source_id, :number, :desc => N_('Content source ID')
             param :content_view_id, :number, :desc => N_('Content view ID')
             param :lifecycle_environment_id, :number, :desc => N_('Lifecycle environment ID')
             param :kickstart_repository_id, :number, :desc => N_('Kickstart repository ID')
-            param_group :taxonomies, ::Api::V2::BaseController
           end
         end
+      end
+
+      extend ActiveSupport::Concern
+
+      included do
+        include ApiPieExtensions
 
-        api :POST, "/hostgroups/", N_("Create a host group")
-        param_group :hostgroup, :as => :create
         def create
           @hostgroup = Hostgroup.new(hostgroup_params)
           process_response @hostgroup.save
         end
 
-        api :PUT, "/hostgroups/:id/", N_("Update a host group")
-        param :id, :identifier, :required => true
-        param_group :hostgroup
         def update
           process_response @hostgroup.update_attributes(hostgroup_params)
         end
 
-        api :GET, "/hostgroups/:id", N_("Show a host group")
-        param :id, :identifier, :required => true
         def show
           @render_template = 'katello/api/v2/hostgroups_extensions/show'
           render @render_template

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

@@ -1,31 +1,27 @@
 module Katello
   module Concerns
     module Api::V2::SmartProxiesControllerExtensions
-      extend ActiveSupport::Concern
+      module ApiPieExtensions
+        extend ::Apipie::DSL::Concern
 
-      included do
-        def_param_group :smart_proxy do
-          param :smart_proxy, Hash, :required => true, :action_aware => true do
-            param :name, String, :required => true
-            param :url, String, :required => true
+        update_api(:create, :update) do
+          param :smart_proxy, Hash do
             param :download_policy, String, :required => false, :desc => N_('Download Policy of the capsule, must be one of %s') %
-                                      SmartProxy::DOWNLOAD_POLICIES.join(', ')
-            param_group :taxonomies, ::Api::V2::BaseController
+                SmartProxy::DOWNLOAD_POLICIES.join(', ')
           end
         end
+      end
 
-        api :POST, "/smart_proxies/", N_("Create a smart proxy")
-        param_group :smart_proxy, :as => :create
+      extend ActiveSupport::Concern
+
+      included do
+        include ApiPieExtensions
 
         def create
           @smart_proxy = SmartProxy.new(smart_proxy_params)
           process_response @smart_proxy.save
         end
 
-        api :PUT, "/smart_proxies/:id/", N_("Update a smart proxy")
-        param :id, String, :required => true
-        param_group :smart_proxy
-
         def update
           process_response @smart_proxy.update_attributes(smart_proxy_params)
         end