katello 3.6.0.rc1 → 3.6.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b47b654bb5cd12ff6447d5a2eb86be22e2eb86
-  data.tar.gz: 3df18ad11e749d434a78930eee529b2d7501b943
+  metadata.gz: d376533486b2a2a64e867237c0519e9fd2920578
+  data.tar.gz: 43ce0faa39c88c23ca900ae85d0f986603ba736b
 SHA512:
-  metadata.gz: 80e6a16b4daf6415bc9fbb4b659009c93b80bb2e6fbbe0b47d5ac540bf0f1ff4added97ee831bb47f8a54e3905ef275ee3a9de4568de8be4f08de460e816ac6a
-  data.tar.gz: 391a19603ff401a18a95fa781989f76e9bf1302192114b8a0d49f82341a990655701e7497ea8ea6973ac89b168ca4d69c489471bcd78dcc4aaa5224a75b4f333
+  metadata.gz: 38aea3e72162444cc2d3766e2e610f30fd48dbdd8010683846a107d0c5100faec287b12f90ab1f83e2715d3dd2389e993476b4f557cdb27f826d5c0f2f897aa6
+  data.tar.gz: 47d26d3b9b377c91d0ffd9a13f09ae37fee6296a267d0d6489bb4cb8551b899dc779736dbea07285c128d54cebec7d1e5cd9138ff6760ff51c10c649dfae2bda

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

@@ -17,6 +17,8 @@ module Katello
     before_action :authorize_client, :only => [:consumer_destroy, :consumer_checkin,
                                                :enabled_repos, :available_releases]
 
+    before_action :check_registration_services, :only => [:consumer_create, :consumer_destroy, :consumer_activate]
+
     before_action :add_candlepin_version_header
 
     before_action :proxy_request_path, :proxy_request_body
@@ -207,7 +209,7 @@ module Katello
       content_view_environment = find_content_view_environment
       host = Katello::Host::SubscriptionFacet.find_or_create_host(content_view_environment.environment.organization, rhsm_params)
 
-      sync_task(::Actions::Katello::Host::Register, host, rhsm_params, content_view_environment)
+      Katello::RegistrationManager.register_host(host, rhsm_params, content_view_environment)
       host.reload
 
       update_host_registered_through(host, request.headers)
@@ -219,11 +221,7 @@ module Katello
     #param :id, String, :desc => N_("UUID of the consumer"), :required => true
     def consumer_destroy
       User.as_anonymous_admin do
-        if Setting['unregister_delete_host']
-          sync_task(::Actions::Katello::Host::Destroy, @host)
-        else
-          sync_task(::Actions::Katello::Host::Unregister, @host)
-        end
+        Katello::RegistrationManager.unregister_host(@host, :unregistering => !Setting['unregister_delete_host'])
       end
       render :plain => _("Deleted consumer '%s'") % params[:id], :status => 204
     end
@@ -239,7 +237,7 @@ module Katello
       activation_keys = find_activation_keys
       host = Katello::Host::SubscriptionFacet.find_or_create_host(activation_keys.first.organization, rhsm_params)
 
-      sync_task(::Actions::Katello::Host::Register, host, rhsm_params, nil, activation_keys)
+      Katello::RegistrationManager.register_host(host, rhsm_params, nil, activation_keys)
 
       update_host_registered_through(host, request.headers)
       host.reload
@@ -465,6 +463,10 @@ module Katello
       host.subscription_facet.update_attribute(:registered_through, parent_host)
     end
 
+    def check_registration_services
+      fail "Unable to register system, not all services available" unless Katello::RegistrationManager.check_registration_services
+    end
+
     # rubocop:disable MethodLength
     # rubocop:disable Metrics/CyclomaticComplexity
     def authorize_proxy_routes

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

@@ -4,6 +4,7 @@ module Katello
     before_action :find_host, :except => :create
     before_action :check_subscriptions, :only => [:add_subscriptions, :remove_subscriptions]
     before_action :find_content_view_environment, :only => :create
+    before_action :check_registration_services, :only => [:destroy, :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)")
@@ -47,7 +48,7 @@ module Katello
     api :DELETE, "/hosts/:host_id/subscriptions/", N_("Unregister the host as a subscription consumer")
     param :host_id, Integer, :desc => N_("Id of the host"), :required => true
     def destroy
-      sync_task(::Actions::Katello::Host::Unregister, @host)
+      Katello::RegistrationManager.unregister_host(@host, :unregistering => true)
       @host.reload
       respond_for_destroy(:resource => @host)
     end
@@ -72,7 +73,7 @@ module Katello
       rhsm_params = params_to_rhsm_params
 
       host = Katello::Host::SubscriptionFacet.find_or_create_host(@content_view_environment.environment.organization, rhsm_params)
-      sync_task(::Actions::Katello::Host::Register, host, rhsm_params, @content_view_environment)
+      Katello::RegistrationManager.register_host(host, rhsm_params, @content_view_environment)
       host.reload
       ::Katello::Host::SubscriptionFacet.update_facts(host, rhsm_params[:facts]) unless rhsm_params[:facts].blank?
 
@@ -203,6 +204,10 @@ module Katello
       fail HttpErrors::BadRequest, _("subscriptions not specified") if params[:subscriptions].blank?
     end
 
+    def check_registration_services
+      fail "Unable to register system, not all services available" unless Katello::RegistrationManager.check_registration_services
+    end
+
     def find_host
       find_host_with_subscriptions(params[:host_id], "#{action_permission}_hosts")
     end

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

@@ -19,13 +19,9 @@ module Katello
     skip_before_action :check_content_type, :only => [:upload_content]
 
     def_param_group :repo do
-      param :name, String, :required => true
-      param :label, String, :required => false
-      param :product_id, :number, :required => true, :desc => N_("Product the repository belongs to")
       param :url, String, :desc => N_("repository source url")
       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', 'deb', 'puppet', 'docker', or 'ostree')")
       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')")
@@ -41,6 +37,12 @@ module Katello
       param :ignore_global_proxy, :bool, :desc => N_("if true, will ignore the globally configured proxy when syncing.")
     end
 
+    def_param_group :repo_create do
+      param :label, String, :required => false
+      param :product_id, :number, :required => true, :desc => N_("Product the repository belongs to")
+      param :content_type, RepositoryTypeManager.creatable_repository_types.keys, :required => true, :desc => N_("type of repo (either 'yum', 'deb', 'puppet', 'docker', or 'ostree')")
+    end
+
     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/repositories", N_("List of repositories in an organization")
@@ -137,6 +139,8 @@ module Katello
     end
 
     api :POST, "/repositories", N_("Create a custom repository")
+    param :name, String, :required => true
+    param_group :repo_create
     param_group :repo
     def create # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
       repo_params = repository_params
@@ -253,20 +257,9 @@ module Katello
     end
 
     api :PUT, "/repositories/:id", N_("Update a repository")
-    param :name, String, :desc => N_("New name for the repository")
     param :id, :number, :required => true, :desc => N_("repository ID")
-    param :gpg_key_id, :number, :desc => N_("ID of a gpg key that will be assigned to this repository")
-    param :unprotected, :bool, :desc => N_("true if this repository can be published via HTTP")
-    param :checksum_type, String, :desc => N_("checksum of the repository, currently 'sha1' & 'sha256' are supported.'")
-    param :url, String, :desc => N_("the feed url of the original repository ")
-    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.")
-    param :verify_ssl_on_sync, :bool, :desc => N_("if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA.")
-    param :upstream_username, String, :desc => N_("Username of the upstream repository user for authentication")
-    param :upstream_password, String, :desc => N_("Password of the upstream repository user for authentication")
-    param :ostree_upstream_sync_policy, ::Katello::Repository::OSTREE_UPSTREAM_SYNC_POLICIES, :desc => N_("policies for syncing upstream ostree repositories.")
-    param :ostree_upstream_sync_depth, :number, :desc => N_("if a custom sync policy is chosen for ostree repositories then a 'depth' value must be provided.")
+    param :name, String, :required => false
+    param_group :repo
     def update
       repo_params = repository_params
       sync_task(::Actions::Katello::Repository::Update, @repository, repo_params)

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

@@ -18,7 +18,7 @@ module Katello
       included do
         prepend Overrides
         def destroy
-          sync_task(::Actions::Katello::Host::Destroy, @host)
+          Katello::RegistrationManager.unregister_host(@host, :unregistering => false)
           process_response(:object => @host)
         end
 

data/app/controllers/katello/concerns/hosts_controller_extensions.rb

@@ -19,7 +19,7 @@ module Katello
         prepend Overrides
 
         def destroy
-          sync_task(::Actions::Katello::Host::Destroy, @host)
+          Katello::RegistrationManager.unregister_host(@host, :unregistering => false)
           process_success
         rescue StandardError => ex
           process_error(:object => @host, :error_msg => ex.message, :redirect => saved_redirect_url_or(send("#{controller_name}_url")))

data/app/helpers/katello/providers_helper.rb

@@ -12,10 +12,13 @@ module Katello
         {:id => :beta, :name => _('Beta'), :products => {}},
         {:id => :isos, :name => _('ISOs'), :products => {}},
         {:id => :ostree, :name => _('OSTree'), :products => {}},
+        {:id => :images, :name => _('Images'), :products => {}},
+        {:id => :files, :name => _('Files'), :products => {}},
         {:id => :other, :name => _('Other'), :products => {}}
       ]
     end
 
+    # rubocop:disable MethodLength
     def redhat_repo_tab(provider, tab_id)
       tabs = {}.with_indifferent_access
       redhat_repo_tabs.each { |tab| tabs[tab[:id]] = tab }
@@ -35,6 +38,10 @@ module Katello
             key = :isos
           elsif name.include?("(RPMs)")
             key = :rpms
+          elsif name.include?("(Images)")
+            key = :images
+          elsif name.include?("(Files)")
+            key = :files
           elsif name.include?("(Kickstart)")
             key = :kickstarts
           else

data/app/jobs/create_pulp_disk_space_notifications.rb

@@ -0,0 +1,9 @@
+class CreatePulpDiskSpaceNotifications < ApplicationJob
+  after_perform do
+    self.class.set(:wait => 12.hours).perform_later
+  end
+
+  def perform
+    Katello::UINotifications::Pulp::ProxyDiskSpace.deliver!
+  end
+end

data/app/lib/actions/katello/host/destroy.rb

@@ -5,52 +5,28 @@ module Actions
         middleware.use ::Actions::Middleware::RemoteAction
 
         def plan(host, options = {})
+          action_subject(host)
+          # normalize options before passing through to run phase
           organization_destroy = options.fetch(:organization_destroy, false)
           unregistering = options.fetch(:unregistering, false)
-
-          action_subject(host)
-
-          concurrence do
-            if !organization_destroy && host.subscription_facet.try(:uuid)
-              plan_action(Candlepin::Consumer::Destroy, uuid: host.subscription_facet.uuid)
-            end
-            plan_action(Pulp::Consumer::Destroy, uuid: host.content_facet.uuid) if host.content_facet.try(:uuid)
-          end
-
-          host.subscription_facet.try(:destroy!)
-
-          if unregistering
-            unregister(host)
-          elsif organization_destroy
-            host.content_facet.try(:destroy!)
-            destroy_host_artifacts(host)
-          else
-            host.content_facet.try(:destroy!)
-            unless host.destroy
-              fail host.errors.full_messages.join('; ')
-            end
-          end
+          plan_self(:hostname => host.name, :host_id => host.id, :unregistering => unregistering,
+                    :organization_destroy => organization_destroy)
         end
 
-        def unregister(host)
-          if host.content_facet
-            host.content_facet.bound_repositories = []
-            host.content_facet.applicable_errata = []
-            host.content_facet.uuid = nil
-            host.content_facet.save!
-          end
-          destroy_host_artifacts(host)
-        end
-
-        def destroy_host_artifacts(host)
-          host.get_status(::Katello::ErrataStatus).destroy
-          host.get_status(::Katello::SubscriptionStatus).destroy
-          host.get_status(::Katello::TraceStatus).destroy
-          host.installed_packages.destroy_all
+        def run
+          host = ::Host.find(input[:host_id])
+          ::Katello::RegistrationManager.unregister_host(host, :unregistering => input[:unregistering],
+                                                         :organization_destroy => input[:organization_destroy])
+        rescue ActiveRecord::RecordNotFound
+          Rails.logger.warn("Attempted to delete host %s in action, but host is already gone. Continuing." % input[:host_id])
         end
 
         def humanized_name
-          _("Destroy Content Host")
+          if input.try(:[], :hostname)
+            _("Destroy Content Host %s") % input[:hostname]
+          else
+            _("Destroy Content Host")
+          end
         end
       end
     end

data/app/lib/actions/katello/host/upload_package_profile.rb

@@ -30,14 +30,26 @@ module Actions
         end
 
         def run
-          host = ::Host.find(input[:host_id])
           profile = JSON.parse(input[:profile_string])
           #free the huge string from the memory
           input[:profile_string] = 'TRIMMED'.freeze
 
-          ::Katello::Pulp::Consumer.new(host.content_facet.uuid).upload_package_profile(profile) if host.content_facet.uuid
-          simple_packages = profile.map { |item| ::Katello::Pulp::SimplePackage.new(item) }
-          host.import_package_profile(simple_packages)
+          host = ::Host.find_by(:id => input[:host_id])
+          if host.nil?
+            Rails.logger.warn("Host with ID %s not found, continuing" % input[:host_id])
+          elsif host.content_facet.nil? || host.content_facet.uuid.nil?
+            Rails.logger.warn("Host with ID %s has no content facet, continuing" % input[:host_id])
+          else
+            begin
+              ::Katello::Pulp::Consumer.new(host.content_facet.uuid).upload_package_profile(profile)
+              simple_packages = profile.map { |item| ::Katello::Pulp::SimplePackage.new(item) }
+              host.import_package_profile(simple_packages)
+            rescue RestClient::ResourceNotFound
+              Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % input[:host_id])
+            rescue ActiveRecord::InvalidForeignKey # this happens if the host gets deleted in between the "find_by" and "import_package_profile"
+              Rails.logger.warn("Host installed package list with ID %s was not able to be written to the DB (host likely is deleted), continuing" % input[:host_id])
+            end
+          end
         end
       end
     end

data/app/lib/actions/pulp/consumer/generate_applicability.rb

@@ -8,7 +8,11 @@ module Actions
 
         def invoke_external_task
           if input[:uuids].length == 1
-            pulp_resources.consumer.regenerate_applicability_by_id(input[:uuids].first)
+            begin
+              pulp_resources.consumer.regenerate_applicability_by_id(input[:uuids].first)
+            rescue RestClient::ResourceNotFound
+              Rails.logger.warn("Pulp consumer %s not found." % input[:uuids].first)
+            end
           else
             pulp_extensions.consumer.regenerate_applicability_by_ids(input[:uuids])
           end

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -20,7 +20,7 @@ module Katello
       included do
         prepend Overrides
 
-        has_many :host_installed_packages, :class_name => "::Katello::HostInstalledPackage", :foreign_key => :host_id, :dependent => :destroy
+        has_many :host_installed_packages, :class_name => "::Katello::HostInstalledPackage", :foreign_key => :host_id, :dependent => :delete_all
         has_many :installed_packages, :class_name => "::Katello::InstalledPackage", :through => :host_installed_packages
         has_many :host_traces, :class_name => "::Katello::HostTracer", :foreign_key => :host_id, :dependent => :destroy
 

data/app/models/katello/concerns/hostgroup_extensions.rb

@@ -14,9 +14,9 @@ module Katello
         validates_with Katello::Validators::ContentViewEnvironmentValidator
         validates_with Katello::Validators::HostgroupKickstartRepositoryValidator
 
-        scoped_search :relation => :content_source, :on => :name, :complete_value => true, :rename => :content_source
-        scoped_search :relation => :content_view, :on => :name, :complete_value => true, :rename => :content_view
-        scoped_search :relation => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment
+        scoped_search :relation => :content_source, :on => :name, :complete_value => true, :rename => :content_source, :only_explicit => true
+        scoped_search :relation => :content_view, :on => :name, :complete_value => true, :rename => :content_view, :only_explicit => true
+        scoped_search :relation => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment, :only_explicit => true
       end
 
       def content_view

data/app/models/katello/content_view.rb

@@ -299,7 +299,8 @@ module Katello
     end
 
     def duplicate_repositories_to_publish
-      repositories_to_publish_by_library_instance.select { |_key, val| val.count > 1 }.keys
+      return [] unless composite?
+      repositories_to_publish_by_library_instance.select { |key, val| val.count > 1 && key.present? }.keys
     end
 
     def components_with_repo(library_instance)

data/app/models/katello/host_installed_package.rb

@@ -1,5 +1,6 @@
 module Katello
   class HostInstalledPackage < Katello::Model
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
     belongs_to :host, :inverse_of => :host_installed_packages, :class_name => '::Host::Managed'
     belongs_to :installed_package, :inverse_of => :host_installed_packages, :class_name => 'Katello::InstalledPackage'
   end

data/app/services/katello/candlepin/message_handler.rb

@@ -48,16 +48,19 @@ module Katello
       end
 
       def subscription_facet
+        return nil if self.consumer_uuid.nil?
         ::Katello::Host::SubscriptionFacet.where(uuid: self.consumer_uuid).first
       end
 
       def create_pool_on_host
+        return if self.subscription_facet.nil?
         pool = self.pool_by_reference_id
         ::Katello::SubscriptionFacetPool.where(subscription_facet_id: self.subscription_facet.id,
                                                pool_id: pool.id).first_or_create
       end
 
       def remove_pool_from_host
+        return if self.subscription_facet.nil?
         pool = self.pool_by_reference_id
         ::Katello::SubscriptionFacetPool.where(subscription_facet_id: self.subscription_facet.id,
                                                pool_id: pool.id).destroy_all

data/app/services/katello/registration_manager.rb

@@ -0,0 +1,194 @@
+module Katello
+  class RegistrationManager
+    class << self
+      private :new
+
+      # options:
+      #  * organization_destroy: destroy some data associated with host, but
+      #    leave items alone that will be removed later as part of org destroy
+      #  * unregistering: unregister the host but don't destroy it
+      def unregister_host(host, options = {})
+        organization_destroy = options.fetch(:organization_destroy, false)
+        unregistering = options.fetch(:unregistering, false)
+
+        # if the first operation fails, just raise the error since there's nothing to clean up yet.
+        candlepin_consumer_destroy(host.subscription_facet.uuid) if !organization_destroy && host.subscription_facet.try(:uuid)
+
+        # if this fails, there is not much to do about it right now. We can't really re-create the candlepin consumer.
+        # This can be cleaned up later via clean_backend_objects.
+        pulp_consumer_destory(host.content_facet.uuid) if host.content_facet.try(:uuid)
+
+        host.subscription_facet.try(:destroy!)
+
+        if unregistering
+          remove_host_artifacts(host)
+        elsif organization_destroy
+          host.content_facet.try(:destroy!)
+          remove_host_artifacts(host, false)
+        else
+          host.content_facet.try(:destroy!)
+          destroy_host_record(host.id)
+        end
+      end
+
+      def register_host(host, consumer_params, content_view_environment, activation_keys = [])
+        new_host = host.new_record?
+
+        unless new_host
+          host.save!
+          unregister_host(host, :unregistering => true)
+          host.reload
+        end
+
+        unless activation_keys.empty?
+          content_view_environment ||= lookup_content_view_environment(activation_keys)
+          set_host_collections(host, activation_keys)
+        end
+        fail _('Content View and Environment not set for registration.') if content_view_environment.nil?
+
+        host.save! #the host is in foreman db at this point
+
+        host_uuid = get_uuid(consumer_params)
+        consumer_params[:uuid] = host_uuid
+        host.content_facet = populate_content_facet(host, content_view_environment, host_uuid)
+        host.subscription_facet = populate_subscription_facet(host, activation_keys, consumer_params, host_uuid)
+        host.save! # the host has content and subscription facets at this point
+
+        User.as_anonymous_admin do
+          begin
+            create_in_cp_and_pulp(host, content_view_environment, consumer_params, activation_keys)
+          rescue StandardError => e
+            # we can't call CP or pulp here since something bad already happened. Just clean up our DB as best as we can.
+            host.subscription_facet.try(:destroy!)
+            new_host ? remove_partially_registered_new_host(host) : remove_host_artifacts(host)
+            raise e
+          end
+
+          finalize_registration(host)
+        end
+      end
+
+      def check_registration_services
+        ping_results = {}
+        User.as_anonymous_admin do
+          ping_results = Katello::Ping.ping
+        end
+        ping_results[:services][:pulp][:status] == "ok" && ping_results[:services][:candlepin][:status] == "ok"
+      end
+
+      private
+
+      def destroy_host_record(host_id)
+        host = ::Host.find(host_id)
+        host.destroy
+      rescue ActiveRecord::RecordNotFound
+        Rails.logger.warn("Attempted to destroy host %s but host is already gone." % host_id)
+      end
+
+      def get_uuid(params)
+        params.key?(:uuid) ? params[:uuid] : SecureRandom.uuid
+      end
+
+      def remove_partially_registered_new_host(host)
+        host.content_facet.try(:destroy!)
+        destroy_host_record(host.id)
+      end
+
+      def create_in_cp_and_pulp(host, content_view_environment, consumer_params, activation_keys)
+        # if CP fails, nothing to clean up yet w.r.t. backend services
+        cp_create = ::Katello::Resources::Candlepin::Consumer.create(content_view_environment.cp_id, consumer_params, activation_keys.map(&:cp_name))
+        ::Katello::Host::SubscriptionFacet.update_facts(host, consumer_params[:facts]) unless consumer_params[:facts].blank?
+
+        # if pulp fails, remove the CP consumer we just made
+        begin
+          ::Katello.pulp_server.extensions.consumer.create(cp_create[:uuid], display_name: host.name)
+        rescue StandardError => e
+          ::Katello::Resources::Candlepin::Consumer.destroy(cp_create[:uuid])
+          raise e
+        end
+        cp_create[:uuid]
+      end
+
+      def finalize_registration(host)
+        host = ::Host.find(host.id)
+        host.subscription_facet.update_from_consumer_attributes(host.subscription_facet.candlepin_consumer.
+            consumer_attributes.except(:guestIds, :facts))
+        host.subscription_facet.save!
+        host.subscription_facet.update_subscription_status
+        host.content_facet.update_errata_status
+        host.refresh_global_status!
+      end
+
+      def set_host_collections(host, activation_keys)
+        host_collection_ids = activation_keys.flat_map(&:host_collection_ids).compact.uniq
+
+        host_collection_ids.each do |host_collection_id|
+          host_collection = ::Katello::HostCollection.find(host_collection_id)
+          if !host_collection.unlimited_hosts && host_collection.max_hosts >= 0 &&
+             host_collection.systems.length >= host_collection.max_hosts
+            fail _("Host collection '%{name}' exceeds maximum usage limit of '%{limit}'") %
+                     {:limit => host_collection.max_hosts, :name => host_collection.name}
+          end
+        end
+        host.host_collection_ids = host_collection_ids
+      end
+
+      def lookup_content_view_environment(activation_keys)
+        activation_key = activation_keys.reverse.detect do |act_key|
+          act_key.environment && act_key.content_view
+        end
+        if activation_key
+          ::Katello::ContentViewEnvironment.where(:content_view_id => activation_key.content_view, :environment_id => activation_key.environment).first
+        else
+          fail _('At least one activation key must have a lifecycle environment and content view assigned to it')
+        end
+      end
+
+      def candlepin_consumer_destroy(host_uuid)
+        ::Katello::Resources::Candlepin::Consumer.destroy(host_uuid)
+      rescue RestClient::Gone
+        Rails.logger.error(_("Consumer %s has already been removed") % host_uuid)
+      end
+
+      def pulp_consumer_destory(host_uuid)
+        ::Katello.pulp_server.extensions.consumer.delete(host_uuid)
+      rescue RestClient::ResourceNotFound
+        Rails.logger.error(_("Pulp Consumer %s has already been removed") % host_uuid)
+      end
+
+      def populate_content_facet(host, content_view_environment, uuid)
+        content_facet = host.content_facet || ::Katello::Host::ContentFacet.new(:host => host)
+        content_facet.content_view = content_view_environment.content_view
+        content_facet.lifecycle_environment = content_view_environment.environment
+        content_facet.uuid = uuid
+        content_facet.save!
+        content_facet
+      end
+
+      def populate_subscription_facet(host, activation_keys, consumer_params, uuid)
+        subscription_facet = host.subscription_facet || ::Katello::Host::SubscriptionFacet.new(:host => host)
+        subscription_facet.last_checkin = Time.now
+        subscription_facet.update_from_consumer_attributes(consumer_params.except(:guestIds, :facts))
+        subscription_facet.uuid = uuid
+        subscription_facet.user = User.current unless User.current.nil? || User.current.hidden?
+        subscription_facet.save!
+        subscription_facet.activation_keys = activation_keys
+        subscription_facet
+      end
+
+      def remove_host_artifacts(host, clear_content_facet = true)
+        if host.content_facet && clear_content_facet
+          host.content_facet.bound_repositories = []
+          host.content_facet.applicable_errata = []
+          host.content_facet.uuid = nil
+          host.content_facet.save!
+        end
+
+        host.get_status(::Katello::ErrataStatus).destroy
+        host.get_status(::Katello::SubscriptionStatus).destroy
+        host.get_status(::Katello::TraceStatus).destroy
+        host.installed_packages.delete_all
+      end
+    end
+  end
+end

data/app/services/katello/ui_notifications/pulp/proxy_disk_space.rb

@@ -0,0 +1,49 @@
+module Katello
+  module UINotifications
+    module Pulp
+      class ProxyDiskSpace
+        class << self
+          def deliver!
+            SmartProxy.unscoped.with_content.each do |proxy|
+              percentage = proxy.statuses[:pulp].storage['pulp_dir']['percent']
+              if percentage[0..2].to_i < 90 && notification_already_exists?(proxy)
+                blueprint.notifications.where(subject: proxy).destroy_all
+                next
+              end
+              next unless update_notifications(proxy).empty?
+              ::Notification.create!(
+                :subject => proxy,
+                :initiator => User.anonymous_admin,
+                :audience => Notification::AUDIENCE_ADMIN,
+                :message => ::UINotifications::StringParser.new(
+                  blueprint.message,
+                  :subject => proxy,
+                  :percentage => percentage
+                ),
+                :notification_blueprint => blueprint
+              )
+            end
+          end
+
+          def notification_already_exists?(subject)
+            low_disk_notification = Notification.unscoped.find_by(:subject => subject)
+            return false if low_disk_notification.blank?
+            low_disk_notification.notification_blueprint == blueprint
+          end
+
+          def update_notifications(subject)
+            return if blueprint.notifications.empty?
+            blueprint.notifications.
+              where(subject: subject).
+              update_attributes(expired_at: blueprint.expired_at)
+          end
+
+          def blueprint
+            @blueprint ||= NotificationBlueprint.unscoped.find_by(
+              :name => 'pulp_low_disk_space')
+          end
+        end
+      end
+    end
+  end
+end

data/db/migrate/20180227094827_use_uuid_for_task_id.rb

@@ -0,0 +1,26 @@
+class UseUuidForTaskId < ActiveRecord::Migration[5.0]
+  # PostgreSQL has a special column type for storing UUIDs.
+  # Using this type instead of generic string should lead to having
+  #  smaller DB and possibly better overall performance.
+  def up
+    if on_postgresql?
+      change_table :katello_content_view_histories do |t|
+        t.change :task_id, :uuid, :using => 'task_id::uuid'
+      end
+    end
+  end
+
+  def down
+    if on_postgresql?
+      change_table :katello_content_view_histories do |t|
+        t.change :task_id, :string, :null => true, :limit => 255
+      end
+    end
+  end
+
+  private
+
+  def on_postgresql?
+    ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+  end
+end

data/db/seeds.d/109-katello-notification-blueprints.rb

@@ -0,0 +1,18 @@
+blueprints = [
+  {
+    group: N_('Proxies'),
+    name: 'pulp_low_disk_space',
+    message: _("%{subject}'s disk is %{percentage} full. Since this proxy is running Pulp, it needs disk space to publish content views. Please ensure the disk does not get full."),
+    level: 'warning',
+    actions:
+    {
+      links:
+      [
+        path_method: :smart_proxy_path,
+        title: N_('Details')
+      ]
+    }
+  }
+]
+
+blueprints.each { |blueprint| UINotifications::Seed.new(blueprint).configure }

data/lib/katello/engine.rb

@@ -265,6 +265,7 @@ module Katello
       end
 
       load 'katello/repository_types.rb'
+      load 'katello/scheduled_jobs.rb'
     end
 
     rake_tasks do

data/lib/katello/scheduled_jobs.rb

@@ -0,0 +1,12 @@
+# First, we check if there's a job already enqueued for Pulp notifications
+::Foreman::Application.dynflow.config.on_init do |world|
+  pending_jobs = world.persistence.find_execution_plans(filters: { :state => 'scheduled' })
+  scheduled_job = pending_jobs.select do |job|
+    delayed_plan = world.persistence.load_delayed_plan job.id
+    next if delayed_plan.blank?
+    delayed_plan.to_hash[:serialized_args].first["job_class"] == 'CreatePulpDiskSpaceNotifications'
+  end
+
+  # Only create notifications if there isn't a scheduled job
+  CreatePulpDiskSpaceNotifications.perform_later if scheduled_job.blank?
+end

data/lib/katello/tasks/clean_backend_objects.rake

@@ -42,17 +42,17 @@ namespace :katello do
     def cleanup_hosts(cleaner)
       cleaner.hosts_with_nil_facets.each do |host|
         print "Host #{host.id} #{host.name} is partially missing subscription information.  Un-registering\n"
-        execute("Failed to delete host") { ForemanTasks.sync_task(::Actions::Katello::Host::Unregister, host) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
       end
 
       cleaner.hosts_with_no_subscriptions.each do |host|
         print "Host #{host.id} #{host.name} #{host.subscription_facet.try(:uuid)} is partially missing subscription information.  Un-registering\n"
-        execute("Failed to delete host") { ForemanTasks.sync_task(::Actions::Katello::Host::Unregister, host) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
       end
 
       cleaner.hosts_with_no_content.each do |host|
         print "Host #{host.id} #{host.name} #{host.content_facet.try(:uuid)} is partially missing content information.  Un-registering\n"
-        execute("Failed to delete host") { ForemanTasks.sync_task(::Actions::Katello::Host::Unregister, host) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
       end
     end
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.6.0.rc1".freeze
+  VERSION = "3.6.0.rc2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.6.0.rc1
+  version: 3.6.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -544,6 +544,7 @@ files:
 - app/helpers/katello/sync_management_helper.rb
 - app/helpers/katello/taxonomy_helper.rb
 - app/helpers/katello/translation_helper.rb
+- app/jobs/create_pulp_disk_space_notifications.rb
 - app/lib/actions/abstract_async_task.rb
 - app/lib/actions/candlepin/abstract.rb
 - app/lib/actions/candlepin/abstract_async_task.rb
@@ -555,7 +556,6 @@ files:
 - app/lib/actions/candlepin/consumer/attach_subscription.rb
 - app/lib/actions/candlepin/consumer/auto_attach_subscriptions.rb
 - app/lib/actions/candlepin/consumer/create.rb
-- app/lib/actions/candlepin/consumer/destroy.rb
 - app/lib/actions/candlepin/consumer/hypervisors.rb
 - app/lib/actions/candlepin/consumer/remove_subscription.rb
 - app/lib/actions/candlepin/consumer/update.rb
@@ -644,9 +644,7 @@ files:
 - app/lib/actions/katello/host/package_group/remove.rb
 - app/lib/actions/katello/host/reassign.rb
 - app/lib/actions/katello/host/recalculate_errata_status.rb
-- app/lib/actions/katello/host/register.rb
 - app/lib/actions/katello/host/remove_subscriptions.rb
-- app/lib/actions/katello/host/unregister.rb
 - app/lib/actions/katello/host/update.rb
 - app/lib/actions/katello/host/update_content_overrides.rb
 - app/lib/actions/katello/host/update_content_view.rb
@@ -1034,8 +1032,10 @@ files:
 - app/services/katello/pulp/simple_package.rb
 - app/services/katello/pulp/srpm.rb
 - app/services/katello/puppet_class_importer_extensions.rb
+- app/services/katello/registration_manager.rb
 - app/services/katello/repository_type.rb
 - app/services/katello/repository_type_manager.rb
+- app/services/katello/ui_notifications/pulp/proxy_disk_space.rb
 - app/views/common/400.html
 - app/views/dashboard/_content_views_widget.html.erb
 - app/views/dashboard/_errata_widget.html.erb
@@ -1490,6 +1490,7 @@ files:
 - db/migrate/20171120144843_add_repository_ignore_proxy.rb
 - db/migrate/20171211124439_add_uuid_index_to_katello_subscription_facets.rb
 - db/migrate/20180103230812_set_errata_updated_date.rb
+- db/migrate/20180227094827_use_uuid_for_task_id.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1497,6 +1498,7 @@ files:
 - db/seeds.d/106-mail_notifications.rb
 - db/seeds.d/107-enable_dynflow.rb
 - db/seeds.d/108-subcription-bookmarks.rb
+- db/seeds.d/109-katello-notification-blueprints.rb
 - db/seeds.d/75-job_templates.rb
 - engines/bastion_katello/README.md
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-key.factory.js
@@ -2052,6 +2054,7 @@ files:
 - lib/katello/repository_types/ostree.rb
 - lib/katello/repository_types/puppet.rb
 - lib/katello/repository_types/yum.rb
+- lib/katello/scheduled_jobs.rb
 - lib/katello/tasks/clean_backend_objects.rake
 - lib/katello/tasks/clean_old_file_repos.rake
 - lib/katello/tasks/clean_published_repo_directories.rake
@@ -2193,7 +2196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ''

data/app/lib/actions/candlepin/consumer/destroy.rb

@@ -1,17 +0,0 @@
-module Actions
-  module Candlepin
-    module Consumer
-      class Destroy < Candlepin::Abstract
-        input_format do
-          param :uuid
-        end
-
-        def run
-          ::Katello::Resources::Candlepin::Consumer.destroy(input[:uuid])
-        rescue RestClient::Gone
-          Rails.logger.error(_("Consumer %s has already been removed") % input[:uuid])
-        end
-      end
-    end
-  end
-end

data/app/lib/actions/katello/host/register.rb

@@ -1,133 +0,0 @@
-module Actions
-  module Katello
-    module Host
-      class Register < Actions::EntryAction
-        middleware.use ::Actions::Middleware::RemoteAction
-
-        def plan(host, consumer_params, content_view_environment, activation_keys = [])
-          sequence do
-            unless host.new_record?
-              host.save!
-              plan_action(Katello::Host::Unregister, host)
-              host.reload
-            end
-
-            unless activation_keys.empty?
-              content_view_environment ||= lookup_content_view_environment(activation_keys)
-              set_host_collections(host, activation_keys)
-            end
-            fail _('Content View and Environment not set for registration.') if content_view_environment.nil?
-
-            host.save!
-            host.content_facet = plan_content_facet(host, content_view_environment)
-            host.subscription_facet = plan_subscription_facet(host, activation_keys, consumer_params)
-            host.save!
-
-            action_subject host
-
-            cp_create = plan_action(Candlepin::Consumer::Create, cp_environment_id: content_view_environment.cp_id,
-                                    consumer_parameters: consumer_params, activation_keys: activation_keys.map(&:cp_name))
-            return if cp_create.error
-
-            plan_self(uuid: cp_create.output[:response][:uuid], host_id: host.id, hostname: host.name,
-                      user_id: User.current.id, :facts => consumer_params[:facts])
-            plan_action(Pulp::Consumer::Create, uuid: cp_create.output[:response][:uuid], name: host.name)
-
-            begin
-              set_content_and_subscription_uuids(host, cp_create.input[:response][:uuid])
-            rescue => e
-              ::Katello::Resources::Candlepin::Consumer.destroy(cp_create.input[:response][:uuid])
-              raise e
-            end
-          end
-        end
-
-        def humanized_name
-          if input.try(:[], :hostname)
-            _('Register Host %s') % (input[:hostname] || _('Unknown'))
-          else
-            _('Register Host')
-          end
-        end
-
-        def run
-          User.as_anonymous_admin do
-            host = ::Host.find(input[:host_id])
-            unless input[:facts].blank?
-              ::Katello::Host::SubscriptionFacet.update_facts(host, input[:facts])
-              input[:facts] = 'TRIMMED'
-            end
-          end
-        end
-
-        def finalize
-          User.as_anonymous_admin do
-            host = ::Host.find(input[:host_id])
-            host.subscription_facet.update_from_consumer_attributes(host.subscription_facet.candlepin_consumer.
-                consumer_attributes.except(:installedProducts, :guestIds, :facts))
-            host.subscription_facet.save!
-            host.subscription_facet.update_subscription_status
-            host.content_facet.update_errata_status
-            host.refresh_global_status!
-          end
-        end
-
-        def rescue_strategy
-          Dynflow::Action::Rescue::Skip
-        end
-
-        private
-
-        def set_host_collections(host, activation_keys)
-          host_collection_ids = activation_keys.flat_map(&:host_collection_ids).compact.uniq
-
-          host_collection_ids.each do |host_collection_id|
-            host_collection = ::Katello::HostCollection.find(host_collection_id)
-            if !host_collection.unlimited_hosts && host_collection.max_hosts >= 0 &&
-              host_collection.hosts.length >= host_collection.max_hosts
-              fail _("Host collection '%{name}' exceeds maximum usage limit of '%{limit}'") %
-                       {:limit => host_collection.max_hosts, :name => host_collection.name}
-            end
-          end
-          host.host_collection_ids = host_collection_ids
-        end
-
-        def lookup_content_view_environment(activation_keys)
-          activation_key = activation_keys.reverse.detect do |act_key|
-            act_key.environment && act_key.content_view
-          end
-          if activation_key
-            ::Katello::ContentViewEnvironment.where(:content_view_id => activation_key.content_view, :environment_id => activation_key.environment).first
-          else
-            fail _('At least one activation key must have a lifecycle environment and content view assigned to it')
-          end
-        end
-
-        def plan_content_facet(host, content_view_environment)
-          content_facet = host.content_facet || ::Katello::Host::ContentFacet.new(:host => host)
-          content_facet.content_view = content_view_environment.content_view
-          content_facet.lifecycle_environment = content_view_environment.environment
-          content_facet.save!
-          content_facet
-        end
-
-        def plan_subscription_facet(host, activation_keys, consumer_params)
-          subscription_facet = host.subscription_facet || ::Katello::Host::SubscriptionFacet.new(:host => host)
-          subscription_facet.last_checkin = Time.now
-          subscription_facet.update_from_consumer_attributes(consumer_params.except(:installedProducts, :guestIds, :facts))
-          subscription_facet.save!
-          subscription_facet.activation_keys = activation_keys
-          subscription_facet
-        end
-
-        def set_content_and_subscription_uuids(host, uuid)
-          host.content_facet.uuid = uuid
-          host.subscription_facet.uuid = uuid
-          host.subscription_facet.user = User.current unless User.current.nil? || User.current.hidden?
-          host.content_facet.save!
-          host.subscription_facet.save!
-        end
-      end
-    end
-  end
-end

data/app/lib/actions/katello/host/unregister.rb

@@ -1,17 +0,0 @@
-module Actions
-  module Katello
-    module Host
-      class Unregister < Actions::EntryAction
-        middleware.use ::Actions::Middleware::RemoteAction
-
-        def plan(host, options = {})
-          plan_action(Katello::Host::Destroy, host, options.merge(:unregistering => true))
-        end
-
-        def humanized_name
-          _("Unregister Host")
-        end
-      end
-    end
-  end
-end