Fixes #37388 - Drop Pulp 2 Smart Proxy status code

These were likely not triggered anymore because the Pulp 2 features were never present.
Katello · Jun 26, 2024 · d58b925 · d58b925
1 parent b6169e4
commit d58b925
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 229 deletions.
diff --git a/app/controllers/katello/concerns/smart_proxies_controller_extensions.rb b/app/controllers/katello/concerns/smart_proxies_controller_extensions.rb
diff --git a/app/models/katello/concerns/smart_proxy_extensions.rb b/app/models/katello/concerns/smart_proxy_extensions.rb
@@ -1,6 +1,4 @@
 require 'proxy_api'
-require 'proxy_api/pulp'
-require 'proxy_api/pulp_node'
 require 'proxy_api/container_gateway'
 
 module Katello

diff --git a/app/services/katello/proxy_status/pulp.rb b/app/services/katello/proxy_status/pulp.rb
diff --git a/app/services/katello/proxy_status/pulp_node.rb b/app/services/katello/proxy_status/pulp_node.rb
diff --git a/lib/katello/engine.rb b/lib/katello/engine.rb
@@ -178,8 +178,6 @@ class Engine < ::Rails::Engine
       ::OrganizationsController.include Katello::Concerns::OrganizationsControllerExtensions
 
       # Service extensions
-      require "#{Katello::Engine.root}/lib/proxy_api/pulp"
-      require "#{Katello::Engine.root}/lib/proxy_api/pulp_node"
       require "#{Katello::Engine.root}/lib/proxy_api/container_gateway"
 
       # We need to explicitly load this files because Foreman has
@@ -188,14 +186,11 @@ class Engine < ::Rails::Engine
       require_dependency "#{Katello::Engine.root}/app/lib/katello/api/v2/rendering"
       require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/api_controller"
       require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/v2/api_controller"
-      require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp"
-      require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp_node"
 
       #Api controller extensions
       ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
       ::Api::V2::HostsBulkActionsController.include Katello::Concerns::Api::V2::HostsBulkActionsControllerExtensions
       ::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
-      ::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
       ::Api::V2::RegistrationController.include ::Foreman::Controller::SmartProxyAuth
       ::Api::V2::RegistrationController.prepend Katello::Concerns::Api::V2::RegistrationControllerExtensions
       ::Api::V2::RegistrationCommandsController.include Katello::Concerns::Api::V2::RegistrationCommandsControllerExtensions

diff --git a/lib/proxy_api/pulp.rb b/lib/proxy_api/pulp.rb
diff --git a/lib/proxy_api/pulp_node.rb b/lib/proxy_api/pulp_node.rb
diff --git a/test/controllers/foreman/smart_proxies_controller_test.rb b/test/controllers/foreman/smart_proxies_controller_test.rb