Removing unnecessary keep_kickstart_repository

Author: parthaa

app/services/katello/registration_manager.rb

@@ -125,11 +125,9 @@ def joined_hostnames(hosts)
       #  * 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
-      #  * keep_kickstart_repository: ensure the KS repo ID is not set to nil
       def unregister_host(host, options = {})
         organization_destroy = options.fetch(:organization_destroy, false)
         unregistering = options.fetch(:unregistering, false)
-        keep_kickstart_repository = options.fetch(:keep_kickstart_repository, 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)
@@ -140,11 +138,7 @@ def unregister_host(host, options = {})
         host.subscription_facet.try(:destroy!)
 
         if unregistering
-          if keep_kickstart_repository
-            remove_host_artifacts(host, kickstart_repository_id: host&.content_facet&.kickstart_repository_id)
-          else
-            remove_host_artifacts(host)
-          end
+          remove_host_artifacts(host)
         elsif organization_destroy
           host.content_facet.try(:destroy!)
           remove_host_artifacts(host, clear_content_facet: false)
@@ -159,10 +153,11 @@ def register_host(host, consumer_params, content_view_environments, activation_k
         new_host = host.new_record?
         unless new_host
           host.save!
-          # Keep the kickstart repository ID so the host's Medium isn't unset
-          # Important for registering a host during provisioning
+          # Unregister the host before re-registering
+          # The retain_build_profile_upon_unregistration setting controls whether
+          # provisioning information (including kickstart repository) is preserved
           begin
-            unregister_host(host, :unregistering => true, :keep_kickstart_repository => true)
+            unregister_host(host, :unregistering => true)
           rescue RestClient::Gone
             Rails.logger.debug("Host %s has been removed in preparation for reregistration" % host&.name)
           end
@@ -319,23 +314,21 @@ def populate_subscription_facet(host, activation_keys, consumer_params, uuid)
         subscription_facet
       end
 
-      def remove_host_artifacts(host, clear_content_facet: true, kickstart_repository_id: nil)
-        Rails.logger.debug "Host ID: #{host.id}, clear_content_facet: #{clear_content_facet}, kickstart_repository_id: #{kickstart_repository_id}"
+      def remove_host_artifacts(host, clear_content_facet: true)
+        Rails.logger.debug "Host ID: #{host.id}, clear_content_facet: #{clear_content_facet}"
         if host.content_facet && clear_content_facet
           host.content_facet.bound_repositories = []
           host.content_facet.applicable_errata = []
           host.content_facet.uuid = nil
 
           # Clear or retain provisioning information based on setting
-          if Setting[:retain_build_profile_upon_unregistration]
-            # Retain current kickstart_repository_id if setting is enabled
-            host.content_facet.kickstart_repository_id = kickstart_repository_id if kickstart_repository_id
-          else
+          unless Setting[:retain_build_profile_upon_unregistration]
             # Clear provisioning information if setting is disabled
             host.content_facet.content_view_environments = []
             host.content_facet.kickstart_repository_id = nil
             host.content_facet.content_source = ::SmartProxy.pulp_primary
           end
+          # If setting is enabled, keep current values (CVEs, kickstart_repository_id, content_source)
 
           host.content_facet.save!
           Rails.logger.debug "remove_host_artifacts: marking CVEs unchanged to prevent backend update"

test/services/katello/registration_manager_test.rb

@@ -377,25 +377,6 @@ def test_unregister_host_retains_build_profile_when_setting_enabled
         assert_nil @host.content_facet.uuid
       end
 
-      def test_unregister_host_retains_kickstart_repository_when_keep_kickstart_repository_and_setting_enabled
-        ::Host::Managed.any_instance.stubs(:update_candlepin_associations)
-        @host = FactoryBot.create(:host, :with_content, :with_subscription, :content_view => @content_view,
-                                    :lifecycle_environment => @library, :organization => @content_view.organization)
-        kickstart_repo = katello_repositories(:fedora_17_x86_64)
-        @host.content_facet.update(:kickstart_repository_id => kickstart_repo.id)
-
-        original_cves = @host.content_facet.content_view_environments.dup
-
-        Setting[:retain_build_profile_upon_unregistration] = true
-        ::Katello::Resources::Candlepin::Consumer.expects(:destroy)
-
-        ::Katello::RegistrationManager.unregister_host(@host, unregistering: true, keep_kickstart_repository: true)
-
-        # Verify provisioning information is retained
-        assert_equal original_cves, @host.content_facet.content_view_environments
-        assert_equal kickstart_repo.id, @host.content_facet.kickstart_repository_id
-      end
-
       def test_destroy_host_not_found
         @host = FactoryBot.create(:host, :with_content, :with_subscription, :content_view => @content_view,
                                    :lifecycle_environment => @library, :organization => @content_view.organization)