foreman_leapp 0.1.1 → 0.1.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/lib/helpers/job_helper.rb +3 -4
- data/app/views/foreman_leapp/job_templates/{check.erb → leapp_check.erb} +1 -0
- data/app/views/foreman_leapp/job_templates/{preupgrade.erb → leapp_preupgrade.erb} +3 -2
- data/app/views/foreman_leapp/job_templates/{remediation.erb → leapp_remediation.erb} +4 -3
- data/app/views/foreman_leapp/job_templates/{upgrade.erb → leapp_upgrade.erb} +4 -3
- data/db/seeds.d/10_leapp_preupgrade.rb +1 -1
- data/lib/foreman_leapp/engine.rb +3 -5
- data/lib/foreman_leapp/version.rb +1 -1
- data/locale/action_names.rb +6 -0
- data/locale/en/foreman_leapp.po +104 -2
- data/locale/foreman_leapp.pot +164 -8
- data/test/unit/actions/preupgrade_job_test.rb +1 -1
- data/test/unit/helpers/job_helper_test.rb +3 -10
- data/webpack/components/PreupgradeReports/PreupgradeReports.js +3 -3
- data/webpack/components/PreupgradeReports/components/EntriesFilter.js +1 -1
- data/webpack/components/PreupgradeReports/components/UpgradeAllButton.js +15 -16
- data/webpack/components/PreupgradeReports/components/__snapshots__/EntriesFilter.test.js.snap +4 -4
- data/webpack/components/PreupgradeReports/components/__snapshots__/UpgradeAllButton.test.js.snap +12 -0
- data/webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js +1 -1
- data/webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/PreupgradeReportEntry.test.js.snap +2 -2
- data/webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/PreupgradeReportsListHeader.test.js.snap +1 -1
- data/webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/helpers.test.js.snap +1 -1
- data/webpack/components/PreupgradeReportsList/components/helpers.js +4 -4
- metadata +17 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d3c145ee10f32a246917399d702922f59e1c138553701dcf57d1a882bf273fb5
|
4
|
+
data.tar.gz: 3588235986ced1cfd12fee20a1da2f5249ca4365200faeda37fd4091283a5e0e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9c66cb5bf6c96997e6997b4478a2ab56f5b13afb6ebd6508898dda3933bbf92fe6f058ead64a98ca1bce8fa73fd1ef9488286f1574cf551e14382e84ef11e853
|
7
|
+
data.tar.gz: 25d2ec6c2276b5bef4794dd9545413c51259d71f325b9f00c21d818f0358b715e4128b057665a98bef634da192d085b647ca70a9afa24c93e9a078e3780ccc4f
|
@@ -4,10 +4,9 @@ module Helpers
|
|
4
4
|
module JobHelper
|
5
5
|
class << self
|
6
6
|
def correct_feature?(job_invocation, feature)
|
7
|
-
job_invocation.
|
8
|
-
|
9
|
-
|
10
|
-
.first)&.label == feature
|
7
|
+
RemoteExecutionFeature.where(job_template_id: job_invocation.pattern_template_invocations
|
8
|
+
.first
|
9
|
+
.template_id, label: feature).any?
|
11
10
|
end
|
12
11
|
end
|
13
12
|
end
|
@@ -1,16 +1,17 @@
|
|
1
1
|
<%#
|
2
2
|
kind: job_template
|
3
3
|
name: Run preupgrade via Leapp
|
4
|
-
job_category: Leapp
|
4
|
+
job_category: Leapp - Preupgrade
|
5
5
|
description_format: 'Upgradeability check for RHEL 7 host'
|
6
6
|
provider_type: SSH
|
7
7
|
feature: leapp_preupgrade
|
8
|
+
model: JobTemplate
|
8
9
|
%>
|
9
10
|
|
10
11
|
<%= render_template 'Check Leapp' %>
|
11
12
|
|
13
|
+
rm -f /var/log/leapp/leapp-report.json
|
12
14
|
leapp preupgrade
|
13
15
|
|
14
16
|
echo "===leap_upgrade_report_start==="
|
15
17
|
cat /var/log/leapp/leapp-report.json
|
16
|
-
rm -f /var/log/leapp/leapp-report.json
|
@@ -1,10 +1,11 @@
|
|
1
1
|
<%#
|
2
2
|
kind: job_template
|
3
|
-
name:
|
4
|
-
job_category:
|
5
|
-
description_format: 'Run
|
3
|
+
name: Run remediation plan via Leapp
|
4
|
+
job_category: Other
|
5
|
+
description_format: 'Run remediation plan via Leapp'
|
6
6
|
provider_type: SSH
|
7
7
|
feature: leapp_remediation_plan
|
8
|
+
model: JobTemplate
|
8
9
|
template_inputs:
|
9
10
|
- name: remediation_ids
|
10
11
|
required: true
|
@@ -1,10 +1,11 @@
|
|
1
1
|
<%#
|
2
2
|
kind: job_template
|
3
3
|
name: Run upgrade via Leapp
|
4
|
-
job_category:
|
4
|
+
job_category: Leapp - Upgrade
|
5
5
|
description_format: 'Upgrade RHEL 7 host'
|
6
6
|
provider_type: Ansible
|
7
7
|
feature: leapp_upgrade
|
8
|
+
model: JobTemplate
|
8
9
|
template_inputs:
|
9
10
|
- name: Reboot
|
10
11
|
description: Reboot the host automaticaly to continue with the upgrade
|
@@ -18,8 +19,8 @@ template_inputs:
|
|
18
19
|
tasks:
|
19
20
|
- name: Run Leapp Upgrade
|
20
21
|
command: leapp upgrade
|
21
|
-
|
22
|
+
<%- if input('Reboot') == "true" -%>
|
22
23
|
- name: Reboot the machine
|
23
24
|
reboot:
|
24
25
|
reboot_timeout: 1800
|
25
|
-
|
26
|
+
<%- end -%>
|
@@ -9,7 +9,7 @@ User.as_anonymous_admin do
|
|
9
9
|
'job_templates/**/*.erb')].each do |template|
|
10
10
|
template = JobTemplate.import_raw!(File.read(template),
|
11
11
|
:default => true,
|
12
|
-
:
|
12
|
+
:lock => true,
|
13
13
|
:update => true)
|
14
14
|
template.organizations = organizations if template.present?
|
15
15
|
template.locations = locations if template.present?
|
data/lib/foreman_leapp/engine.rb
CHANGED
@@ -1,8 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
module ForemanLeapp
|
4
|
-
JOB_CATEGORY = 'Leapp'
|
5
|
-
|
6
4
|
class Engine < ::Rails::Engine
|
7
5
|
engine_name 'foreman_leapp'
|
8
6
|
|
@@ -23,7 +21,7 @@ module ForemanLeapp
|
|
23
21
|
|
24
22
|
initializer 'foreman_leapp.register_plugin', before: :finisher_hook do |_app|
|
25
23
|
Foreman::Plugin.register :foreman_leapp do
|
26
|
-
requires_foreman '>= 1
|
24
|
+
requires_foreman '>= 2.1'
|
27
25
|
|
28
26
|
apipie_documented_controllers ["#{ForemanLeapp::Engine.root}/app/controllers/api/v2/*.rb"]
|
29
27
|
extend_template_helpers ForemanLeapp::TemplateHelper
|
@@ -44,8 +42,8 @@ module ForemanLeapp
|
|
44
42
|
# Include concerns in this config.to_prepare block
|
45
43
|
config.to_prepare do
|
46
44
|
begin
|
47
|
-
HostsHelper.prepend ForemanLeapp::HostsHelperExtensions
|
48
|
-
|
45
|
+
::HostsHelper.prepend ForemanLeapp::HostsHelperExtensions
|
46
|
+
::JobInvocation.include ForemanLeapp::JobInvocationExtensions
|
49
47
|
rescue StandardError => e
|
50
48
|
Rails.logger.warn "ForemanLeapp: skipping engine hook (#{e})"
|
51
49
|
end
|
data/locale/en/foreman_leapp.po
CHANGED
@@ -2,12 +2,10 @@
|
|
2
2
|
#
|
3
3
|
# This file is distributed under the same license as foreman_leapp.
|
4
4
|
#
|
5
|
-
#, fuzzy
|
6
5
|
msgid ""
|
7
6
|
msgstr ""
|
8
7
|
"Project-Id-Version: version 0.0.1\n"
|
9
8
|
"Report-Msgid-Bugs-To: \n"
|
10
|
-
"POT-Creation-Date: 2014-08-20 08:46+0100\n"
|
11
9
|
"PO-Revision-Date: 2014-08-20 08:54+0100\n"
|
12
10
|
"Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
|
13
11
|
"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
|
@@ -17,3 +15,107 @@ msgstr ""
|
|
17
15
|
"Content-Transfer-Encoding: 8bit\n"
|
18
16
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
19
17
|
|
18
|
+
msgid "A foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp utility."
|
19
|
+
msgstr ""
|
20
|
+
|
21
|
+
msgid "All"
|
22
|
+
msgstr ""
|
23
|
+
|
24
|
+
msgid "Command"
|
25
|
+
msgstr ""
|
26
|
+
|
27
|
+
msgid "Fix Selected"
|
28
|
+
msgstr ""
|
29
|
+
|
30
|
+
msgid "Fix Type"
|
31
|
+
msgstr ""
|
32
|
+
|
33
|
+
msgid "Has Remediation?"
|
34
|
+
msgstr ""
|
35
|
+
|
36
|
+
msgid "High"
|
37
|
+
msgstr ""
|
38
|
+
|
39
|
+
msgid "Hint"
|
40
|
+
msgstr ""
|
41
|
+
|
42
|
+
msgid "Host"
|
43
|
+
msgstr ""
|
44
|
+
|
45
|
+
msgid "Info"
|
46
|
+
msgstr ""
|
47
|
+
|
48
|
+
msgid "Inhibitor"
|
49
|
+
msgstr ""
|
50
|
+
|
51
|
+
msgid "Inhibitor?"
|
52
|
+
msgstr ""
|
53
|
+
|
54
|
+
msgid "Leapp preupgrade report"
|
55
|
+
msgstr ""
|
56
|
+
|
57
|
+
msgid "List Preupgrade reports"
|
58
|
+
msgstr ""
|
59
|
+
|
60
|
+
msgid "List Preupgrade reports for Job invocation"
|
61
|
+
msgstr ""
|
62
|
+
|
63
|
+
msgid "Low"
|
64
|
+
msgstr ""
|
65
|
+
|
66
|
+
msgid "Medium"
|
67
|
+
msgstr ""
|
68
|
+
|
69
|
+
msgid "Missing one of the required permissions: view_hosts"
|
70
|
+
msgstr ""
|
71
|
+
|
72
|
+
msgid "No"
|
73
|
+
msgstr ""
|
74
|
+
|
75
|
+
msgid "No Preupgrade Report Available"
|
76
|
+
msgstr ""
|
77
|
+
|
78
|
+
msgid "Preupgrade check with Leapp"
|
79
|
+
msgstr ""
|
80
|
+
|
81
|
+
msgid "Remediation plan"
|
82
|
+
msgstr ""
|
83
|
+
|
84
|
+
msgid "Rerun preupgrade check"
|
85
|
+
msgstr ""
|
86
|
+
|
87
|
+
msgid "Risk Factor"
|
88
|
+
msgstr ""
|
89
|
+
|
90
|
+
msgid "Run Leapp Preupgrade check again"
|
91
|
+
msgstr ""
|
92
|
+
|
93
|
+
msgid "Run Leapp upgrade job for RHEL 7 host"
|
94
|
+
msgstr ""
|
95
|
+
|
96
|
+
msgid "Run Remediation plan with Leapp"
|
97
|
+
msgstr ""
|
98
|
+
|
99
|
+
msgid "Run Upgrade"
|
100
|
+
msgstr ""
|
101
|
+
|
102
|
+
msgid "Show Preupgrade report"
|
103
|
+
msgstr ""
|
104
|
+
|
105
|
+
msgid "The preupgrade report will be available after the job finishes"
|
106
|
+
msgstr ""
|
107
|
+
|
108
|
+
msgid "This issue inhibits the upgrade."
|
109
|
+
msgstr ""
|
110
|
+
|
111
|
+
msgid "Title"
|
112
|
+
msgstr ""
|
113
|
+
|
114
|
+
msgid "Upgrade with Leapp"
|
115
|
+
msgstr ""
|
116
|
+
|
117
|
+
msgid "Upgradeability check for RHEL 7 host"
|
118
|
+
msgstr ""
|
119
|
+
|
120
|
+
msgid "Yes"
|
121
|
+
msgstr ""
|
data/locale/foreman_leapp.pot
CHANGED
@@ -1,19 +1,175 @@
|
|
1
|
-
#
|
2
|
-
#
|
3
|
-
# This file is distributed under the same license as foreman_leapp.
|
1
|
+
# SOME DESCRIPTIVE TITLE.
|
2
|
+
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
3
|
+
# This file is distributed under the same license as the foreman_leapp package.
|
4
|
+
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
4
5
|
#
|
5
6
|
#, fuzzy
|
6
7
|
msgid ""
|
7
8
|
msgstr ""
|
8
|
-
"Project-Id-Version:
|
9
|
+
"Project-Id-Version: foreman_leapp 1.0.0\n"
|
9
10
|
"Report-Msgid-Bugs-To: \n"
|
10
|
-
"POT-Creation-Date:
|
11
|
-
"PO-Revision-Date:
|
12
|
-
"Last-Translator:
|
13
|
-
"Language-Team:
|
11
|
+
"POT-Creation-Date: 2020-07-20 08:46+0200\n"
|
12
|
+
"PO-Revision-Date: 2020-07-20 08:46+0200\n"
|
13
|
+
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
14
|
+
"Language-Team: LANGUAGE <LL@li.org>\n"
|
14
15
|
"Language: \n"
|
15
16
|
"MIME-Version: 1.0\n"
|
16
17
|
"Content-Type: text/plain; charset=UTF-8\n"
|
17
18
|
"Content-Transfer-Encoding: 8bit\n"
|
18
19
|
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
|
19
20
|
|
21
|
+
#: ../app/controllers/api/v2/concerns/api_authorizer.rb:16
|
22
|
+
msgid "Missing one of the required permissions: view_hosts"
|
23
|
+
msgstr ""
|
24
|
+
|
25
|
+
#: ../app/controllers/api/v2/preupgrade_reports_controller.rb:10
|
26
|
+
msgid "List Preupgrade reports"
|
27
|
+
msgstr ""
|
28
|
+
|
29
|
+
#: ../app/controllers/api/v2/preupgrade_reports_controller.rb:16
|
30
|
+
msgid "Show Preupgrade report"
|
31
|
+
msgstr ""
|
32
|
+
|
33
|
+
#: ../app/controllers/api/v2/preupgrade_reports_controller.rb:22
|
34
|
+
msgid "List Preupgrade reports for Job invocation"
|
35
|
+
msgstr ""
|
36
|
+
|
37
|
+
#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:6
|
38
|
+
#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:11
|
39
|
+
#: ../lib/foreman_leapp/engine.rb:53
|
40
|
+
msgid "Preupgrade check with Leapp"
|
41
|
+
msgstr ""
|
42
|
+
|
43
|
+
#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:7
|
44
|
+
#: ../app/helpers/concerns/foreman_leapp/hosts_helper_extensions.rb:13
|
45
|
+
#: ../lib/foreman_leapp/engine.rb:60
|
46
|
+
msgid "Upgrade with Leapp"
|
47
|
+
msgstr ""
|
48
|
+
|
49
|
+
#: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:8
|
50
|
+
msgid "Rerun preupgrade check"
|
51
|
+
msgstr ""
|
52
|
+
|
53
|
+
#:
|
54
|
+
#: ../app/helpers/concerns/foreman_leapp/remote_execution_helper_extension.rb:11
|
55
|
+
msgid "Run Leapp Preupgrade check again"
|
56
|
+
msgstr ""
|
57
|
+
|
58
|
+
#: ../lib/foreman_leapp/engine.rb:32
|
59
|
+
msgid "Leapp preupgrade report"
|
60
|
+
msgstr ""
|
61
|
+
|
62
|
+
#: ../lib/foreman_leapp/engine.rb:54
|
63
|
+
msgid "Upgradeability check for RHEL 7 host"
|
64
|
+
msgstr ""
|
65
|
+
|
66
|
+
#: ../lib/foreman_leapp/engine.rb:61
|
67
|
+
msgid "Run Leapp upgrade job for RHEL 7 host"
|
68
|
+
msgstr ""
|
69
|
+
|
70
|
+
#: ../lib/foreman_leapp/engine.rb:67
|
71
|
+
msgid "Remediation plan"
|
72
|
+
msgstr ""
|
73
|
+
|
74
|
+
#: ../lib/foreman_leapp/engine.rb:68
|
75
|
+
msgid "Run Remediation plan with Leapp"
|
76
|
+
msgstr ""
|
77
|
+
|
78
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:19
|
79
|
+
#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:38
|
80
|
+
msgid "Title"
|
81
|
+
msgstr ""
|
82
|
+
|
83
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:20
|
84
|
+
#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:13
|
85
|
+
msgid "Risk Factor"
|
86
|
+
msgstr ""
|
87
|
+
|
88
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:21
|
89
|
+
#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:12
|
90
|
+
msgid "Host"
|
91
|
+
msgstr ""
|
92
|
+
|
93
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:22
|
94
|
+
msgid "Fix Type"
|
95
|
+
msgstr ""
|
96
|
+
|
97
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:23
|
98
|
+
#: ../webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js:21
|
99
|
+
msgid "Inhibitor"
|
100
|
+
msgstr ""
|
101
|
+
|
102
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:27
|
103
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:35
|
104
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:41
|
105
|
+
msgid "All"
|
106
|
+
msgstr ""
|
107
|
+
|
108
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:28
|
109
|
+
msgid "Low"
|
110
|
+
msgstr ""
|
111
|
+
|
112
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:29
|
113
|
+
msgid "Medium"
|
114
|
+
msgstr ""
|
115
|
+
|
116
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:30
|
117
|
+
msgid "High"
|
118
|
+
msgstr ""
|
119
|
+
|
120
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:31
|
121
|
+
msgid "Info"
|
122
|
+
msgstr ""
|
123
|
+
|
124
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:36
|
125
|
+
msgid "Hint"
|
126
|
+
msgstr ""
|
127
|
+
|
128
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:37
|
129
|
+
msgid "Command"
|
130
|
+
msgstr ""
|
131
|
+
|
132
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:42
|
133
|
+
msgid "Yes"
|
134
|
+
msgstr ""
|
135
|
+
|
136
|
+
#: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:43
|
137
|
+
msgid "No"
|
138
|
+
msgstr ""
|
139
|
+
|
140
|
+
#: ../webpack/components/PreupgradeReports/components/FixSelectedButton.js:12
|
141
|
+
msgid "Fix Selected"
|
142
|
+
msgstr ""
|
143
|
+
|
144
|
+
#: ../webpack/components/PreupgradeReports/components/NoReports.js:17
|
145
|
+
msgid "The preupgrade report will be available after the job finishes"
|
146
|
+
msgstr ""
|
147
|
+
|
148
|
+
#: ../webpack/components/PreupgradeReports/components/NoReports.js:25
|
149
|
+
msgid "No Preupgrade Report Available"
|
150
|
+
msgstr ""
|
151
|
+
|
152
|
+
#: ../webpack/components/PreupgradeReports/components/UpgradeAllButton.js:13
|
153
|
+
msgid "Run Upgrade"
|
154
|
+
msgstr ""
|
155
|
+
|
156
|
+
#:
|
157
|
+
#: ../webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js:17
|
158
|
+
msgid "This issue inhibits the upgrade."
|
159
|
+
msgstr ""
|
160
|
+
|
161
|
+
#:
|
162
|
+
#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:14
|
163
|
+
msgid "Has Remediation?"
|
164
|
+
msgstr ""
|
165
|
+
|
166
|
+
#:
|
167
|
+
#: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:15
|
168
|
+
msgid "Inhibitor?"
|
169
|
+
msgstr ""
|
170
|
+
|
171
|
+
#: gemspec.rb:4
|
172
|
+
msgid ""
|
173
|
+
"A foreman plugin to support inplace RHEL 7 -> RHEL 8 upgrades with Leapp utili"
|
174
|
+
"ty."
|
175
|
+
msgstr ""
|
@@ -11,7 +11,7 @@ module ForemanLeapp
|
|
11
11
|
FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
|
12
12
|
provider_type: 'SSH', name: 'Leapp preupgrade')
|
13
13
|
end
|
14
|
-
let(:job_invocation) { FactoryBot.create(:job_invocation
|
14
|
+
let(:job_invocation) { FactoryBot.create(:job_invocation) }
|
15
15
|
let(:template_invocation) do
|
16
16
|
FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
|
17
17
|
end
|
@@ -5,12 +5,12 @@ require 'test_plugin_helper'
|
|
5
5
|
module Helpers
|
6
6
|
class JobHelperTest < ActionView::TestCase
|
7
7
|
let(:helper) { ::Helpers::JobHelper }
|
8
|
-
|
8
|
+
|
9
9
|
let(:job_template) do
|
10
10
|
FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',
|
11
11
|
provider_type: 'SSH', name: 'Leapp preupgrade')
|
12
12
|
end
|
13
|
-
let(:job_invocation) { FactoryBot.create(:job_invocation
|
13
|
+
let(:job_invocation) { FactoryBot.create(:job_invocation) }
|
14
14
|
|
15
15
|
describe 'correct_feature?' do
|
16
16
|
setup do
|
@@ -18,17 +18,10 @@ module Helpers
|
|
18
18
|
FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
|
19
19
|
end
|
20
20
|
|
21
|
-
it 'correct
|
21
|
+
it 'correct feature' do
|
22
22
|
assert helper.correct_feature?(job_invocation, 'leapp_preupgrade')
|
23
23
|
end
|
24
24
|
|
25
|
-
it 'wrong category' do
|
26
|
-
job_invocation = FactoryBot.create(:job_invocation, job_category: 'NOPE')
|
27
|
-
FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
|
28
|
-
|
29
|
-
assert_not helper.correct_feature?(job_invocation, 'leapp_preupgrade')
|
30
|
-
end
|
31
|
-
|
32
25
|
it 'wrong feature' do
|
33
26
|
assert_not helper.correct_feature?(job_invocation, 'leapp_preupgrade2')
|
34
27
|
end
|
@@ -110,8 +110,8 @@ const PreupgradeReports = ({
|
|
110
110
|
);
|
111
111
|
};
|
112
112
|
|
113
|
-
const withLoadingState = Component =>
|
114
|
-
const { error, loading, preupgradeReports, reportsExpected } =
|
113
|
+
const withLoadingState = Component => componentProps => {
|
114
|
+
const { error, loading, preupgradeReports, reportsExpected } = componentProps;
|
115
115
|
|
116
116
|
if (!isEmpty(error)) {
|
117
117
|
return (
|
@@ -126,7 +126,7 @@ const withLoadingState = Component => props => {
|
|
126
126
|
return (
|
127
127
|
<LoadingState loading={loading}>
|
128
128
|
{preupgradeReports.length > 0 ? (
|
129
|
-
<Component {...
|
129
|
+
<Component {...componentProps} />
|
130
130
|
) : (
|
131
131
|
<NoReports reportsExpected={reportsExpected} />
|
132
132
|
)}
|
@@ -17,7 +17,7 @@ const EntriesFilter = ({
|
|
17
17
|
|
18
18
|
const filterTypes = [
|
19
19
|
{ value: 'title', label: __('Title') },
|
20
|
-
{ value: 'severity', label: __('
|
20
|
+
{ value: 'severity', label: __('Risk Factor') },
|
21
21
|
{ value: 'hostname', label: __('Host') },
|
22
22
|
{ value: 'fix', label: __('Fix Type') },
|
23
23
|
{ value: 'inhibitor', label: __('Inhibitor') },
|
@@ -3,22 +3,21 @@ import PropTypes from 'prop-types';
|
|
3
3
|
import { Button } from 'patternfly-react';
|
4
4
|
import { translate as __ } from 'foremanReact/common/I18n';
|
5
5
|
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
};
|
6
|
+
const UpgradeAllButton = ({ preupgradeReports, postUrl, csrfToken }) => (
|
7
|
+
<form action={postUrl} method="post">
|
8
|
+
<Button type="submit">{__('Run Upgrade')}</Button>
|
9
|
+
<input type="hidden" name="authenticity_token" value={csrfToken} />
|
10
|
+
<input type="hidden" name="feature" value="leapp_upgrade" />
|
11
|
+
{preupgradeReports.map(report => (
|
12
|
+
<input
|
13
|
+
type="hidden"
|
14
|
+
name="host_ids[]"
|
15
|
+
key={report.hostId}
|
16
|
+
value={report.hostId}
|
17
|
+
/>
|
18
|
+
))}
|
19
|
+
</form>
|
20
|
+
);
|
22
21
|
|
23
22
|
UpgradeAllButton.propTypes = {
|
24
23
|
preupgradeReports: PropTypes.array.isRequired,
|
data/webpack/components/PreupgradeReports/components/__snapshots__/EntriesFilter.test.js.snap
CHANGED
@@ -41,7 +41,7 @@ exports[`EntriresFilter should render for host filter 1`] = `
|
|
41
41
|
key="severity"
|
42
42
|
onClick={[Function]}
|
43
43
|
>
|
44
|
-
|
44
|
+
Risk Factor
|
45
45
|
</MenuItem>
|
46
46
|
<MenuItem
|
47
47
|
active={true}
|
@@ -112,7 +112,7 @@ exports[`EntriresFilter should render for severity filter 1`] = `
|
|
112
112
|
<DropdownButton
|
113
113
|
componentClass={[Function]}
|
114
114
|
id="entry-filter"
|
115
|
-
title="
|
115
|
+
title="Risk Factor"
|
116
116
|
>
|
117
117
|
<MenuItem
|
118
118
|
active={false}
|
@@ -134,7 +134,7 @@ exports[`EntriresFilter should render for severity filter 1`] = `
|
|
134
134
|
key="severity"
|
135
135
|
onClick={[Function]}
|
136
136
|
>
|
137
|
-
|
137
|
+
Risk Factor
|
138
138
|
</MenuItem>
|
139
139
|
<MenuItem
|
140
140
|
active={false}
|
@@ -277,7 +277,7 @@ exports[`EntriresFilter should render for title filter 1`] = `
|
|
277
277
|
key="severity"
|
278
278
|
onClick={[Function]}
|
279
279
|
>
|
280
|
-
|
280
|
+
Risk Factor
|
281
281
|
</MenuItem>
|
282
282
|
<MenuItem
|
283
283
|
active={false}
|
data/webpack/components/PreupgradeReports/components/__snapshots__/UpgradeAllButton.test.js.snap
CHANGED
@@ -25,5 +25,17 @@ exports[`UpgradeAllButton should render 1`] = `
|
|
25
25
|
type="hidden"
|
26
26
|
value="leapp_upgrade"
|
27
27
|
/>
|
28
|
+
<input
|
29
|
+
key="5"
|
30
|
+
name="host_ids[]"
|
31
|
+
type="hidden"
|
32
|
+
value={5}
|
33
|
+
/>
|
34
|
+
<input
|
35
|
+
key="6"
|
36
|
+
name="host_ids[]"
|
37
|
+
type="hidden"
|
38
|
+
value={6}
|
39
|
+
/>
|
28
40
|
</form>
|
29
41
|
`;
|
@@ -10,7 +10,7 @@ import SortableHeaderItem from './SortableHeaderItem';
|
|
10
10
|
const PreupgradeReportsListHeader = ({ sort, changeSort, toggleSelectAll }) => {
|
11
11
|
const additionalInfoColumns = [
|
12
12
|
{ label: __('Host'), value: 'hostname' },
|
13
|
-
{ label: __('
|
13
|
+
{ label: __('Risk Factor'), value: 'severity' },
|
14
14
|
{ label: __('Has Remediation?'), value: 'fix' },
|
15
15
|
{ label: __('Inhibitor?'), value: 'inhibitor' },
|
16
16
|
];
|
@@ -20,7 +20,7 @@ exports[`PreupgradeReportEntry should render 1`] = `
|
|
20
20
|
stacked={false}
|
21
21
|
>
|
22
22
|
<img
|
23
|
-
alt="Low
|
23
|
+
alt="Low Risk Factor"
|
24
24
|
className="severity-img"
|
25
25
|
src={[Function]}
|
26
26
|
/>
|
@@ -116,7 +116,7 @@ exports[`PreupgradeReportEntry should render 1`] = `
|
|
116
116
|
md={8}
|
117
117
|
>
|
118
118
|
<img
|
119
|
-
alt="Low
|
119
|
+
alt="Low Risk Factor"
|
120
120
|
className="severity-img"
|
121
121
|
key="5-7-sv5"
|
122
122
|
src={[Function]}
|
@@ -24,7 +24,7 @@ export const getSeverityImg = entry => {
|
|
24
24
|
<img
|
25
25
|
key={key}
|
26
26
|
src={SeverityLow}
|
27
|
-
alt="Low
|
27
|
+
alt="Low Risk Factor"
|
28
28
|
className="severity-img"
|
29
29
|
/>
|
30
30
|
);
|
@@ -33,7 +33,7 @@ export const getSeverityImg = entry => {
|
|
33
33
|
<img
|
34
34
|
key={key}
|
35
35
|
src={SeverityMedium}
|
36
|
-
alt="Medium
|
36
|
+
alt="Medium Risk Factor"
|
37
37
|
className="severity-img"
|
38
38
|
/>
|
39
39
|
);
|
@@ -42,7 +42,7 @@ export const getSeverityImg = entry => {
|
|
42
42
|
<img
|
43
43
|
key={key}
|
44
44
|
src={SeverityHigh}
|
45
|
-
alt="High
|
45
|
+
alt="High Risk Factor"
|
46
46
|
className="severity-img"
|
47
47
|
/>
|
48
48
|
);
|
@@ -51,7 +51,7 @@ export const getSeverityImg = entry => {
|
|
51
51
|
<img
|
52
52
|
key={key}
|
53
53
|
src={SeverityLow}
|
54
|
-
alt="Low
|
54
|
+
alt="Low Risk Factor"
|
55
55
|
className="severity-img"
|
56
56
|
/>
|
57
57
|
);
|
metadata
CHANGED
@@ -1,41 +1,47 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_leapp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Foreman Leapp team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-09-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: foreman_remote_execution
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: '3.2'
|
20
|
+
- - "<"
|
21
|
+
- !ruby/object:Gem::Version
|
22
|
+
version: '5.0'
|
20
23
|
type: :runtime
|
21
24
|
prerelease: false
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
23
26
|
requirements:
|
24
|
-
- - "
|
27
|
+
- - ">="
|
25
28
|
- !ruby/object:Gem::Version
|
26
29
|
version: '3.2'
|
30
|
+
- - "<"
|
31
|
+
- !ruby/object:Gem::Version
|
32
|
+
version: '5.0'
|
27
33
|
- !ruby/object:Gem::Dependency
|
28
34
|
name: foreman_ansible
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
30
36
|
requirements:
|
31
|
-
- - "
|
37
|
+
- - ">="
|
32
38
|
- !ruby/object:Gem::Version
|
33
39
|
version: '5.0'
|
34
40
|
type: :runtime
|
35
41
|
prerelease: false
|
36
42
|
version_requirements: !ruby/object:Gem::Requirement
|
37
43
|
requirements:
|
38
|
-
- - "
|
44
|
+
- - ">="
|
39
45
|
- !ruby/object:Gem::Version
|
40
46
|
version: '5.0'
|
41
47
|
- !ruby/object:Gem::Dependency
|
@@ -93,10 +99,10 @@ files:
|
|
93
99
|
- app/views/api/v2/preupgrade_reports/index.json.rabl
|
94
100
|
- app/views/api/v2/preupgrade_reports/job_invocation.json.rabl
|
95
101
|
- app/views/api/v2/preupgrade_reports/show.json.rabl
|
96
|
-
- app/views/foreman_leapp/job_templates/
|
97
|
-
- app/views/foreman_leapp/job_templates/
|
98
|
-
- app/views/foreman_leapp/job_templates/
|
99
|
-
- app/views/foreman_leapp/job_templates/
|
102
|
+
- app/views/foreman_leapp/job_templates/leapp_check.erb
|
103
|
+
- app/views/foreman_leapp/job_templates/leapp_preupgrade.erb
|
104
|
+
- app/views/foreman_leapp/job_templates/leapp_remediation.erb
|
105
|
+
- app/views/foreman_leapp/job_templates/leapp_upgrade.erb
|
100
106
|
- app/views/job_invocations/_leapp_preupgrade_report.html.erb
|
101
107
|
- app/views/preupgrade_report_entries/base.json.rabl
|
102
108
|
- app/views/preupgrade_reports/index.json.rabl
|
@@ -112,6 +118,7 @@ files:
|
|
112
118
|
- lib/foreman_leapp/version.rb
|
113
119
|
- lib/tasks/foreman_leapp_tasks.rake
|
114
120
|
- locale/Makefile
|
121
|
+
- locale/action_names.rb
|
115
122
|
- locale/en/foreman_leapp.po
|
116
123
|
- locale/foreman_leapp.pot
|
117
124
|
- locale/gemspec.rb
|