foreman_remote_execution 4.0.0 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93860edb8974a0691383b3a199a1a2d079d10401d7780b99aa6275b75125eb58
-  data.tar.gz: d333f8eb85a42b36694dee932447d4364b57ed2c095ad5a055d1e7adf69a9866
+  metadata.gz: 6a9f5c20b58b5911c612164cc806d63b3096c81506b18cd11423fb4b073bdec4
+  data.tar.gz: 2c8615b8ef06bf5d5adc3e62ab2a36906714ebe9e99adbf13dfb3eaa742819d6
 SHA512:
-  metadata.gz: 70c300e719d6587639719a4d95aa23da2d3f3a16d51692392c789b70cd381b31320789db0f45b57c129e4b90d36bd1a8ddadd29db4f38f2d9e40a39219b1d130
-  data.tar.gz: 1feab0c5cfd3fee6054a004eba812b7257df80a2dce50aa200d15dd20797f24f8a614d802668ac6daf043c189b7caa8e8d5f0d4a997726764c80c91173d9437b
+  metadata.gz: 549daa0a07ac47a7ed596187fd86943d9e1e517dab1d653af8f454ccee9e2b83fa85b6e2ec188201e5f849978b50b69108a0dbf6a6c67844b909de3b1b1e846f
+  data.tar.gz: b6e71fedfb385b05aa488fd65b68c2c242eba84783da007e26a6cf5f5b1b837de7bcbcfeecc72459b4c48cee93513f45948aa14318bbc548a52f159f2ae967cd

data/app/controllers/api/v2/job_invocations_controller.rb

@@ -6,7 +6,7 @@ module Api
 
       before_action :find_optional_nested_object, :only => %w{output raw_output}
       before_action :find_host, :only => %w{output raw_output}
-      before_action :find_resource, :only => %w{show update destroy clone cancel rerun}
+      before_action :find_resource, :only => %w{show update destroy clone cancel rerun outputs}
 
       wrap_parameters JobInvocation, :include => (JobInvocation.attribute_names + [:ssh])
 
@@ -137,6 +137,24 @@ module Api
         end
       end
 
+      api :GET, '/job_invocations/:id/outputs', N_('Get outputs of hosts in a job')
+      param :id, :identifier, :required => true
+      param :search_query, :identifier, :required => false
+      param :since, String, :required => false
+      param :raw, String, :required => false
+      def outputs
+        hosts = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
+        hosts = hosts.search_for(params['search_query']) if params['search_query']
+        raw = ActiveRecord::Type::Boolean.new.cast params['raw']
+        default_value = raw ? '' : []
+        outputs = hosts.map do |host|
+          host_output(@job_invocation, host, :default => default_value, :since => params['since'], :raw => raw)
+            .merge(host_id: host.id)
+        end
+
+        render :json => { :outputs => outputs }
+      end
+
       private
 
       def allowed_nested_id
@@ -145,7 +163,7 @@ module Api
 
       def action_permission
         case params[:action]
-        when 'output', 'raw_output'
+        when 'output', 'raw_output', 'outputs'
           :view
         when 'cancel'
           :cancel

data/app/controllers/foreman_remote_execution/concerns/api/v2/registration_controller_extensions.rb

@@ -0,0 +1,26 @@
+module ForemanRemoteExecution
+  module Concerns
+    module Api::V2::RegistrationControllerExtensions
+      module ApipieExtensions
+        extend Apipie::DSL::Concern
+
+        update_api(:global, :host) do
+          param :remote_execution_interface, String, desc: N_("Identifier of the Host interface for Remote execution")
+        end
+      end
+
+      extend ActiveSupport::Concern
+
+      def host_setup_extension
+        remote_execution_interface
+        super
+      end
+
+      def remote_execution_interface
+        return unless params['remote_execution_interface'].present?
+
+        @host.set_execution_interface(params['remote_execution_interface'])
+      end
+    end
+  end
+end

data/app/controllers/foreman_remote_execution/concerns/api/v2/subnets_controller_extensions.rb

@@ -0,0 +1,21 @@
+module ForemanRemoteExecution
+  module Concerns
+    module Api::V2::SubnetsControllerExtensions
+      module ApiPieExtensions
+        extend ::Apipie::DSL::Concern
+
+        update_api(:create, :update) do
+          param :subnet, Hash do
+            param :remote_execution_proxy_ids, Array, _('List of proxy IDs to be used for remote execution')
+          end
+        end
+      end
+
+      extend ActiveSupport::Concern
+
+      included do
+        include ApiPieExtensions
+      end
+    end
+  end
+end

data/app/controllers/job_templates_controller.rb

@@ -36,7 +36,7 @@ class JobTemplatesController < ::TemplatesController
 
     @template = JobTemplate.import_raw(contents, :update => Foreman::Cast.to_bool(params[:imported_template][:overwrite]))
     if @template&.save
-      flash[:notice] = _('Job template imported successfully.')
+      flash[:success] = _('Job template imported successfully.')
       redirect_to job_templates_path(:search => "name = \"#{@template.name}\"")
     else
       @template ||= JobTemplate.import_raw(contents, :build_new => true)

data/app/helpers/job_invocations_helper.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal:true
 
 module JobInvocationsHelper
-  def minicard(icon, number, text)
+  def minicard(icon, number, text, tooltip: nil)
+    tooltip_options = tooltip ? { :'data-original-title' => tooltip, :rel => 'twipsy' } : {}
     content_tag(:div, :class => 'card-pf card-pf-accented
                 card-pf-aggregate-status card-pf-aggregate-status-mini') do
-      content_tag(:h2, :class => 'card-pf-title', :style => 'line-height: 1.1') do
+      content_tag(:h2, { :class => 'card-pf-title', :style => 'line-height: 1.1' }.merge(tooltip_options)) do
         icon_text(icon, '', :kind => 'pficon') +
         content_tag(:span, number, :class =>'card-pf-aggregate-status-count') +
         text

data/app/lib/actions/remote_execution/run_hosts_job.rb

@@ -57,15 +57,24 @@ module Actions
       end
 
       def job_invocation
-        @job_invocation ||= JobInvocation.find(input[:job_invocation_id])
+        id = input[:job_invocation_id] || input.fetch(:job_invocation, {})[:id]
+        @job_invocation ||= JobInvocation.find(id)
       end
 
       def batch(from, size)
         hosts.offset(from).limit(size)
       end
 
+      def initiate
+        output[:host_count] = total_count
+        super
+      end
+
       def total_count
-        hosts.count
+        # For compatibility with already existing tasks
+        return output[:total_count] unless output.has_key?(:host_count) || task.pending?
+
+        output[:host_count] || hosts.count
       end
 
       def hosts

data/app/models/concerns/api/v2/interfaces_controller_extensions.rb

@@ -0,0 +1,13 @@
+module Api
+  module V2
+    module InterfacesControllerExtensions
+      extend Apipie::DSL::Concern
+
+      update_api(:create, :update) do
+        param :interface, Hash do
+          param :execution, :bool, :desc => N_('Should this interface be used for remote execution?')
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -44,29 +44,33 @@ module ForemanRemoteExecution
       @execution_status_label ||= get_status(HostStatus::ExecutionStatus).to_label(options)
     end
 
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     def host_params_hash
-      params = super
-      keys = remote_execution_ssh_keys
-      source = 'global'
-      if keys.present?
-        value, safe_value = params.fetch('remote_execution_ssh_keys', {}).values_at(:value, :safe_value).map { |v| [v].flatten.compact }
-        params['remote_execution_ssh_keys'] = {:value => value + keys, :safe_value => safe_value + keys, :source => source}
-      end
-      [:remote_execution_ssh_user, :remote_execution_effective_user_method,
-       :remote_execution_connect_by_ip].each do |key|
-        value = Setting[key]
-        params[key.to_s] = {:value => value, :safe_value => value, :source => source} unless params.key?(key.to_s)
-      end
-      params
+      @cached_rex_host_params_hash ||= extend_host_params_hash(super)
     end
+    # rubocop:enable Naming/MemoizedInstanceVariableName
 
     def execution_interface
       get_interface_by_flag(:execution)
     end
 
+    def set_execution_interface(identifier)
+      if interfaces.find_by(identifier: identifier).nil?
+        msg = (N_("Interface with the '%s' identifier was specified as a remote execution interface, however the interface was not found on the host. If the interface exists, it needs to be created in Foreman during the registration.") % identifier)
+        raise ActiveRecord::RecordNotFound, msg
+      end
+
+      # Only one interface at time can be used for REX, all other must be set to false
+      interfaces.each { |int| int.execution = (int.identifier == identifier) }
+      interfaces.each(&:save!)
+    end
+
     def remote_execution_proxies(provider, authorized = true)
       proxies = {}
-      proxies[:subnet]   = execution_interface.subnet.remote_execution_proxies.with_features(provider) if execution_interface&.subnet
+      proxies[:subnet] = []
+      proxies[:subnet] += execution_interface.subnet6.remote_execution_proxies.with_features(provider) if execution_interface&.subnet6
+      proxies[:subnet] += execution_interface.subnet.remote_execution_proxies.with_features(provider) if execution_interface&.subnet
+      proxies[:subnet].uniq!
       proxies[:fallback] = smart_proxies.with_features(provider) if Setting[:remote_execution_fallback_proxy]
 
       if Setting[:remote_execution_global_proxy]
@@ -102,8 +106,28 @@ module ForemanRemoteExecution
       super(*args)
     end
 
+    def clear_host_parameters_cache!
+      super
+      @cached_rex_host_params_hash = nil
+    end
+
     private
 
+    def extend_host_params_hash(params)
+      keys = remote_execution_ssh_keys
+      source = 'global'
+      if keys.present?
+        value, safe_value = params.fetch('remote_execution_ssh_keys', {}).values_at(:value, :safe_value).map { |v| [v].flatten.compact }
+        params['remote_execution_ssh_keys'] = {:value => value + keys, :safe_value => safe_value + keys, :source => source}
+      end
+      [:remote_execution_ssh_user, :remote_execution_effective_user_method,
+       :remote_execution_connect_by_ip].each do |key|
+        value = Setting[key]
+        params[key.to_s] = {:value => value, :safe_value => value, :source => source} unless params.key?(key.to_s)
+      end
+      params
+    end
+
     def build_required_interfaces(attrs = {})
       super(attrs)
       self.primary_interface.execution = true if self.execution_interface.nil?

data/app/models/foreign_input_set.rb

@@ -4,7 +4,7 @@ class ForeignInputSet < ApplicationRecord
   class CircularDependencyError < Foreman::Exception
   end
 
-  attr_exportable :exclude, :include, :include_all, :template => ->(input_set) { input_set.template.name }
+  attr_exportable :exclude, :include, :include_all, :template => ->(input_set) { input_set.target_template.name }
 
   belongs_to :template
   belongs_to :target_template, :class_name => 'Template'

data/app/models/job_invocation.rb

@@ -22,6 +22,7 @@ class JobInvocation < ApplicationRecord
   validates :job_category, :presence => true
   validates_associated :targeting, :all_template_invocations
 
+  scoped_search :on => :id, :complete_value => true
   scoped_search :on => :job_category, :complete_value => true
   scoped_search :on => :description, :complete_value => true
 
@@ -173,7 +174,7 @@ class JobInvocation < ApplicationRecord
 
   def total_hosts_count
     if targeting.resolved?
-      targeting.hosts.count
+      task&.main_action&.total_count || targeting.hosts.count
     else
       _('N/A')
     end
@@ -243,6 +244,10 @@ class JobInvocation < ApplicationRecord
     !task.pending?
   end
 
+  def missing_hosts_count
+    targeting.resolved? ? total_hosts_count - targeting.hosts.count : 0
+  end
+
   private
 
   def failed_template_invocations

data/app/models/job_invocation_composer.rb

@@ -482,7 +482,7 @@ class JobInvocationComposer
 
   def input_value_for(input)
     invocations = pattern_template_invocations
-    default = TemplateInvocationInputValue.new
+    default = TemplateInvocationInputValue.new(:template_input_id => input.id)
     invocations.map(&:input_values).flatten.detect { |iv| iv.template_input_id == input.id } || default
   end
 

data/app/models/remote_execution_feature.rb

@@ -1,5 +1,5 @@
 class RemoteExecutionFeature < ApplicationRecord
-  VALID_OPTIONS = [:provided_inputs, :description, :host_action_button, :notification_builder].freeze
+  VALID_OPTIONS = [:provided_inputs, :description, :host_action_button, :notification_builder, :proxy_selector_override].freeze
   validates :label, :name, :presence => true, :uniqueness => true
 
   belongs_to :job_template
@@ -24,8 +24,10 @@ class RemoteExecutionFeature < ApplicationRecord
   end
 
   def self.register(label, name, options = {})
+    pending_migrations = ::Foreman::Plugin.registered_plugins[:foreman_remote_execution]&.pending_migrations
     begin
-      return false unless RemoteExecutionFeature.table_exists?
+      # Let's not try to register features if rex is not registered as a plugin
+      return false if pending_migrations || pending_migrations.nil?
     rescue ActiveRecord::NoDatabaseError => e
       # just ignore the problem if DB does not exist yet (rake db:create call)
       return false
@@ -41,6 +43,7 @@ class RemoteExecutionFeature < ApplicationRecord
                    :provided_input_names => options[:provided_inputs],
                    :description => options[:description],
                    :host_action_button => options[:host_action_button],
+                   :proxy_selector_override => options[:proxy_selector_override],
                    :notification_builder => builder }
     # in case DB does not have the attribute created yet but plugin initializer registers the feature, we need to skip this attribute
     attrs = [ :host_action_button, :notification_builder ]

data/app/models/remote_execution_provider.rb

@@ -101,7 +101,12 @@ class RemoteExecutionProvider
 
     # Return a specific proxy selector to use for running a given template
     # Returns either nil to use the default selector or an instance of a (sub)class of ::ForemanTasks::ProxySelector
-    def required_proxy_selector_for(_template)
+    def required_proxy_selector_for(template)
+      if template.remote_execution_features
+                 .where(:proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY)
+                 .any?
+        ::DefaultProxyProxySelector.new
+      end
     end
   end
 end

data/app/services/remote_execution_proxy_selector.rb

@@ -1,4 +1,7 @@
 class RemoteExecutionProxySelector < ::ForemanTasks::ProxySelector
+
+  INTERNAL_PROXY = 'internal'.freeze
+
   def available_proxies(host, provider)
     host.remote_execution_proxies(provider)
   end

data/app/views/api/v2/interfaces/execution_flag.json.rabl

@@ -0,0 +1 @@
+attributes :execution

data/app/views/api/v2/job_invocations/base.json.rabl

@@ -8,6 +8,7 @@ node do |invocation|
     :failed    => invocation_count(invocation, :output_key => :failed_count),
     :pending   => invocation_count(invocation, :output_key => :pending_count),
     :total     => invocation_count(invocation, :output_key => :total_count),
+    :missing   => invocation.missing_hosts_count,
   }
 end
 

data/app/views/api/v2/job_invocations/main.json.rabl

@@ -35,7 +35,7 @@ child :task do
 end
 
 child @template_invocations do
-  attributes :template_id, :template_name
+  attributes :template_id, :template_name, :host_id
   child :input_values do
     attributes :template_input_name, :template_input_id
     node :value do |iv|

data/app/views/api/v2/registration/_form.html.erb

@@ -0,0 +1,12 @@
+<div class='form-group'>
+  <label class='col-md-2 control-label'>
+    <%= _('Remote Execution Interface') %>
+    <% help = _('Identifier of the Host interface for Remote execution') %>
+    <a rel="popover" data-content="<%= help %>" data-trigger="focus" data-container="body" data-html="true" tabindex="-1">
+      <span class="pficon pficon-info "></span>
+    </a>
+  </label>
+  <div class='col-md-4'>
+    <%= text_field_tag 'remote_execution_interface', params[:remote_execution_interface], class: 'form-control' %>
+  </div>
+</div>

data/app/views/api/v2/subnets/remote_execution_proxies.json.rabl

@@ -0,0 +1,3 @@
+child :remote_execution_proxies => :remote_execution_proxies do
+  attributes :name, :id
+end

data/app/views/job_invocations/_tab_overview.html.erb

@@ -9,7 +9,19 @@
   <% template_invocations.each do |template_invocation| %>
     <%= minicard('user', template_invocation.effective_user || Setting[:remote_execution_effective_user],
                  template_invocation.template.name + ' ' + _('effective user')) %>
-    <%= minicard('cluster', job_invocation.total_hosts_count, _('Total hosts')) %>
+    <div class="row">
+      <% missing = job_invocation.missing_hosts_count %>
+      <% size = missing.zero? ? 12 : 6 %>
+      <div class="col-xs-12 col-sm-<%= size %> col-md-<%= size %>" >
+        <%= minicard('cluster', job_invocation.total_hosts_count, _('Total hosts')) %>
+      </div>
+      <% unless missing.zero? %>
+      <div class="col-xs-12 col-sm-6 col-md-6" >
+          <%= minicard('warning-triangle-o', missing, _('Hosts gone missing'),
+                       :tooltip => _('This can happen if the host is removed or moved to another organization or location after the job was started')) %>
+      </div>
+    <% end %>
+    </div>
     <% if template_invocation.input_values.present? %>
       <%= render :partial => 'card_user_input', :locals => { :template_invocation => template_invocation } %>
     <% end %>

data/app/views/template_invocations/_output_line_set.html.erb

@@ -1,7 +1,7 @@
 <% output_line_set['output'].gsub("\r\n", "\n").sub(/\n\Z/, '').split("\n", -1).each do |line| %>
   <%= content_tag :div, :class => 'line ' + output_line_set['output_type'], :data => { :timestamp => output_line_set['timestamp'] } do %>
 
-    <%= content_tag(:span, (@line_counter += 1).to_s.rjust(4).gsub(' ', '&nbsp;').html_safe + ':', :class => 'counter', :title => (output_line_set['timestamp'] && Time.at(output_line_set['timestamp']))) %>
+    <%= content_tag(:span, (@line_counter += 1).to_s.rjust(4).gsub(' ', '&nbsp;').html_safe + ':', :class => 'counter', :title => (output_line_set['timestamp'] && Time.at(output_line_set['timestamp'].to_f))) %>
     <%= content_tag(:div, colorize_line(line.gsub(JobInvocationOutputHelper::COLOR_PATTERN, '').empty? ? "#{line}\n" : line).html_safe, :class => 'content') %>
   <% end %>
 <% end %>

data/app/views/template_invocations/show.html.erb

@@ -1,12 +1,16 @@
 <% items = [{ :caption => _('Job invocations'), :url => job_invocations_path },
             { :caption => @template_invocation.job_invocation.description,
-              :url => job_invocation_path(@template_invocation.job_invocation_id) },
-            { :caption => _('Template Invocation for %s') % @template_invocation.host.name }] %>
+              :url => job_invocation_path(@template_invocation.job_invocation_id) }]
 
-<% breadcrumbs(:resource_url => template_invocations_api_job_invocation_path(@template_invocation.job_invocation_id),
+if @host
+  items << { :caption => _('Template Invocation for %s') % @host.name }
+  breadcrumbs(:resource_url => template_invocations_api_job_invocation_path(@template_invocation.job_invocation_id),
                :name_field => 'host_name',
                :switcher_item_url => template_invocation_path(':id'),
                :items => items)
+else
+  breadcrumbs(items: items, switchable: false)
+end
 %>
 
 <% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
@@ -18,31 +22,34 @@
     <%= button_group(link_to_function(_('Toggle command'), '$("div.preview").toggle()', :class => 'btn btn-default'),
                      link_to_function(_('Toggle STDERR'), '$("div.line.stderr").toggle()', :class => 'btn btn-default'),
                      link_to_function(_('Toggle STDOUT'), '$("div.line.stdout").toggle()', :class => 'btn btn-default'),
-                     link_to_function(_('Toggle DEBUG'), '$("div.line.debug").toggle()', :class => 'btn btn-default')) %>
+                     link_to_function(_('Toggle DEBUG'), '$("div.line.debug").toggle()', :class => 'btn btn-default')) if @host %>
     <%= button_group(template_invocation_task_buttons(@template_invocation_task, @template_invocation.job_invocation)) %>
   </div>
 </div>
+<% if @host %>
+  <h3><%= _('Target: ') %><%= link_to(@host.name, host_path(@host)) %></h3>
 
-<h3><%= _('Target: ') %><%= link_to(@host.name, host_path(@host)) %></h3>
-
-<div class="preview hidden">
-  <%= preview_box(@template_invocation, @host) %>
-</div>
+  <div class="preview hidden">
+    <%= preview_box(@template_invocation, @host) %>
+  </div>
 
-<div class="terminal" data-refresh-url="<%= template_invocation_path(@template_invocation) %>">
-  <% if @error %>
-    <div class="line error"><%= @error %></div>
-  <% else %>
-    <%= link_to_function(_('Scroll to bottom'), '$("html, body").animate({ scrollTop: $(document).height() }, "slow");', :class => 'pull-right scroll-link-bottom') %>
+  <div class="terminal" data-refresh-url="<%= template_invocation_path(@template_invocation) %>">
+    <% if @error %>
+      <div class="line error"><%= @error %></div>
+    <% else %>
+      <%= link_to_function(_('Scroll to bottom'), '$("html, body").animate({ scrollTop: $(document).height() }, "slow");', :class => 'pull-right scroll-link-bottom') %>
 
-    <div class="printable">
-      <%= render :partial => 'output_line_set', :collection => normalize_line_sets(@line_sets) %>
-    </div>
+      <div class="printable">
+        <%= render :partial => 'output_line_set', :collection => normalize_line_sets(@line_sets) %>
+      </div>
 
-    <%= link_to_function(_('Scroll to top'), '$("html, body").animate({ scrollTop: 0 }, "slow");', :class => 'pull-right scroll-link-top') %>
-  <% end %>
-</div>
+      <%= link_to_function(_('Scroll to top'), '$("html, body").animate({ scrollTop: 0 }, "slow");', :class => 'pull-right scroll-link-top') %>
+    <% end %>
+  </div>
 
-<script>
-  <%= render :partial => 'refresh.js' %>
-</script>
+  <script>
+    <%= render :partial => 'refresh.js' %>
+  </script>
+<% else %>
+  <%= _("Could not display data for job invocation.") %>
+<% end %>

data/app/views/templates/ssh/package_action.erb

@@ -98,6 +98,7 @@ handle_zypp_res_codes () {
     end
   -%>
   [ -x "$(command -v subscription-manager)" ] && subscription-manager refresh
+  export DEBIAN_FRONTEND=noninteractive
   apt-get -y update
   apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y <%= action %> <%= input("package") %>
 <% elsif package_manager == 'zypper' -%>

data/config/routes.rb

@@ -55,6 +55,8 @@ Rails.application.routes.draw do
           post 'cancel'
           post 'rerun'
           get  'template_invocations', :to => 'template_invocations#template_invocations'
+          get 'outputs'
+          post 'outputs'
         end
       end
 

data/db/migrate/20200820122057_add_proxy_selector_override_to_remote_execution_feature.rb

@@ -0,0 +1,5 @@
+class AddProxySelectorOverrideToRemoteExecutionFeature < ActiveRecord::Migration[4.2]
+  def change
+    add_column :remote_execution_features, :proxy_selector_override, :string
+  end
+end

data/lib/foreman_remote_execution/engine.rb

@@ -32,6 +32,15 @@ module ForemanRemoteExecution
       end
     end
 
+    # A workaround for https://projects.theforeman.org/issues/30685
+    initializer 'foreman_remote_execution.rails_loading_workaround' do
+      # Without this, in production environment the module gets prepended too
+      # late and the extensions do not get applied
+      # TODO: Remove this and from config.to_prepare once there is an extension
+      # point in Foreman
+      ProvisioningTemplatesHelper.prepend ForemanRemoteExecution::JobTemplatesExtensions
+    end
+
     initializer 'foreman_remote_execution.apipie' do
       Apipie.configuration.checksum_path += ['/api/']
     end
@@ -74,7 +83,7 @@ module ForemanRemoteExecution
           permission :create_job_invocations, { :job_invocations => [:new, :create, :refresh, :rerun, :preview_hosts],
                                                 'api/v2/job_invocations' => [:create, :rerun] }, :resource_type => 'JobInvocation'
           permission :view_job_invocations, { :job_invocations => [:index, :chart, :show, :auto_complete_search], :template_invocations => [:show],
-                                              'api/v2/job_invocations' => [:index, :show, :output, :raw_output] }, :resource_type => 'JobInvocation'
+                                              'api/v2/job_invocations' => [:index, :show, :output, :raw_output, :outputs] }, :resource_type => 'JobInvocation'
           permission :view_template_invocations, { :template_invocations => [:show],
                                                    'api/v2/template_invocations' => [:template_invocations] }, :resource_type => 'TemplateInvocation'
           permission :create_template_invocations, {}, :resource_type => 'TemplateInvocation'
@@ -138,7 +147,16 @@ module ForemanRemoteExecution
         end
 
         extend_rabl_template 'api/v2/smart_proxies/main', 'api/v2/smart_proxies/pubkey'
+        extend_rabl_template 'api/v2/interfaces/main', 'api/v2/interfaces/execution_flag'
+        extend_rabl_template 'api/v2/subnets/show', 'api/v2/subnets/remote_execution_proxies'
+        parameter_filter ::Subnet, :remote_execution_proxy_ids
         describe_host { overview_buttons_provider :host_overview_buttons }
+
+        # Extend Registration module
+        extend_allowed_registration_vars :remote_execution_interface
+        extend_page 'registration/_form' do |cx|
+          cx.add_pagelet :global_registration, name: N_('Remote Execution'), partial: 'api/v2/registration/form', priority: 100, id: 'remote_execution_interface'
+        end
       end
     end
 
@@ -184,6 +202,7 @@ module ForemanRemoteExecution
       SmartProxy.prepend ForemanRemoteExecution::SmartProxyExtensions
       Subnet.include ForemanRemoteExecution::SubnetExtensions
 
+      ::Api::V2::InterfacesController.include Api::V2::InterfacesControllerExtensions
       # We need to explicitly force to load the Task model due to Rails loader
       # having issues with resolving it to Rake::Task otherwise
       require_dependency 'foreman_tasks/task'
@@ -192,6 +211,10 @@ module ForemanRemoteExecution
       RemoteExecutionProvider.register(:SSH, SSHExecutionProvider)
 
       ForemanRemoteExecution.register_rex_feature
+
+      ::Api::V2::SubnetsController.include ::ForemanRemoteExecution::Concerns::Api::V2::SubnetsControllerExtensions
+      ::Api::V2::RegistrationController.prepend ::ForemanRemoteExecution::Concerns::Api::V2::RegistrationControllerExtensions
+      ::Api::V2::RegistrationController.include ::ForemanRemoteExecution::Concerns::Api::V2::RegistrationControllerExtensions::ApipieExtensions
     end
 
     initializer 'foreman_remote_execution.register_gettext', after: :load_config_initializers do |_app|

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.2.3'.freeze
 end

data/package.json

@@ -21,16 +21,16 @@
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.2.1",
-    "@theforeman/eslint-plugin-foreman": "^4.2.1",
-    "@theforeman/stories": "^4.2.1",
-    "@theforeman/test": "^4.2.1",
-    "@theforeman/vendor-dev": "^4.2.1",
+    "@theforeman/builder": "^4.14.0",
+    "@theforeman/eslint-plugin-foreman": "^4.14.0",
+    "@theforeman/stories": "^4.14.0",
+    "@theforeman/test": "^4.14.0",
+    "@theforeman/vendor-dev": "^4.14.0",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.8.0",
     "prettier": "^1.19.1"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 4.2.1"
+    "@theforeman/vendor": ">= 4.14.0"
   }
 }

data/test/functional/api/v2/job_invocations_controller_test.rb

@@ -160,6 +160,35 @@ module Api
         end
       end
 
+      describe '#outputs' do
+        test 'should provide outputs for hosts in the job' do
+          get :outputs, params: { :id => @invocation.id }
+          result = ActiveSupport::JSON.decode(@response.body)
+          host_output = result['outputs'].first
+          assert_equal host_output['host_id'], @invocation.targeting.host_ids.first
+          assert_equal host_output['refresh'], true
+          assert_equal host_output['output'], []
+          assert_response :success
+        end
+
+        test 'should provide outputs for selected hosts in the job' do
+          post :outputs, params: { :id => @invocation.id, :search_query => "id = #{@invocation.targeting.host_ids.first}" }, as: :json
+          result = ActiveSupport::JSON.decode(@response.body)
+          host_output = result['outputs'].first
+          assert_equal host_output['host_id'], @invocation.targeting.host_ids.first
+          assert_equal host_output['refresh'], true
+          assert_equal host_output['output'], []
+          assert_response :success
+        end
+
+        test 'should provide outputs for hosts in the job matching a search query' do
+          get :outputs, params: { :id => @invocation.id, :search_query => "name = definitely_not_in_the_job" }
+          result = ActiveSupport::JSON.decode(@response.body)
+          assert_equal result['outputs'], []
+          assert_response :success
+        end
+      end
+
       describe 'raw output' do
         let(:fake_output) do
           (1..5).map do |i|

data/test/functional/api/v2/registration_controller_test.rb

@@ -0,0 +1,82 @@
+require 'test_plugin_helper'
+
+module Api
+  module V2
+    # Tests for the extra methods to play roles on a Host
+    class RegistrationControllerTest < ActionController::TestCase
+      describe 'host registration' do
+        let(:organization) { FactoryBot.create(:organization) }
+        let(:tax_location) { FactoryBot.create(:location) }
+        let(:template_kind) { template_kinds(:registration) }
+        let(:registration_template) do
+          FactoryBot.create(
+            :provisioning_template,
+            template_kind: template_kind,
+            template: 'template content <%= @host.name %>',
+            locations: [tax_location],
+            organizations: [organization]
+          )
+        end
+        let(:os) do
+          FactoryBot.create(
+            :operatingsystem,
+            :with_associations,
+            family: 'Redhat',
+            provisioning_templates: [
+              registration_template,
+            ]
+          )
+        end
+
+        let(:host_params) do
+          { host: { name: 'centos-test.example.com',
+                    managed: false, build: false,
+                    organization_id: organization.id,
+                    location_id: tax_location.id,
+                    operatingsystem_id: os.id } }
+        end
+
+        setup do
+          FactoryBot.create(
+            :os_default_template,
+            template_kind: template_kind,
+            provisioning_template: registration_template,
+            operatingsystem: os
+          )
+        end
+
+        describe 'remote_execution_interface' do
+          setup do
+            @host = Host.create(host_params[:host])
+            @interface0 = FactoryBot.create(:nic_managed, host: @host, identifier: 'dummy0', execution: false)
+          end
+
+          test 'with existing interface' do
+            params = host_params.merge(remote_execution_interface: @interface0.identifier)
+
+            post :host, params: params, session: set_session_user
+            assert_response :success
+            assert @interface0.reload.execution
+          end
+
+          test 'with not-existing interface' do
+            params = host_params.merge(remote_execution_interface: 'dummy999')
+
+            post :host, params: params, session: set_session_user
+            assert_response :not_found
+          end
+
+          test 'with multiple interfaces' do
+            interface1 = FactoryBot.create(:nic_managed, host: @host, identifier: 'dummy1', execution: false)
+            params = host_params.merge(remote_execution_interface: interface1.identifier)
+
+            post :host, params: params, session: set_session_user
+            assert_response :success
+            refute @interface0.reload.execution
+            assert interface1.reload.execution
+          end
+        end
+      end
+    end
+  end
+end

data/test/unit/actions/run_hosts_job_test.rb

@@ -24,6 +24,7 @@ module ForemanRemoteExecution
       OpenStruct.new(:id => uuid).tap do |o|
         o.stubs(:add_missing_task_groups)
         o.stubs(:task_groups).returns([])
+        o.stubs(:pending?).returns(true)
       end
     end
     let(:action) do
@@ -73,7 +74,7 @@ module ForemanRemoteExecution
     end
 
     it 'triggers the RunHostJob actions on the resolved hosts in run phase' do
-      planned.expects(:output).returns(:planned_count => 0)
+      planned.expects(:output).at_most(5).returns(:planned_count => 0)
       planned.expects(:trigger).with { |*args| args[0] == Actions::RemoteExecution::RunHostJob }
       planned.create_sub_plans
     end

data/webpack/react_app/components/TargetingHosts/TargetingHosts.js

@@ -51,8 +51,12 @@ const TargetingHosts = ({ apiStatus, items }) => {
 };
 
 TargetingHosts.propTypes = {
-  apiStatus: PropTypes.string.isRequired,
+  apiStatus: PropTypes.string,
   items: PropTypes.array.isRequired,
 };
 
+TargetingHosts.defaultProps = {
+  apiStatus: null,
+};
+
 export default TargetingHosts;

data/webpack/react_app/components/TargetingHosts/TargetingHostsPage.js

@@ -52,11 +52,15 @@ const TargetingHostsPage = ({
 TargetingHostsPage.propTypes = {
   handleSearch: PropTypes.func.isRequired,
   searchQuery: PropTypes.string.isRequired,
-  apiStatus: PropTypes.string.isRequired,
+  apiStatus: PropTypes.string,
   items: PropTypes.array.isRequired,
   totalHosts: PropTypes.number.isRequired,
   pagination: PropTypes.object.isRequired,
   handlePagination: PropTypes.func.isRequired,
 };
 
+TargetingHostsPage.defaultProps = {
+  apiStatus: null,
+};
+
 export default TargetingHostsPage;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -154,6 +154,8 @@ files:
 - app/controllers/concerns/foreman/controller/parameters/job_template.rb
 - app/controllers/concerns/foreman/controller/parameters/remote_execution_feature.rb
 - app/controllers/concerns/foreman/controller/parameters/targeting.rb
+- app/controllers/foreman_remote_execution/concerns/api/v2/registration_controller_extensions.rb
+- app/controllers/foreman_remote_execution/concerns/api/v2/subnets_controller_extensions.rb
 - app/controllers/job_invocations_controller.rb
 - app/controllers/job_templates_controller.rb
 - app/controllers/remote_execution_features_controller.rb
@@ -170,6 +172,7 @@ files:
 - app/lib/foreman_remote_execution/renderer/scope/input.rb
 - app/lib/proxy_api/remote_execution_ssh.rb
 - app/mailers/.gitkeep
+- app/models/concerns/api/v2/interfaces_controller_extensions.rb
 - app/models/concerns/foreman_remote_execution/bookmark_extensions.rb
 - app/models/concerns/foreman_remote_execution/errors_flattener.rb
 - app/models/concerns/foreman_remote_execution/foreman_tasks_cleaner_extensions.rb
@@ -212,6 +215,7 @@ files:
 - app/views/api/v2/foreign_input_sets/index.json.rabl
 - app/views/api/v2/foreign_input_sets/main.json.rabl
 - app/views/api/v2/foreign_input_sets/show.json.rabl
+- app/views/api/v2/interfaces/execution_flag.json.rabl
 - app/views/api/v2/job_invocations/base.json.rabl
 - app/views/api/v2/job_invocations/create.json.rabl
 - app/views/api/v2/job_invocations/index.json.rabl
@@ -223,11 +227,13 @@ files:
 - app/views/api/v2/job_templates/main.json.rabl
 - app/views/api/v2/job_templates/show.json.rabl
 - app/views/api/v2/job_templates/update.json.rabl
+- app/views/api/v2/registration/_form.html.erb
 - app/views/api/v2/remote_execution_features/base.json.rabl
 - app/views/api/v2/remote_execution_features/index.json.rabl
 - app/views/api/v2/remote_execution_features/main.json.rabl
 - app/views/api/v2/remote_execution_features/show.json.rabl
 - app/views/api/v2/smart_proxies/pubkey.json.rabl
+- app/views/api/v2/subnets/remote_execution_proxies.json.rabl
 - app/views/api/v2/template_invocations/base.json.rabl
 - app/views/api/v2/template_invocations/template_invocations.json.rabl
 - app/views/dashboard/.gitkeep
@@ -324,6 +330,7 @@ files:
 - db/migrate/20180913101042_add_randomized_ordering_to_targeting.rb
 - db/migrate/20190111153330_remove_remote_execution_without_proxy_setting.rb
 - db/migrate/20200623073022_rename_sudo_password_to_effective_user_password.rb
+- db/migrate/20200820122057_add_proxy_selector_override_to_remote_execution_feature.rb
 - db/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb
@@ -372,6 +379,7 @@ files:
 - test/functional/api/v2/foreign_input_sets_controller_test.rb
 - test/functional/api/v2/job_invocations_controller_test.rb
 - test/functional/api/v2/job_templates_controller_test.rb
+- test/functional/api/v2/registration_controller_test.rb
 - test/functional/api/v2/remote_execution_features_controller_test.rb
 - test/functional/api/v2/template_invocations_controller_test.rb
 - test/functional/cockpit_controller_test.rb
@@ -439,7 +447,7 @@ homepage: https://github.com/theforeman/foreman_remote_execution
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -454,8 +462,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config
   management functionality with remote management functionality.
@@ -466,6 +474,7 @@ test_files:
 - test/functional/api/v2/foreign_input_sets_controller_test.rb
 - test/functional/api/v2/job_invocations_controller_test.rb
 - test/functional/api/v2/job_templates_controller_test.rb
+- test/functional/api/v2/registration_controller_test.rb
 - test/functional/api/v2/remote_execution_features_controller_test.rb
 - test/functional/api/v2/template_invocations_controller_test.rb
 - test/functional/cockpit_controller_test.rb