katello 3.0.2 → 3.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92f949b0b3a9201bd9163f2fca7c3898feafc2b2
-  data.tar.gz: 790bcd11ac29bad1d2053314424187189b71afce
+  metadata.gz: ae4ab15eb9d39a34a4069ff9b54905840aaf73af
+  data.tar.gz: bf8993794d13a72a10086070b705af01bb006be9
 SHA512:
-  metadata.gz: cf154c344d10d11683890b9463293f69647f049cfa52dae6c92e33321473cc4b89b55bb3680c1d77a173d3038e6bf19f2258dd2abe6903bf701d12ade2bace6a
-  data.tar.gz: 04e68a24437d862d0a6fd5632c61669019795f6abb8305b5fe37229004250a91ba2599810d95793b9bceb28c927b60869aae772262ab754b7b4927f3dd8ac527
+  metadata.gz: e0c4e3472f5e0c95405197c1f55c17e0b7fa3ea60319b0ce0d8089878616d3f8ba72f3adefc678f17a6ae6289a0a2314c9a1791f3a12d892370fd09958ab7564
+  data.tar.gz: 29a7dadc2e1913b3761d182c10fd47937a8d0badb08bd2801e3e80918cb0d57601f59c72f27e90a9dd8e2a7912169a902ba16babf5f5b5cddd8da0f6c4eed13b

data/app/assets/javascripts/katello/sync_management/sync_management.js

@@ -5,7 +5,7 @@ $(document).ready(function() {
     $.each(KT.repo_status, function(repo_id, status){
       if (status.is_running) {
           ids.push(repo_id);
-          KT.content.draw_syncing(repo_id, status.progress.progress);
+          KT.content.draw_syncing(repo_id, status.progress.progress, status.sync_id);
       }
     });
     KT.content.reset_products(KT.repo_status);
@@ -29,7 +29,7 @@ $(document).ready(function() {
        var ids = [];
        $.each(data, function(index, item){
           ids.push(item.id);
-          KT.content.draw_syncing(item.id, 0);
+          KT.content.draw_syncing(item.id, 0, undefined);
           KT.content.updateProduct(item.product_id, false, 0);
        });
        KT.content_actions.addSyncing(ids);
@@ -134,6 +134,7 @@ KT.content_actions = (function(){
                                             repo.progress.progress,
                                             repo.display_size,
                                             repo.packages,
+                                            repo.size,
                                             repo.sync_id);
                    }
                });
@@ -156,11 +157,15 @@ KT.content_actions = (function(){
 
 KT.content = (function(){
 
-     var draw_syncing = function(repo_id, progress){
-
+     var draw_syncing = function(repo_id, progress, task_id){
             var element = $("#repo-" + repo_id).find(".result"),
                 cancelButton = $('<a/>').attr("class", "cancel_sync").text(katelloI18n.cancel),
-                progressBar = $('<div/>').attr('class', 'progress').text(" ");
+                progressBar = $('<a/>').attr('class', 'progress').text(" ");
+
+            if(task_id !== undefined) {
+                progressBar.attr('href', '/foreman_tasks/tasks/' + task_id)
+            }
+
             progress = progress ? progress : 0;
             progressBar.progressbar({
                 value: progress
@@ -200,6 +205,10 @@ KT.content = (function(){
 
             starttime = starttime === null ? katelloI18n.no_start_time : starttime;
 
+            if(task_id !== undefined) {
+                pg.attr('href', '/foreman_tasks/tasks/' + task_id);
+            }
+
             fadeUpdate(element.find(".start_time"), starttime);
             // clear duration during active sync
             fadeUpdate(element.find(".duration"), '');

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -98,7 +98,7 @@ module Katello
       organization = find_organization
       @all_environments = get_content_view_environments(params[:name], organization).collect do |env|
         {
-          :id  => env.cp_id,
+          :id => env.cp_id,
           :name => env.label,
           :display_name => env.name,
           :description => env.content_view.description
@@ -132,7 +132,7 @@ module Katello
     #param :id, String, :desc => N_("UUID of the consumer"), :required => true
     def upload_package_profile
       User.as_anonymous_admin do
-        async_task(::Actions::Katello::Host::UploadPackageProfile, @host, params[:_json])
+        sync_task(::Actions::Katello::Host::UploadPackageProfile, @host, params[:_json])
       end
       render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end
@@ -436,8 +436,8 @@ module Katello
     def authorize_proxy_routes
       deny_access unless (authenticate || authenticate_client)
 
-      route, _, params = Engine.routes.router.recognize(request) do |rte, match, parameters|
-        break rte, match, parameters if rte.name
+      route, params = Engine.routes.router.recognize(request) do |rte, parameters|
+        break rte, parameters if rte.name
       end
 
       # route names are defined in routes.rb (:as => :name)

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

@@ -313,6 +313,8 @@ module Katello
                                                           :auto_attach,
                                                           :max_hosts,
                                                           :unlimited_hosts,
+                                                          # For deep_munge; Remove for Rails 5
+                                                          :host_collection_ids,
                                                           :content_overrides => [],
                                                           :host_collection_ids => [])
 

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

@@ -18,7 +18,7 @@ module Katello
     def_param_group :search do
       param :search, String, :desc => N_("Search string")
       param :page, :number, :desc => N_("Page number, starting at 1")
-      param :per_page,  :number, :desc => N_("Number of results per page to return")
+      param :per_page, :number, :desc => N_("Number of results per page to return")
       param :order, String, :desc => N_("Sort field and order, eg. 'name DESC'")
       param :full_results, :bool, :desc => N_("Whether or not to show all results")
       param :sort, Hash, :desc => N_("Hash version of 'order' param") do

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

@@ -3,7 +3,7 @@ module Katello
     before_filter :find_repository
     skip_before_filter :check_content_type, :only => [:update]
 
-    include Foreman::Controller::FilterParameters
+    include ::Foreman::Controller::FilterParameters
     filter_parameters :content
 
     api :POST, "/repositories/:repository_id/content_uploads", N_("Create an upload request")

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

@@ -3,7 +3,6 @@ module Katello
     include Katello::Concerns::FilteredAutoCompleteSearch
 
     before_filter :find_content_view, :except => [:autocomplete_search]
-    before_filter :find_puppet_module, :only => [:create]
     before_filter :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")
@@ -24,13 +23,8 @@ module Katello
     param :id, String, :desc => N_("the id of the puppet module to associate")
     param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
     def create
-      params[:content_view_puppet_module][:uuid] = @puppet_module.uuid if @puppet_module
-
-      @puppet_module = ContentViewPuppetModule.create!(puppet_module_params) do |puppet_module|
-        puppet_module.content_view = @view
-      end
-
-      respond :resource => @puppet_module
+      params[:content_view_puppet_module][:uuid] ||= PuppetModule.find(params[:id]).try(:uuid) if params[:id]
+      respond resource: ContentViewPuppetModule.create!(puppet_module_params.merge(content_view: @view))
     end
 
     api :GET, "/content_views/:content_view_id/content_view_puppet_modules/:id", N_("Show a content view puppet module")
@@ -79,10 +73,6 @@ module Katello
       @puppet_module = ContentViewPuppetModule.find(params[:id])
     end
 
-    def find_puppet_module
-      @puppet_module = PuppetModule.find(params[:id]) if params[:id]
-    end
-
     def puppet_module_params
       attrs = [:name, :author, :uuid]
       params.require(:content_view_puppet_module).permit(*attrs)

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

@@ -95,7 +95,7 @@ module Katello
     param :description, String, :desc => N_("The description for the new generated Content View Versions")
     param :resolve_dependencies, :bool, :desc => N_("If true, when adding the specified errata or packages, any needed dependencies will be copied as well.")
     param :propagate_all_composites, :bool, :desc => N_("If true, will publish a new composite version using any specified content_view_version_id that has been promoted to a lifecycle environment.")
-    param :add_content, Hash  do
+    param :add_content, Hash do
       param :errata_ids, Array, :desc => "Errata ids or uuids to copy into the new versions."
       param :package_ids, Array, :desc => "Package ids or uuids to copy into the new versions."
       param :puppet_module_ids, Array, :desc => "Puppet Module ids or uuids to copy into the new versions."
@@ -127,7 +127,7 @@ module Katello
 
     def calculate_hosts_for_incremental(bulk_params, use_composites)
       if bulk_params[:included].try(:[], :search)
-        version_environments  = find_version_environments_for_hosts(use_composites)
+        version_environments = find_version_environments_for_hosts(use_composites)
         restrict_hosts = lambda do |relation|
           if version_environments.any?
             errata = Erratum.with_identifiers(params[:add_content][:errata_ids])
@@ -167,7 +167,7 @@ module Katello
       list.each do |combination|
         version_environment = {
           :content_view_version => ContentViewVersion.find(combination[:content_view_version_id]),
-          :environments =>  KTEnvironment.where(:id => combination[:environment_ids])
+          :environments => KTEnvironment.where(:id => combination[:environment_ids])
         }
 
         view = version_environment[:content_view_version].content_view
@@ -197,7 +197,7 @@ module Katello
       component.composites.select { |c| c.environments.any? }.map do |composite|
         {
           :content_view_version => composite,
-          :environments =>  composite.environments
+          :environments => composite.environments
         }
       end
     end

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

@@ -191,10 +191,8 @@ module Katello
     def view_params
       attrs = [:name, :description, {:repository_ids => []}, {:component_ids => []}]
       attrs.push(:label, :composite) if action_name == "create"
-      permitted_params = params.require(:content_view).permit(*attrs)
-      permitted_params[:repository_ids] ||= [] if params[:content_view].key?(:repository_ids)
-      permitted_params[:component_ids] ||= [] if params[:content_view].key?(:component_ids)
-      permitted_params
+      attrs.push(:component_ids, :repository_ids) # For deep_munge; Remove for Rails 5
+      params.require(:content_view).permit(*attrs)
     end
 
     def find_environment

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

@@ -136,22 +136,6 @@ module Katello
       respond_for_index(:collection => collection, :template => :paths)
     end
 
-    api :GET, "/organizations/:organization_id/environments/:id/repositories", "List repositories available in the environment"
-    param :id, :identifier, :desc => "environment identifier"
-    param :organization_id, String, :desc => "organization identifier"
-    param :content_view_id, :identifier, :desc => "content view identifier", :required => false
-    def repositories
-      if !@environment.library? && @content_view.nil?
-        fail HttpErrors::BadRequest,
-              _("Cannot retrieve repos from non-library environment '%s' without a content view.") % @environment.name
-      end
-
-      @repositories = @environment.products.readable(@organization).flat_map do |p|
-        p.repos(@environment, @content_view)
-      end
-      respond_for_index :collection => @repositories
-    end
-
     protected
 
     def find_environment

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

@@ -0,0 +1,9 @@
+module Katello
+  class Api::V2::HostContentsController < Katello::Api::V2::ApiController
+    def_param_group :content_facet_attributes do
+      param :content_view_id, Integer
+      param :lifecycle_environment_id, Integer
+      param :kickstart_repository_id, Integer, :desc => N_("Repository Id associated with the kickstart repo used for provisioning")
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Katello
     param :environment_id, :number, :desc => N_("Calculate Applicable Errata based on a particular Environment"), :required => false
     param_group :search, Api::V2::ApiController
     def index
-      if  (params[:content_view_id] && params[:environment_id].nil?) || (params[:environment_id] && params[:content_view_id].nil?)
+      if (params[:content_view_id] && params[:environment_id].nil?) || (params[:environment_id] && params[:content_view_id].nil?)
         fail _("Either both parameters 'content_view_id' and 'environment_id' should be specified or neither should be specified")
       end
 

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

@@ -56,7 +56,7 @@ module Katello
     api :PUT, "/hosts/:host_id/packages/upgrade_all", N_("Update packages remotely")
     param :host_id, :identifier, :required => true, :desc => N_("ID of the host")
     def upgrade_all
-      task     = async_task(::Actions::Katello::Host::Package::Update, @host, [])
+      task = async_task(::Actions::Katello::Host::Package::Update, @host, [])
       respond_for_async :resource => task
     end
 

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

@@ -4,6 +4,13 @@ module Katello
     before_filter :check_subscriptions, :only => [:add_subscriptions, :remove_subscriptions]
     before_filter :find_content_view_environment, :only => :create
 
+    def_param_group :subscription_facet_attributes do
+      param :release_version, String, :desc => N_("Release version for this Host to use (7Server, 7.1, etc)")
+      param :autoheal, :bool, :desc => N_("Sets whether the Host will autoheal subscriptions upon checkin")
+      param :service_level, Integer, :desc => N_("Service level to be used for autoheal.")
+      param :hypervisor_guest_uuids, Array, :desc => N_("List of hypervisor guest uuids")
+    end
+
     resource_description do
       api_version 'v2'
       api_base_url "/api"
@@ -53,6 +60,8 @@ module Katello
       param :product_id, String, :desc => N_("Product id as listed from a host's installed products, \
         this is not the same product id as the products api returns")
       param :product_name, String, :desc => N_("Product name as listed from a host's installed products")
+      param :arch, String, :desc => N_("Product architecture")
+      param :version, String, :desc => N_("Product version")
     end
     param :release_version, String, :desc => N_("Release version of the content host")
     param :service_level, String, :desc => N_("A service level for auto-healing process, e.g. SELF-SUPPORT")
@@ -81,7 +90,10 @@ module Katello
 
       if params['installed_products']
         rhsm_params[:installedProducts] = params['installed_products'].map do |product|
-          { :productId => product['product_id'], :productName => product['product_name'] }
+          product_params = { :productId => product['product_id'], :productName => product['product_name'] }
+          product_params[:arch] = product['arch'] if product['arch']
+          product_params[:version] = product['version'] if product['version']
+          product_params
         end
       end
       rhsm_params
@@ -123,7 +135,7 @@ module Katello
     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 :content_label, String, :desc => N_("Label of the content"), :required => true
-    param :value, [0, 1, "default"], :desc => N_("Override to 0/1, or 'default'"), :required => true
+    param :value, [0, 1, String], :desc => N_("Override to 'yes', 'no', or 'default'"), :required => true
     def content_override
       content_override = validate_content_overrides(params)
       @host.subscription_facet.candlepin_consumer.set_content_override(content_override[:content_label], 'enabled', content_override[:value])
@@ -141,18 +153,25 @@ module Katello
       respond_for_index(:collection => full_result_response(results))
     end
 
+    api :GET, "/hosts/:host_id/subscriptions/available_release_versions", N_("Show releases available for the content host")
+    param :host_id, String, :desc => N_("id of host"), :required => true
+    def available_release_versions
+      releases = @host.content_facet.try(:available_releases) || []
+      respond_for_index :collection => full_result_response(releases)
+    end
+
     private
 
     def validate_content_overrides(content_params)
-      case content_params[:value].to_s
+      case content_params[:value].to_s.downcase
       when 'default'
         content_params[:value] = nil
-      when '1'
+      when '1', 'yes'
         content_params[:value] = 1
-      when '0'
+      when '0', 'no'
         content_params[:value] = 0
       else
-        fail HttpErrors::BadRequest, _("Value must be 0/1, or 'default'")
+        fail HttpErrors::BadRequest, _("Value must be 'yes', 'no', or 'default'")
       end
 
       available_content = @host.subscription_facet.candlepin_consumer.available_product_content

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

@@ -109,6 +109,7 @@ module Katello
           :desc => N_("The type of content.  The following types are supported: 'package' and 'package_group."),
           :required => true
     param :content, Array, :desc => N_("List of content (e.g. package or package group names)"), :required => true
+    param :update_all, :bool, :desc => N_("Updates all packages on the host(s)")
     def update_content
       content_action
     end
@@ -217,14 +218,14 @@ module Katello
         respond_for_async :resource => task
       else
         action = Katello::BulkActions.new(@hosts)
-        job = action.send(PARAM_ACTIONS[params[:action]][params[:content_type]],  params[:content])
+        job = action.send(PARAM_ACTIONS[params[:action]][params[:content_type]], params[:content], :update_all => params[:update_all])
         respond_for_show :template => 'job', :resource => job
       end
     end
 
     def validate_content_action
       fail HttpErrors::BadRequest, _("A content_type must be provided.") if params[:content_type].blank?
-      fail HttpErrors::BadRequest, _("No content has been provided.") if params[:content].blank?
+      fail HttpErrors::BadRequest, _("No content has been provided.") if params[:content].blank? && !params[:update_all]
 
       if PARAM_ACTIONS[params[:action]][params[:content_type]].nil?
         fail HttpErrors::BadRequest, _("Invalid content type %s") % params[:content_type]

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

@@ -28,7 +28,7 @@ module Katello
       param :gpg_key_id, :number, :desc => N_("id of the gpg key that will be assigned to the new repository")
       param :unprotected, :bool, :desc => N_("true if this repository can be published via HTTP")
       param :content_type, RepositoryTypeManager.creatable_repository_types.keys, :required => true, :desc => N_("type of repo (either 'yum', 'puppet', 'docker', or 'ostree')")
-      param :checksum_type, String, :desc => N_("checksum of the repository, currently 'sha1' & 'sha256' are supported.'")
+      param :checksum_type, String, :desc => N_("checksum of the repository, currently 'sha1' & 'sha256' are supported.")
       param :docker_upstream_name, String, :desc => N_("name of the upstream docker repository")
       param :download_policy, ["immediate", "on_demand", "background"], :desc => N_("download policy for yum repos (either 'immediate', 'on_demand', or 'background')")
       param :mirror_on_sync, :bool, :desc => N_("true if this repository when synced has to be mirrored from the source and stale rpms removed.")
@@ -36,6 +36,9 @@ module Katello
 
     api :GET, "/repositories", N_("List of enabled repositories")
     api :GET, "/content_views/:id/repositories", N_("List of repositories for a content view")
+    api :GET, "/organizations/:organization_id/environments/:environment_id/repositories", _("List repositories in the environment")
+    api :GET, "/products/:product_id/repositories", N_("List of repositories for a product")
+    api :GET, "/environments/:environment_id/products/:product_id/repositories", N_("List of repositories belonging to a product in an environment")
     param :organization_id, :number, :desc => N_("ID of an organization to show repositories in")
     param :product_id, :number, :desc => N_("ID of a product to show repositories of")
     param :environment_id, :number, :desc => N_("ID of an environment to show repositories in")
@@ -240,7 +243,7 @@ module Katello
       task_id = params['call_report']['task_id']
       User.current = User.anonymous_admin
 
-      repo    = Repository.where(:pulp_id => repo_id).first
+      repo = Repository.where(:pulp_id => repo_id).first
       fail _("Couldn't find repository '%s'") % repo_id if repo.nil?
       Rails.logger.info("Sync_complete called for #{repo.name}, running after_sync.")
 
@@ -370,7 +373,7 @@ module Katello
 
     def filter_by_content_view(query, content_view_id, environment_id, is_available_for)
       if is_available_for
-        params[:library] =  true
+        params[:library] = true
         sub_query = ContentViewRepository.where(:content_view_id => content_view_id).pluck(:repository_id)
         query = query.where("#{Repository.table_name}.id not in (#{sub_query.join(',')})") unless sub_query.empty?
       elsif environment_id

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

@@ -45,13 +45,14 @@ module Katello
     param :organization_id, :number, :desc => N_("Filter sync plans by organization name or label"), :required => true
     param_group :sync_plan
     def create
-      sync_date = sync_plan_params[:sync_date].to_time
+      sync_date = sync_plan_params[:sync_date].to_time(:utc)
 
       unless sync_date.is_a?(Time)
         fail _("Date format is incorrect.")
       end
 
       @sync_plan = SyncPlan.new(sync_plan_params)
+      @sync_plan.sync_date = sync_date
       @sync_plan.organization = @organization
       @sync_plan.save!
 

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

@@ -80,18 +80,6 @@ module Katello
       respond
     end
 
-    api :GET, "/systems/:id/releases", N_("Show releases available for the content host"), :deprecated => true
-    param :id, String, :desc => N_("UUID of the content host"), :required => true
-    desc <<-DESC
-      A hint for choosing the right value for the releaseVer param
-    DESC
-    def releases
-      response = { :results => @system.available_releases,
-                   :total => @system.available_releases.size,
-                   :subtotal => @system.available_releases.size }
-      respond_for_index :collection => response
-    end
-
     private
 
     def system_params_to_host_params(sys_params)
@@ -174,7 +162,7 @@ module Katello
     end
 
     def system_params(param_hash)
-      system_params = param_hash.require(:system).permit(:name, :description, :location, :owner, :type,
+      system_params = param_hash.require(:system).permit(:name, :location, :owner, :type,
                                                      :service_level, :autoheal,
                                                      :guest_ids, :host_collection_ids => [])