katello 3.5.0.rc1 → 3.5.0.rc2

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

@@ -6,7 +6,7 @@ module Katello
     before_action :find_content_view_puppet_module, :only => [:show, :update, :destroy]
 
     api :GET, "/content_views/:content_view_id/content_view_puppet_modules", N_("List content view puppet modules")
-    param :content_view_id, :identifier, :desc => N_("content view identifier"), :required => true
+    param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
     param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
@@ -17,7 +17,7 @@ module Katello
 
     api :POST, "/content_views/:content_view_id/content_view_puppet_modules",
         N_("Add a puppet module to the content view")
-    param :content_view_id, :identifier, :desc => N_("content view identifier"), :required => true
+    param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
     param :id, String, :desc => N_("the id of the puppet module to associate")
@@ -29,15 +29,15 @@ module Katello
 
     api :GET, "/content_views/:content_view_id/content_view_puppet_modules/:id", N_("Show a content view puppet module")
     param :content_view_id, :number, :desc => N_("content view numeric identifier"), :required => true
-    param :id, :identifier, :desc => N_("puppet module ID"), :required => true
+    param :id, :number, :desc => N_("puppet module ID"), :required => true
     def show
       respond :resource => @puppet_module
     end
 
     api :PUT, "/content_views/:content_view_id/content_view_puppet_modules/:id",
         N_("Update a puppet module associated with the content view")
-    param :content_view_id, :identifier, :desc => N_("content view identifier"), :required => true
-    param :id, :identifier, :desc => N_("puppet module ID"), :required => true
+    param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
+    param :id, :number, :desc => N_("puppet module ID"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
     param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
@@ -48,8 +48,8 @@ module Katello
 
     api :DELETE, "/content_views/:content_view_id/content_view_puppet_modules/:id",
         N_("Remove a puppet module from the content view")
-    param :content_view_id, :identifier, :desc => N_("content view identifier"), :required => true
-    param :id, :identifier, :desc => N_("puppet module ID"), :required => true
+    param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
+    param :id, :number, :desc => N_("puppet module ID"), :required => true
     def destroy
       @puppet_module.destroy
       respond :resource => @puppet_module

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

@@ -14,12 +14,12 @@ module Katello
 
     api :GET, "/content_view_versions", N_("List content view versions")
     api :GET, "/content_views/:content_view_id/content_view_versions", N_("List content view versions")
-    param :content_view_id, :identifier, :desc => N_("Content view identifier"), :required => false
-    param :environment_id, :identifier, :desc => N_("Filter versions by environment"), :required => false
-    param :puppet_module_id, :identifier, :desc => N_("Filter versions by puppet module"), :required => false
+    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => false
+    param :environment_id, :number, :desc => N_("Filter versions by environment"), :required => false
+    param :puppet_module_id, :number, :desc => N_("Filter versions by puppet module"), :required => false
     param :version, String, :desc => N_("Filter versions by version number"), :required => false
-    param :composite_version_id, :identifier, :desc => N_("Filter versions that are components in the specified composite version"), :required => false
-    param :organization_id, :identifier, :desc => N_("Organization identifier")
+    param :composite_version_id, :number, :desc => N_("Filter versions that are components in the specified composite version"), :required => false
+    param :organization_id, :number, :desc => N_("Organization identifier")
     param_group :search, Api::V2::ApiController
     def index
       options = {
@@ -42,15 +42,15 @@ module Katello
     end
 
     api :GET, "/content_view_versions/:id", N_("Show content view version")
-    param :id, :identifier, :desc => N_("Content view version identifier"), :required => true
+    param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def show
       respond :resource => @version
     end
 
     api :POST, "/content_view_versions/:id/promote", N_("Promote a content view version")
-    param :id, :identifier, :desc => N_("Content view version identifier"), :required => true
+    param :id, :number, :desc => N_("Content view version identifier"), :required => true
     param :force, :bool, :desc => N_("force content view promotion and bypass lifecycle environment restriction")
-    param :environment_id, :identifier, :deprecated => true, :desc => N_("LifeCycle Environment identifier")
+    param :environment_id, :number, :deprecated => true, :desc => N_("LifeCycle Environment identifier")
     param :environment_ids, Array, :desc => N_("Identifiers for Lifecycle Environment")
     param :description, String, :desc => N_("The description for the content view version promotion")
     param :force_yum_metadata_regeneration, :bool, :desc => N_("Force metadata regeneration on the repositories " \
@@ -64,14 +64,14 @@ module Katello
     end
 
     api :PUT, "/content_view_versions/:id/republish_repositories", N_("Forces a republish of the version's repositories' metadata.")
-    param :id, :identifier, :desc => N_("Content view version identifier"), :required => true
+    param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def republish_repositories
       task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @version)
       respond_for_async :resource => task
     end
 
     api :POST, "/content_view_versions/:id/export", N_("Export a content view version")
-    param :id, :identifier, :desc => N_("Content view version identifier"), :required => true
+    param :id, :number, :desc => N_("Content view version identifier"), :required => true
     param :export_to_iso, :bool, :desc => N_("Export to ISO format"), :required => false
     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
@@ -96,7 +96,7 @@ module Katello
     end
 
     api :DELETE, "/content_view_versions/:id", N_("Remove content view version")
-    param :id, :identifier, :desc => N_("Content view version identifier"), :required => true
+    param :id, :number, :desc => N_("Content view version identifier"), :required => true
     def destroy
       task = async_task(::Actions::Katello::ContentViewVersion::Destroy, @version)
       respond_for_async :resource => task
@@ -104,7 +104,7 @@ module Katello
 
     api :POST, "/content_view_versions/incremental_update", N_("Perform an Incremental Update on one or more Content View Versions")
     param :content_view_version_environments, Array do
-      param :content_view_version_id, :identifier, :desc => N_("Content View Version Ids to perform an incremental update on.  May contain composites as well as one or more components to update.")
+      param :content_view_version_id, :number, :desc => N_("Content View Version Ids to perform an incremental update on.  May contain composites as well as one or more components to update.")
       param :environment_ids, Array, :desc => N_("The list of environments to promote the specified Content View Version to (replacing the older version).")
     end
     param :description, String, :desc => N_("The description for the new generated Content View Versions")

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

@@ -23,7 +23,7 @@ module Katello
     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")
-    param :environment_id, :identifier, :desc => N_("environment identifier")
+    param :environment_id, :number, :desc => N_("environment identifier")
     param :nondefault, :bool, :desc => N_("Filter out default content views")
     param :noncomposite, :bool, :desc => N_("Filter out composite content views")
     param :composite, :bool, :desc => N_("Filter only composite content views")
@@ -74,7 +74,7 @@ module Katello
     end
 
     api :POST, "/content_views/:id/publish", N_("Publish a content view")
-    param :id, :identifier, :desc => N_("Content view identifier"), :required => true
+    param :id, :number, :desc => N_("Content view identifier"), :required => true
     param :description, String, :desc => N_("Description for the new published content view version")
     param :force_yum_metadata_regeneration, :bool, :desc => N_("Force yum metadata regeneration on the repositories " \
                                                            "in the content view version")
@@ -92,7 +92,7 @@ module Katello
 
     api :GET, "/content_views/:id/available_puppet_modules",
         N_("Get puppet modules that are available to be added to the content view")
-    param :id, :identifier, :desc => N_("content view numeric identifier"), :required => true
+    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 = @view.content_view_puppet_modules.where("uuid is NOT NULL")
@@ -124,7 +124,7 @@ module Katello
 
     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, :identifier, :desc => N_("content view numeric identifier"), :required => true
+    param :id, :number, :desc => N_("content view numeric identifier"), :required => true
     def available_puppet_module_names
       current_names = @view.content_view_puppet_modules.where("name is NOT NULL").pluck(:name)
 
@@ -189,7 +189,7 @@ module Katello
     end
 
     api :POST, "/content_views/:id/copy", N_("Make copy of a content view")
-    param :id, :identifier, :desc => N_("Content view numeric identifier"), :required => true
+    param :id, :number, :desc => N_("Content view numeric identifier"), :required => true
     param :name, String, :required => true, :desc => N_("New content view name")
     def copy
       new_content_view = @view.copy(params[:content_view][:name])

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

@@ -5,8 +5,8 @@ module Katello
 
     api :GET, "/errata", N_("List errata")
     param :organization_id, :number, :desc => N_("organization identifier")
-    param :content_view_version_id, :identifier, :desc => N_("content view version identifier")
-    param :content_view_filter_id, :identifier, :desc => N_("content view filter identifier")
+    param :content_view_version_id, :number, :desc => N_("content view version identifier")
+    param :content_view_filter_id, :number, :desc => N_("content view filter identifier")
     param :repository_id, :number, :desc => N_("repository identifier")
     param :environment_id, :number, :desc => N_("environment identifier")
     param :cve, String, :desc => N_("CVE identifier")

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

@@ -51,13 +51,13 @@ module Katello
     end
 
     api :GET, "/gpg_keys/:id", N_("Show a gpg key")
-    param :id, :identifier, :desc => N_("gpg key numeric identifier"), :required => true
+    param :id, :number, :desc => N_("gpg key numeric identifier"), :required => true
     def show
       respond_for_show(:resource => @gpg_key)
     end
 
     api :PUT, "/gpg_keys/:id", N_("Update a repository")
-    param :id, :identifier, :desc => N_("gpg key numeric identifier"), :required => true
+    param :id, :number, :desc => N_("gpg key numeric identifier"), :required => true
     param_group :gpg_key
     def update
       @gpg_key.update_attributes!(gpg_key_params)

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

@@ -18,7 +18,7 @@ module Katello
     end
 
     api :GET, "/host_collections/:id", N_("Show a host collection")
-    param :id, :identifier, :desc => N_("Id of the host collection"), :required => true
+    param :id, :number, :desc => N_("Id of the host collection"), :required => true
     def show
       respond
     end
@@ -30,7 +30,7 @@ module Katello
     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")
+    param :host_id, :number, :desc => N_("Filter products by host id")
     param :available_for, String, :required => false,
           :desc => N_("Interpret specified object to return only Host Collections that can be associated with specified object. The value 'host' is supported.")
     def index
@@ -72,7 +72,7 @@ module Katello
     end
 
     api :PUT, "/host_collections/:id", N_("Update a host collection")
-    param :id, :identifier, :desc => N_("Id of the host collection"), :required => true
+    param :id, :number, :desc => N_("Id of the host collection"), :required => true
     param :name, String, :required => false, :desc => N_("Host Collection name")
     param_group :host_collection
     def update
@@ -81,7 +81,7 @@ module Katello
     end
 
     api :PUT, "/host_collections/:id/add_hosts", N_("Add host to the host collection")
-    param :id, :identifier, :desc => N_("Id of the host collection"), :required => true
+    param :id, :number, :desc => N_("Id of the host collection"), :required => true
     param :host_ids, Array, :desc => N_("Array of host ids")
     def add_hosts
       host_ids = params[:host_ids].map(&:to_i)
@@ -116,7 +116,7 @@ module Katello
     end
 
     api :PUT, "/host_collections/:id/remove_hosts", N_("Remove hosts from the host collection")
-    param :id, :identifier, :desc => N_("Id of the host collection"), :required => true
+    param :id, :number, :desc => N_("Id of the host collection"), :required => true
     param :host_ids, Array, :desc => N_("Array of host ids")
     def remove_hosts
       host_ids = params[:host_ids].map(&:to_i)
@@ -150,14 +150,14 @@ module Katello
     end
 
     api :DELETE, "/host_collections/:id", N_("Destroy a host collection")
-    param :id, :identifier, :desc => N_("Id of the host collection"), :required => true
+    param :id, :number, :desc => N_("Id of the host collection"), :required => true
     def destroy
       @host_collection.destroy
       respond_for_destroy
     end
 
     api :POST, "/host_collections/:id/copy", N_("Make copy of a host collection")
-    param :id, :identifier, :desc => N_("ID of the host collection"), :required => true
+    param :id, :number, :desc => N_("ID of the host collection"), :required => true
     param :name, String, :required => true, :desc => N_("New host collection name")
     def copy
       new_host_collection                           = HostCollection.new

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

@@ -18,7 +18,7 @@ module Katello
     end
 
     api :GET, "/hosts/:host_id/errata", N_("List errata available for the content host")
-    param :host_id, :identifier, :desc => N_("UUID of the content host"), :required => true
+    param :host_id, :number, :desc => N_("UUID of the content host"), :required => true
     param :content_view_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Content View"), :required => false
     param :environment_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Environment"), :required => false
     param_group :search, Api::V2::ApiController
@@ -38,7 +38,7 @@ module Katello
     end
 
     api :PUT, "/hosts/:host_id/errata/apply", N_("Schedule errata for installation")
-    param :host_id, :identifier, :desc => N_("Host ID"), :required => true
+    param :host_id, :number, :desc => N_("Host ID"), :required => true
     param :errata_ids, Array, :desc => N_("List of Errata ids to install"), :required => true
     def apply
       task = async_task(::Actions::Katello::Host::Erratum::Install, @host, params[:errata_ids])
@@ -46,7 +46,7 @@ module Katello
     end
 
     api :GET, "/hosts/:host_id/errata/:id", N_("Retrieve a single errata for a host")
-    param :host_id, :identifier, :desc => N_("Host ID"), :required => true
+    param :host_id, :number, :desc => N_("Host ID"), :required => true
     param :id, String, :desc => N_("Errata id of the erratum (RHSA-2012:108)"), :required => true
     def show
       errata = Erratum.find_by(:errata_id => params[:id])
@@ -55,7 +55,7 @@ module Katello
     end
 
     api :PUT, "/hosts/:host_id/errata/applicability", N_("Force regenerate applicability.")
-    param :host_id, :identifier, :desc => N_("Host ID"), :required => true
+    param :host_id, :number, :desc => N_("Host ID"), :required => true
     def applicability
       task = async_task(::Actions::Katello::Host::GenerateApplicability, [@host], false)
       respond_for_async :resource => task

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

@@ -18,7 +18,7 @@ module Katello
     end
 
     api :GET, "/hosts/:host_id/packages", N_("List packages installed on the host")
-    param :host_id, :identifier, :required => true, :desc => N_("ID of the host")
+    param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param_group :search, Api::V2::ApiController
     def index
       collection = scoped_search(index_relation, :name, :asc, :resource_class => ::Katello::InstalledPackage)
@@ -26,7 +26,7 @@ module Katello
     end
 
     api :PUT, "/hosts/:host_id/packages/install", N_("Install packages remotely")
-    param :host_id, :identifier, :required => true, :desc => N_("ID of the host")
+    param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param_group :packages_or_groups
     def install
       if params[:packages]
@@ -44,7 +44,7 @@ module Katello
     end
 
     api :PUT, "/hosts/:host_id/packages/upgrade", N_("Update packages remotely")
-    param :host_id, :identifier, :required => true, :desc => N_("ID of the host")
+    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
       if params[:packages]
@@ -55,14 +55,14 @@ module Katello
     end
 
     api :PUT, "/hosts/:host_id/packages/upgrade_all", N_("Update packages remotely")
-    param :host_id, :identifier, :required => true, :desc => N_("ID of the host")
+    param :host_id, :number, :required => true, :desc => N_("ID of the host")
     def upgrade_all
       task = async_task(::Actions::Katello::Host::Package::Update, @host, [])
       respond_for_async :resource => task
     end
 
     api :PUT, "/hosts/:host_id/packages/remove", N_("Uninstall packages remotely")
-    param :host_id, :identifier, :required => true, :desc => N_("ID of the host")
+    param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param_group :packages_or_groups
     def remove
       if params[:packages]

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

@@ -172,11 +172,16 @@ module Katello
     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 = @host.subscription_facet.candlepin_consumer.available_product_content(content_access_mode_all, content_access_mode_env)
-      overrides = @host.subscription_facet.candlepin_consumer.content_overrides
-      results = content.map { |product_content| Katello::ProductContentPresenter.new(product_content, overrides) }
 
-      respond_for_index(:collection => full_result_response(results))
+      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))
     end
 
     api :GET, "/hosts/:host_id/subscriptions/available_release_versions", N_("Show releases available for the content host")

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

@@ -10,7 +10,7 @@ module Katello
     end
 
     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")
+    param :host_id, :number, :required => true, :desc => N_("ID of the host")
     def index
       collection = scoped_search(index_relation, :application, :asc, :resource_class => ::Katello::HostTracer)
       respond_for_index(:collection => collection)

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

@@ -35,7 +35,7 @@ module Katello
     }.with_indifferent_access
 
     def_param_group :bulk_params do
-      param :organization_id, :identifier, :required => true, :desc => N_("ID of the organization")
+      param :organization_id, :number, :required => true, :desc => N_("ID of the organization")
       param :included, Hash, :required => true, :action_aware => true do
         param :search, String, :required => false, :desc => N_("Search string for hosts to perform an action on")
         param :ids, Array, :required => false, :desc => N_("List of host ids to perform an action on")
@@ -203,6 +203,14 @@ module Katello
       respond_for_async :resource => task
     end
 
+    api :PUT, "/hosts/bulk/release_version", N_("Assign the release version to one or more hosts")
+    param_group :bulk_params
+    param :release_version, String, :desc => N_("content release version")
+    def release_version
+      task = async_task(::Actions::BulkAction, ::Actions::Katello::Host::UpdateReleaseVersion, @hosts, params["release_version"])
+      respond_for_async :resource => task
+    end
+
     api :POST, "/hosts/bulk/available_incremental_updates", N_("Given a set of hosts and errata, lists the content view versions" \
                                                                  " and environments that need updating.")
     param_group :bulk_params

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

@@ -7,7 +7,7 @@ module Katello
 
     before_action :local_find_taxonomy, :only => %w(repo_discover cancel_repo_discover
                                                     download_debug_certificate
-                                                    redhat_provider update
+                                                    redhat_provider update releases
                                                     autoattach_subscriptions)
 
     resource_description do
@@ -47,7 +47,7 @@ module Katello
     end
 
     api :GET, '/organizations/:id', N_('Show organization')
-    param :id, :identifier, :desc => N_("organization ID"), :required => true
+    param :id, :number, :desc => N_("organization ID"), :required => true
     def show
       @render_template = 'katello/api/v2/organizations/show'
       super
@@ -58,7 +58,7 @@ module Katello
     # resource param_group instead of reusing the param_group :resource scoped from TaxonomiesController.
     # This is because name substitutions of the param group's name from :resource to :organization are limited
     # to the inclusion of a modules.
-    param :id, :identifier, :desc => N_("organization ID"), :required => true
+    param :id, :number, :desc => N_("organization ID"), :required => true
     param :redhat_repository_url, String, :desc => N_("Red Hat CDN URL")
     param_group :resource, ::Api::V2::TaxonomiesController
     def update
@@ -120,6 +120,18 @@ module Katello
                 :type => "application/text"
     end
 
+    api :GET, "/organizations/:id/releases", N_("List available releases in the organization")
+    param :id, String, :desc => N_("ID of the Organization"), :required => true
+    def releases
+      available_releases = @organization.library.available_releases
+      response = {
+        :results => available_releases,
+        :total => available_releases.size,
+        :subtotal => available_releases.size
+      }
+      respond_for_index :collection => response
+    end
+
     api :POST, "/organizations/:id/autoattach_subscriptions", N_("Auto-attach available subscriptions to all hosts within an organization. Asynchronous operation."), :deprecated => true
     def autoattach_subscriptions
       task = async_task(::Actions::Katello::Organization::AutoAttachSubscriptions, @organization)
@@ -138,6 +150,8 @@ module Katello
       if %w(download_debug_certificate redhat_provider repo_discover
             cancel_repo_discover autoattach_subscriptions).include?(params[:action])
         :edit
+      elsif params[:action] == "releases"
+        :view
       else
         super
       end

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

@@ -27,8 +27,8 @@ module Katello
     api :GET, "/content_view_filters/:content_view_filter_id/:resource_id", N_("List :resource_id")
     api :GET, "/repositories/:repository_id/:resource_id", N_("List :resource_id")
     param :organization_id, :number, :desc => N_("organization identifier")
-    param :content_view_version_id, :identifier, :desc => N_("content view version identifier")
-    param :content_view_filter_id, :identifier, :desc => N_("content view filter identifier")
+    param :content_view_version_id, :number, :desc => N_("content view version identifier")
+    param :content_view_filter_id, :number, :desc => N_("content view filter identifier")
     param :repository_id, :number, :desc => N_("repository identifier")
     param :environment_id, :number, :desc => N_("environment identifier")
     param :ids, Array, :desc => N_("ids to filter content by")