katello 4.0.0.rc1 → 4.0.0.rc2

data/app/lib/actions/katello/host/package/remove.rb

@@ -2,16 +2,13 @@ module Actions
   module Katello
     module Host
       module Package
-        class Remove < Actions::EntryAction
-          include Helpers::Presenter
+        class Remove < Actions::Katello::AgentAction
+          def self.agent_message
+            :remove_package
+          end
 
-          def plan(host, packages)
-            action_subject(host, :hostname => host.name, :packages => packages)
-            plan_action(Pulp::Consumer::ContentUninstall,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'rpm',
-                        args:          packages)
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_uninstall
           end
 
           def humanized_name
@@ -27,7 +24,7 @@ module Actions
           end
 
           def humanized_package_names
-            input[:packages].inject([]) do |result, package|
+            input[:content].inject([]) do |result, package|
               if package.is_a?(Hash)
                 new_name = package.include?(:name) ? package[:name] : ""
                 new_name += '-' + package[:version] if package.include?(:version)
@@ -40,18 +37,9 @@ module Actions
             end
           end
 
-          def presenter
-            Helpers::Presenter::Delegated.new(
-                self, planned_actions(Pulp::Consumer::ContentUninstall))
-          end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
-          end
-
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: (_("Removal of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")}).truncate(255))
+            host.update(audit_comment: (_("Removal of package(s) requested: %{packages}") % {packages: input[:content].join(", ")}).truncate(255))
           end
         end
       end

data/app/lib/actions/katello/host/package/update.rb

@@ -2,18 +2,13 @@ module Actions
   module Katello
     module Host
       module Package
-        class Update < Actions::EntryAction
-          include Helpers::Presenter
-
-          def plan(host, packages)
-            Type! host, ::Host::Managed
+        class Update < Actions::Katello::AgentAction
+          def self.agent_message
+            :update_package
+          end
 
-            action_subject(host, :hostname => host.name, :packages => packages)
-            plan_action(Pulp::Consumer::ContentUpdate,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'rpm',
-                        args:          packages)
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_install
           end
 
           def humanized_name
@@ -25,15 +20,7 @@ module Actions
           end
 
           def humanized_input
-            [(input[:packages].present? && input[:packages].join(", ") || "all packages")] + super
-          end
-
-          def presenter
-            Helpers::Presenter::Delegated.new(self, planned_actions(Pulp::Consumer::ContentUpdate))
-          end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
+            [(input[:content].present? && input[:content].join(", ") || "all packages")] + super
           end
 
           def finalize
@@ -42,8 +29,8 @@ module Actions
           end
 
           def audit_comment
-            if input[:packages].present?
-              (_("Update of package(s) requested: %{packages}") % {packages: input[:packages].join(", ")}).truncate(255)
+            if input[:content].present?
+              (_("Update of package(s) requested: %{packages}") % {packages: input[:content].join(", ")}).truncate(255)
             else
               _("Update of all packages requested")
             end

data/app/lib/actions/katello/host/package_group/install.rb

@@ -2,18 +2,13 @@ module Actions
   module Katello
     module Host
       module PackageGroup
-        class Install < Actions::EntryAction
-          include Helpers::Presenter
-
-          def plan(host, groups)
-            Type! host, ::Host::Managed
+        class Install < Actions::Katello::AgentAction
+          def self.agent_message
+            :install_package_group
+          end
 
-            action_subject(host, :groups => groups)
-            plan_action(Pulp::Consumer::ContentInstall,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'package_group',
-                        args:          groups)
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_install
           end
 
           def humanized_name
@@ -21,20 +16,12 @@ module Actions
           end
 
           def humanized_input
-            [input[:groups].join(", ")] + super
-          end
-
-          def presenter
-            Helpers::Presenter::Delegated.new(self, planned_actions(Pulp::Consumer::ContentInstall))
-          end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
+            [input[:content].join(", ")] + super
           end
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: (_("Installation of package group(s) requested: %{groups}") % {groups: input[:groups].join(", ")}).truncate(255))
+            host.update(audit_comment: (_("Installation of package group(s) requested: %{groups}") % {groups: input[:content].join(", ")}).truncate(255))
           end
         end
       end

data/app/lib/actions/katello/host/package_group/remove.rb

@@ -2,16 +2,13 @@ module Actions
   module Katello
     module Host
       module PackageGroup
-        class Remove < Actions::EntryAction
-          include Helpers::Presenter
+        class Remove < Actions::Katello::AgentAction
+          def self.agent_message
+            :remove_package_group
+          end
 
-          def plan(host, groups)
-            action_subject(host, :groups => groups)
-            plan_action(Pulp::Consumer::ContentUninstall,
-                        consumer_uuid: host.content_facet.uuid,
-                        type:          'package_group',
-                        args:          groups)
-            plan_self(:host_id => host.id)
+          def agent_action_type
+            :content_uninstall
           end
 
           def humanized_name
@@ -19,21 +16,12 @@ module Actions
           end
 
           def humanized_input
-            [input[:groups].join(', ')] + super
-          end
-
-          def presenter
-            Helpers::Presenter::Delegated.new(
-                self, planned_actions(Pulp::Consumer::ContentUninstall))
-          end
-
-          def rescue_strategy
-            Dynflow::Action::Rescue::Skip
+            [input[:content].join(', ')] + super
           end
 
           def finalize
             host = ::Host.find_by(:id => input[:host_id])
-            host.update(audit_comment: (_("Removal of package group(s) requested: %{groups}") % {groups: input[:groups].join(", ")}).truncate(255))
+            host.update(audit_comment: (_("Removal of package group(s) requested: %{groups}") % {groups: input[:content].join(", ")}).truncate(255))
           end
         end
       end

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

@@ -9,8 +9,6 @@ module Actions
               ret << task_result_packages
             elsif task_result_packages.any?
               ret.concat(task_result_packages.map { |package| package[:qname] })
-            else
-              ret << humanized_no_package
             end
             if humanized_errors
               ret.concat(humanized_errors)
@@ -96,15 +94,6 @@ module Actions
         def humanized_errors
           task_errors&.map { |k, v| "#{k}: #{v}" }
         end
-
-        def humanized_no_package
-          case action
-          when Consumer::ContentInstall
-            _("No new packages installed")
-          when Consumer::ContentUninstall
-            _("No packages removed")
-          end
-        end
       end
     end
   end

data/app/lib/katello/agent/base_message.rb

@@ -0,0 +1,38 @@
+module Katello
+  module Agent
+    class BaseMessage
+      attr_accessor :dispatch_history_id, :recipient_address, :reply_to
+
+      def json
+        {
+          data: {
+            consumer_id: @consumer_id,
+            dispatch_history_id: dispatch_history_id
+          },
+          replyto: reply_to,
+          request: {
+            args: [
+              units,
+              {
+                importkeys: true
+              }
+            ],
+            classname: "Content",
+            cntr: [[], {}],
+            kws: {},
+            method: @method
+          },
+          routing: [
+            nil,
+            recipient_address
+          ],
+          version: "2.0"
+        }
+      end
+
+      def to_s
+        json.to_json
+      end
+    end
+  end
+end

data/app/lib/katello/agent/client_message_handler.rb

@@ -0,0 +1,60 @@
+module Katello
+  module Agent
+    class ClientMessageHandler
+      def initialize(message)
+        logger.debug("client message: #{message.body}")
+        @json = parse_message_json(message)
+        dispatch_history_id = @json&.dig(:data, :dispatch_history_id)
+        @dispatch_history = Katello::Agent::DispatchHistory.find_by_id(dispatch_history_id)
+
+        unless @dispatch_history
+          fail("No valid dispatch history in client message")
+        end
+      end
+
+      def accepted?
+        @json[:status] == 'accepted'
+      end
+
+      def result
+        @json.dig(:result, :retval, :details)
+      end
+
+      def handle
+        @dispatch_history.accepted_at = DateTime.now if accepted?
+        @dispatch_history.result = result if result
+        @dispatch_history.save!
+
+        if @dispatch_history.dynflow_execution_plan_id && @dispatch_history.dynflow_step_id
+          handle_dynflow_event
+        end
+      end
+
+      private
+
+      def handle_dynflow_event
+        task_exists = ForemanTasks::Task.exists?(external_id: @dispatch_history.dynflow_execution_plan_id, result: 'pending')
+        unless task_exists
+          logger.warn("Couldn't find pending task with external_id=#{@dispatch_history.dynflow_execution_plan_id} dispatch_history_id=#{@dispatch_history.id}")
+          return
+        end
+
+        if accepted?
+          ForemanTasks.dynflow.world.event(@dispatch_history.dynflow_execution_plan_id, @dispatch_history.dynflow_step_id, 'accepted')
+        elsif result
+          ForemanTasks.dynflow.world.event(@dispatch_history.dynflow_execution_plan_id, @dispatch_history.dynflow_step_id, 'finished')
+        end
+      end
+
+      def parse_message_json(message)
+        JSON.parse(message.body).with_indifferent_access
+      rescue
+        nil
+      end
+
+      def logger
+        ::Foreman::Logging.logger('katello/agent')
+      end
+    end
+  end
+end

data/app/lib/katello/agent/connection.rb

@@ -0,0 +1,24 @@
+module Katello
+  module Agent
+    class Connection
+      def send_messages(messages)
+        connection = ::Katello::Qpid::Connection.new(settings[:broker_url])
+        connection.send_messages(messages)
+      end
+
+      def fetch_agent_messages(handler = ClientMessageHandler)
+        connection = ::Katello::Qpid::Connection.new(settings[:broker_url])
+        connection.receive_messages(address: settings[:event_queue_name], handler: handler)
+      end
+
+      def delete_client_queue(queue_name)
+        connection = ::Katello::Qpid::Connection.new(settings[:broker_url])
+        connection.delete_queue(queue_name)
+      end
+
+      def settings
+        SETTINGS[:katello][:agent]
+      end
+    end
+  end
+end

data/app/lib/katello/agent/install_errata_message.rb

@@ -0,0 +1,25 @@
+module Katello
+  module Agent
+    class InstallErrataMessage < BaseMessage
+      def initialize(content:, consumer_id:)
+        @errata_ids = content
+        @consumer_id = consumer_id
+        @content_type = 'erratum'
+        @method = 'install'
+      end
+
+      protected
+
+      def units
+        @errata_ids.map do |id|
+          {
+            type_id: @content_type,
+            unit_key: {
+              id: id
+            }
+          }
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/agent/install_package_group_message.rb

@@ -0,0 +1,25 @@
+module Katello
+  module Agent
+    class InstallPackageGroupMessage < BaseMessage
+      def initialize(content:, consumer_id:)
+        @groups = content
+        @consumer_id = consumer_id
+        @content_type = 'package_group'
+        @method = 'install'
+      end
+
+      protected
+
+      def units
+        @groups.map do |group|
+          {
+            type_id: @content_type,
+            unit_key: {
+              name: group
+            }
+          }
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/agent/install_package_message.rb

@@ -0,0 +1,28 @@
+module Katello
+  module Agent
+    class InstallPackageMessage < BaseMessage
+      def initialize(content:, consumer_id:)
+        @packages = content
+        @consumer_id = consumer_id
+        @content_type = 'rpm'
+        @method = 'install'
+      end
+
+      protected
+
+      def units
+        @packages.map do |package|
+          nvra = ::Katello::Util::Package.parse_nvrea_nvre(package)
+          unit_key = nvra || {
+            name: package
+          }
+
+          {
+            type_id: @content_type,
+            unit_key: unit_key
+          }
+        end
+      end
+    end
+  end
+end

data/app/lib/katello/agent/remove_package_group_message.rb

@@ -0,0 +1,25 @@
+module Katello
+  module Agent
+    class RemovePackageGroupMessage < BaseMessage
+      def initialize(content:, consumer_id:)
+        @groups = content
+        @consumer_id = consumer_id
+        @content_type = 'package_group'
+        @method = 'uninstall'
+      end
+
+      protected
+
+      def units
+        @groups.map do |group|
+          {
+            type_id: @content_type,
+            unit_key: {
+              name: group
+            }
+          }
+        end
+      end
+    end
+  end
+end