foreman_patch 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fe015a50515a6217313c850d511157147ecbddb7ea923e5dce6084844228bc7
-  data.tar.gz: fd61c9d07e279add59d8cf5f0e62e8c2642b92070753a5f42539bd2f06393d3f
+  metadata.gz: 27d079801bd3872a195833f96d46a8981a987ebf89bedef56b44e88bb15c12cb
+  data.tar.gz: 85325d642dc887c8c768d94f44d0b4746ff6d5edb6e1eb4691ca6530f986a964
 SHA512:
-  metadata.gz: 17d841c2b1ae87b6707858484144fcd025017cd7789b4108ba4dac3c65413bf01ef2215afeeb97ba36aea6e5a09a7feccaab6468b2d145b43b832cb7ca913c3d
-  data.tar.gz: 14c8a1358afe7233d713c9068b44f366e290a1d6061c153075127cbd8b4dd75ca8e229ef5151bad88232c3c1ba597bef5f8c76fdd307a3266899e9bd0e6ee33b
+  metadata.gz: c42a3ef7b9332cf57121655ddcadceb850fa18c76ea03b8bc6dc6b351e3a3c96988fce9bdf906048f65c0b7f5f8956f6807f9a4b67e04afdc1b533a1cd692685
+  data.tar.gz: 85de82b6fb076e463d3d793525f192a423a619f315a08d7d9af4d1550dbfb6f3ecfcd2b947b2b3de80fbdc4814b9774fdaaec17c34ff82dcbfb885a2d7d60b7e

data/Rakefile

@@ -12,12 +12,6 @@ rescue LoadError
   RDoc::Task = Rake::RDocTask
 end
 
-require 'rake-version'
-
-RakeVersion::Tasks.new do |version|
-  version.copy 'lib/foreman_patch/version.rb'
-end
-
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'ForemanPatch'

data/app/controllers/foreman_patch/api/v2/invocations_controller.rb

@@ -23,7 +23,6 @@ module ForemanPatch
         api :GET, '/invocations/:id', N_('Get details of an invocation')
         param :id, :identifier, required: true
         def show
-          @invocation = ForemanPatch::Invocation.find(params[:id])
         end
 
         api :PUT, '/invocations/:id', N_('Move the invocation to another round')
@@ -35,6 +34,29 @@ module ForemanPatch
           process_response @invocation.update(invocation_params)
         end
 
+        api :PUT, '/invocations/move', N_('Move invocations to another round')
+        param :ids, Array, required: true, desc: N_('List of invocation ids')
+        param :round_id, Integer, required: true, desc: N_('Id of the destination round')
+        def move
+          @invocations = ForemanPatch::Invocation.where(id: params[:ids])
+
+          @errors = []
+          @invocations.each do |invocation|
+            round = invocation.round.cycle.rounds.find(params[:round_id])
+            invocation.update(round: round)
+          rescue
+          end
+
+          @invocations = ForemanPatch::Invocation.where(id: params[:ids], round_id: params[:round_id])
+        end
+
+        api :PUT, '/invocations/cancel', N_('Cancel invocations')
+        param :ids, Array, required: true, desc: N_('List of invocation ids')
+        def cancel
+          @invocations = ForemanPatch::Invocation.where(id: params[:ids])
+          @invocations.update_all(status: 'cancelled')          
+        end
+
         api :DELETE, 'invocations/:id', N_('Delete the patch invocation')
         param :id, :identifier, required: true
         def destroy

data/app/lib/actions/foreman_patch/cycle/initiate.rb

@@ -35,7 +35,8 @@ module Actions
         def finalize
           cycle.windows.each(&:schedule)
 
-          cycle.plan.iterate if cycle.plan.present?
+          plan = find_plan
+          plan.iterate if plan.present?
         end
 
         def humanized_name
@@ -62,6 +63,10 @@ module Actions
           task.add_missing_task_groups(plan.task_group)
         end
 
+        def find_plan
+          task.task_groups.find_by(type: 'ForemanPatch::PlanTaskGroup')&.plan
+        end
+
       end
     end
   end

data/app/lib/actions/foreman_patch/invocation/patch.rb

@@ -32,9 +32,9 @@ module Actions
           return unless root_action?
 
           case execution_plan.state
-          when 'scheduled', 'pending', 'planning', 'planned'
+          when :scheduled, :pending, :planning, :planned
             invocation.update!(status: 'pending')
-          when 'running'
+          when :running
             invocation.update!(status: 'running')
           else
             action = failed_action
@@ -70,6 +70,10 @@ module Actions
           ::Dynflow::Action::Rescue::Fail
         end
 
+        def humanized_name
+          _('Patch %s') % host.name
+        end
+
         private
 
         def host

data/app/lib/actions/foreman_patch/invocation/wait_for_host.rb

@@ -3,7 +3,6 @@ module Actions
     module Invocation
       class WaitForHost < Actions::EntryAction
         include Actions::Helpers::WithContinuousOutput
-        include Actions::Helpers::FailureNotification
         include Dynflow::Action::Polling
 
         def plan(host)
@@ -13,34 +12,32 @@ module Actions
         end
 
         def done?
-          external_task[:status] == 'available'
+          ['available', 'timeout'].include? external_task
         end
 
         def invoke_external_task
           schedule_timeout(Setting[:host_max_wait_for_up]) if Setting[:host_max_wait_for_up]
 
-          { status: 'waiting' }
+          'waiting'
         end
 
         def poll_external_task
+          return status = external_task if external_task == 'timeout'
+
           socket = TCPSocket.new(host.ip, Setting[:remote_execution_ssh_port])
           
           status = starting? ? 'available' : 'waiting'
-          
-          { status: status }
         rescue
           status = 'starting'
-
-          { status: status }
         ensure
           socket.close if socket
           add_output("Poll result: #{status}")
         end
 
         def poll_intervals
-          case external_task[:status]
+          case external_task
           when 'waiting'
-            [10, 1]
+            [1]
           when 'starting'
             [10]
           else
@@ -49,17 +46,13 @@ module Actions
         end
 
         def on_finish
-          add_output(_('Host is up'), 'stdout')
+          add_output(_('Host is up'), 'stdout') if external_task == 'available'
         end
 
         def process_timeout
           add_output(_('Server did not respond withing alloted time after restart.'), 'stderr')
-          send_failure_notification
-          fail('Timeout exceeded.')
-        end
 
-        def rescue_strategy
-          ::Dynflow::Action::Rescue::Fail
+          self.external_task = 'timeout'
         end
 
         def live_output
@@ -84,7 +77,7 @@ module Actions
         end
 
         def starting?
-          external_task[:status] == 'starting'
+          external_task == 'starting'
         end
 
         def add_output(message, type = 'debug', timestamp = Time.now.getlocal)

data/app/lib/actions/foreman_patch/window/patch.rb

@@ -55,11 +55,11 @@ module Actions
           return unless root_action?
 
           case execution_plan.state
-          when 'scheduled'
-            window.status = execution_plan.state
-          when 'pending','planning','planned','running'
+          when :scheduled
+            window.status = 'scheduled'
+          when :pending, :planning, :planned, :running
             window.status = 'running'
-          when 'stopped'
+          when :stopped
             window.status = 'completed'
           else
             window.status = execution_plan.state

data/app/models/foreman_patch/invocation.rb

@@ -2,6 +2,8 @@ module ForemanPatch
   class Invocation < ::ApplicationRecord
     include ForemanTasks::Concerns::ActionSubject
 
+    STATUSES = %w(planned pending running success warning error cancelled)
+
     belongs_to :round, class_name: 'ForemanPatch::Round', inverse_of: :invocations
     has_one :window, through: :round
     has_one :cycle, through: :window
@@ -30,6 +32,10 @@ module ForemanPatch
       task&.main_action&.planned_actions || []
     end
 
+    def events
+      task&.main_action&.live_output || []
+    end
+
     def complete?
       ['success', 'warning', 'failed', 'cancelled'].include? status
     end

data/app/models/foreman_patch/plan.rb

@@ -50,7 +50,7 @@ module ForemanPatch
     def iterate
       count = tasks.where(state: 'scheduled').count
 
-      if count < active_count or active_count == 0
+      if (count < active_count - 1) or active_count == 0
         ForemanTasks.async_task(Actions::ForemanPatch::Cycle::Create, self)
       end
     end

data/app/models/foreman_patch/round.rb

@@ -2,6 +2,8 @@ module ForemanPatch
   class Round < ::ApplicationRecord
     include ForemanTasks::Concerns::ActionSubject
 
+    STATUSES = %w(planned pending running complete).freeze
+
     belongs_to :window, class_name: 'ForemanPatch::Window'
     has_one :cycle, class_name: 'ForemanPatch::Cycle', through: :window
     belongs_to :group, class_name: 'ForemanPatch::Group'
@@ -21,38 +23,19 @@ module ForemanPatch
 
     scope :in_windows, -> (*args) { where(window: args.flatten) }
     scope :missing_hosts, -> (*args) do
-      left_joins(:invocations, { group: :group_facets }).scoping do
-        where(foreman_patch_group_facets: { host_id: args.flatten },
-              foreman_patch_invocations: { host_id: nil })
+      left_joins(group: :group_facets).scoping do
+        where(foreman_patch_group_facets: { host_id: args.flatten })
+        .where('NOT EXISTS (:invocations)',
+               invocations: ForemanPatch::Invocation.where(host_id: args.flatten)
+          .where('foreman_patch_rounds.id = foreman_patch_invocations.round_id'))
       end
     end
 
     scoped_search on: :name, complete_value: true
     scoped_search on: :status, complete_value: true
 
-    def progress(total = nil, done = nil)
-      if invocations.empty? || done == 0
-        0
-      else
-        total ||= invocations.count
-        done ||= sub_tasks.where(result: %w(success warning error)).count
-        ((done.to_f / total) * 100).round
-      end
-    end
-
-    def progress_report
-      invocations.reduce({
-        pending: 0,
-        running: 0,
-        success: 0,
-        warning: 0,
-        failed: 0,
-        cancelled: 0,
-      }) do |report, invocation|
-        status = (invocation.status == 'planned' ? 'pending' : invocation.status)
-        report[status.to_sym] += 1
-        report
-      end
+    def progress
+      ForemanPatch::Invocation::STATUSES.product([0]).to_h.merge(invocations.unscope(:order).group(:status).count)
     end
 
     def finished?

data/app/models/foreman_patch/window.rb

@@ -27,7 +27,7 @@ module ForemanPatch
       left_joins(rounds: [:invocations, {group: :group_facets}]).scoping do
         where(foreman_patch_group_facets: { host_id: args.flatten })
           .or(where(foreman_patch_invocations: { host_id: args.flatten }))
-      end
+      end.distinct
     end
 
     scoped_search on: :name, complete_value: true

data/app/views/foreman_patch/api/v2/rounds/base.json.rabl

@@ -1,3 +1,3 @@
 object @round
 
-attributes :id, :name, :description, :window_id, :group_id, :max_unavailable, :priority
+attributes :id, :name, :description, :window_id, :group_id, :max_unavailable, :priority, :status

data/app/views/foreman_patch/api/v2/rounds/status.json.rabl

@@ -1,11 +1,5 @@
 object @round
 
-attribute :id
+extends 'foreman_patch/api/v2/rounds/base'
 
-node :complete do
-  @round.finished?
-end
-
-node :progress do
-  @round.progress_report
-end
+attribute :progress

data/app/views/templates/ensure_services.erb

@@ -7,17 +7,20 @@ feature: ensure_services
 provider_type: SSH
 %>
 <% if @host.operatingsystem.family == "Redhat" && @host.operatingsystem.major.to_i > 6 %>
-state=$(systemctl is-system-running)
-while [ $? -ne 0 ]; do
+while true; do
+  state=$(systemctl is-system-running)
   case $state in
     initializing | starting)
       sleep 5
-      state=$(systemctl is-system-running)
       ;;
     maintenance | stopping | offline)
-      echo $state
+      echo "System is $state"
       exit 1
       ;;
+    running)
+      echo "All services running."
+      exit 0
+      ;;
     *)
       systemctl list-units --failed
       exit 1

data/config/api_routes.rb

@@ -24,12 +24,18 @@ ForemanPatch::Engine.routes.draw do
 
         resources :rounds, only: [:show, :create, :update, :destroy] do
           resources :invocations, only: [:index]
+
           member do
             get :status
           end
         end
 
-        resources :invocations, only: [:show]
+        resources :invocations, only: [:show] do
+          collection do
+            put 'move'
+            put 'cancel'
+          end
+        end
 
       end
     end

data/lib/foreman_patch/version.rb

@@ -1,3 +1,3 @@
 module ForemanPatch
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.3'.freeze
 end

data/webpack/components/Invocations/Invocations.js

@@ -2,11 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { LoadingState, Alert } from 'patternfly-react';
+import { TableComposable, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 import { STATUS } from 'foremanReact/constants';
 
-import InvocationItem from './components/InvocationItem';
+import InvocationStatus from './components/InvocationStatus';
+import InvocationActions from './components/InvocationActions';
 
-const Invocations = ({ status, items }) => {
+const Invocations = ({ status, items, selectAll, areAllSelected, onSelect, isSelected }) => {
   if (status === STATUS.ERROR) {
     return (
       <Alert type="error">
@@ -18,26 +20,51 @@ const Invocations = ({ status, items }) => {
   }
 
   const rows = items.length ? (
-    items.map(item => (<InvocationItem {...item} />))
+    items.map((item, rowIndex) => (
+      <Tr key={`invocation-${item.id}`}>
+        <Td
+          select={{
+            rowIndex,
+            onSelect: (_event, isSelecting) => onSelect(item, rowIndex, isSelecting),
+            isSelected: isSelected(item)
+          }}
+        />
+        <Td className="invocation_name">
+          <a href={`/foreman_patch/invocations/${item.id}`}>{item.name}</a>
+        </Td>
+        <Td>
+          <InvocationStatus status={item.status}/>
+        </Td>
+        <Td>
+          <InvocationActions {...item}/>
+        </Td>
+      </Tr>
+    ))
   ) : (
-    <tr>
-      <td colSpan="3">{__('No hosts found.')}</td>
-    </tr>
+    <Tr>
+      <Td colSpan="4">{__('No hosts found.')}</Td>
+    </Tr>
   );
 
   return (
     <LoadingState loading={!items.length && status === STATUS.PENDING}>
       <div>
-        <table className="table table-bordered table-striped table-hover">
-          <thead>
-            <tr>
-              <th>{__('Host')}</th>
-              <th className="col-md-2">{__('Status')}</th>
-              <th className="col-md-1">{__('Actions')}</th>
-            </tr>
-          </thead>
-          <tbody>{rows}</tbody>
-        </table>
+        <TableComposable className="table table-bordered table-striped table-hover">
+          <Thead>
+            <Tr>
+              <Th
+                select={{
+                  onSelect: (_event, isSelecting) => selectAll(isSelecting),
+                  isSelected: areAllSelected
+                }}
+              />
+              <Th>{__('Host')}</Th>
+              <Th className="col-md-2">{__('Status')}</Th>
+              <Th className="col-md-1">{__('Actions')}</Th>
+            </Tr>
+          </Thead>
+          <Tbody>{rows}</Tbody>
+        </TableComposable>
       </div>
     </LoadingState>
   );
@@ -46,10 +73,15 @@ const Invocations = ({ status, items }) => {
 Invocations.propTypes = {
   status: PropTypes.string,
   items: PropTypes.array.isRequired,
+  selectAll: PropTypes.func.isRequired,
+  areAllSelected: PropTypes.bool,
+  onSelect: PropTypes.func.isRequired,
+  isSelected: PropTypes.func.isRequired,
 };
 
 Invocations.defaultProps = {
   status: null,
+  areAllSelected: false,
 };
 
 export default Invocations;

data/webpack/components/Invocations/InvocationsPage.js

@@ -4,6 +4,7 @@ import { Grid } from 'patternfly-react';
 
 import SearchBar from 'foremanReact/components/SearchBar';
 import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
+import { ActionButtons } form 'foremanReact/components/common/ActionButtons/ActionButtons';
 import { getControllerSearchProps } from 'foremanReact/constants';
 
 import Invocations from './Invocations';
@@ -17,6 +18,11 @@ const InvocationsPage = ({
   pagination,
   handleSearch,
   handlePagination,
+  selectAll,
+  areAllSelected,
+  onSelect,
+  isSelected,
+  actions
 }) => (
   <div id="patch_invocations">
     <Grid.Row>
@@ -35,9 +41,19 @@ const InvocationsPage = ({
           }}
         />
       </Grid.Col>
+      <Grid.Col md={6} className="title_action">
+        <ActionButtons buttons={[]} />
+      </Grid.Col>
     </Grid.Row>
     <br />
-    <Invocations status={status} items={items} />
+    <Invocations
+      status={status}
+      items={items}
+      selectAll={selectAll}
+      areAllSelected={areAllSelected}
+      onSelect={onSelect}
+      isSelected={isSelected}
+    />
     <Pagination
       viewType="table"
       itemCount={total}
@@ -57,10 +73,17 @@ InvocationsPage.propTypes = {
   pagination: PropTypes.object.isRequired,
   handleSearch: PropTypes.func.isRequired,
   handlePagination: PropTypes.func.isRequired,
+  selectAll: PropTypes.func.isRequired,
+  areAllSelected: PropTypes.bool,
+  onSelect: PropTypes.func.isRequired,
+  isSelected: PropTypes.func.isRequired,
+  actions: PropTypes.array,
 };
 
 InvocationsPage.defaultProps = {
   status: null,
+  areAllSelected: false,
+  actions: []
 };
 
 export default InvocationsPage;

data/webpack/components/Invocations/InvocationsSelectors.js

@@ -12,7 +12,7 @@ export const selectTotal = state =>
   selectAPIResponse(state, INVOCATIONS).total || 0;
 
 export const selectAutoRefresh = state =>
-  selectItems(state).some(item => (item.result === 'pending'));
+  selectItems(state).some(item => (item.status === 'pending' || item.status === 'planned'));
 
 export const selectStatus = state => selectAPIStatus(state, INVOCATIONS);
 

data/webpack/components/Invocations/components/{InvocationItem.js → InvocationActions.js}

@@ -3,9 +3,7 @@ import PropTypes from 'prop-types';
 import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-import InvocationStatus from './InvocationStatus';
-
-const InvocationItem = ({ id, name, status, task_id, host_id }) => {
+const InvocationActions = ({ id, name, status, task_id, host_id }) => {
 
   const actions = [
     {
@@ -41,21 +39,11 @@ const InvocationItem = ({ id, name, status, task_id, host_id }) => {
   }
 
   return (
-    <tr id={`invocation-${id}`}>
-      <td className="invocation_name">
-        <a href={`/foreman_patch/invocations/${id}`}>{name}</a>
-      </td>
-      <td className="invocation_status">
-        <InvocationStatus status={status} />
-      </td>
-      <td className="invocation_actions">
-        <ActionButtons buttons={[...actions]} />
-      </td>
-    </tr>
+    <ActionButtons buttons={[...actions]} />
   );
 };
 
-InvocationItem.propTypes = {
+InvocationActions.propTypes = {
   id: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
   status: PropTypes.string.isRequired,
@@ -63,4 +51,4 @@ InvocationItem.propTypes = {
   task_id: PropTypes.number.isRequired,
 };
 
-export default InvocationItem;
+export default InvocationActions;