foreman_discovery 25.1.1 → 26.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/services/foreman_discovery/node_api/node_resource.rb +2 -2
- data/lib/foreman_discovery/engine.rb +2 -2
- data/lib/foreman_discovery/version.rb +1 -1
- data/test/unit/host_discovered_test.rb +1 -1
- data/webpack/__mocks__/foremanReact/components/common/EmptyState/DefaultEmptyState.js +2 -0
- data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js +8 -9
- metadata +3 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5b9b5d53b2dece6cbdde60133ed1e5c6bba608ca4f602f4f55e9314eeff5f50d
|
4
|
+
data.tar.gz: 277543a8e091865fae5eabf4c77c563b7905c1ecb4c61a207e5e4254a750eb6f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4d6a458d08fa9184583f85252bca8ae9e5af4a63fc4c8a062e2c7ba57f6cadbee604d6d4f4965863286e0e47e7bb8e592ae1a6cab52402f11f00ab05bddde698
|
7
|
+
data.tar.gz: 48fcf8bd684e224ae9c776151fb846d075254ebf240f07daf13a331bc2c30d342687bb36c4a530abcb45698a1434c6982e8a6a59ad7995708cfd7d89c6b72b18
|
@@ -18,7 +18,7 @@ module ForemanDiscovery::NodeAPI
|
|
18
18
|
|
19
19
|
@connect_params.merge!(
|
20
20
|
:ssl_client_cert => OpenSSL::X509::Certificate.new(File.read(cert)),
|
21
|
-
:ssl_client_key => OpenSSL::PKey
|
21
|
+
:ssl_client_key => OpenSSL::PKey.read(File.read(hostprivkey)),
|
22
22
|
:ssl_ca_file => ca_cert,
|
23
23
|
:verify_ssl => OpenSSL::SSL::VERIFY_PEER
|
24
24
|
)
|
@@ -82,7 +82,7 @@ module ForemanDiscovery::NodeAPI
|
|
82
82
|
def get(payload = {}, path = nil)
|
83
83
|
logger.debug("Image API GET #{url} (path=#{path}, payload=#{payload})")
|
84
84
|
if path
|
85
|
-
resource[
|
85
|
+
resource[CGI.escape(path)].get payload
|
86
86
|
else
|
87
87
|
resource.get payload
|
88
88
|
end
|
@@ -24,7 +24,7 @@ module ForemanDiscovery
|
|
24
24
|
initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
|
25
25
|
app.reloader.to_prepare do
|
26
26
|
Foreman::Plugin.register :foreman_discovery do
|
27
|
-
requires_foreman '>= 3.
|
27
|
+
requires_foreman '>= 3.15'
|
28
28
|
register_gettext
|
29
29
|
|
30
30
|
# settings
|
@@ -88,7 +88,7 @@ module ForemanDiscovery
|
|
88
88
|
setting "discovery_prefix",
|
89
89
|
type: :string,
|
90
90
|
default: "mac",
|
91
|
-
validate: { presence: true },
|
91
|
+
validate: { presence: true, format: { with: /\A[a-zA-Z]/, message: _("must start with a letter") } },
|
92
92
|
full_name: N_("Hostname prefix"),
|
93
93
|
description: N_("The default prefix to use for the host name, must start with a letter")
|
94
94
|
|
@@ -310,7 +310,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
|
|
310
310
|
|
311
311
|
test "provisioning a discovered host without saving it doesn't create a token" do
|
312
312
|
Setting[:token_duration] = 30 #enable tokens so that we only test the CR
|
313
|
-
Setting[:discovery_prefix] = '
|
313
|
+
Setting[:discovery_prefix] = 'test123'
|
314
314
|
host = discover_host_from_facts(@facts)
|
315
315
|
host.save
|
316
316
|
h = ::ForemanDiscovery::HostConverter.to_managed(host)
|
@@ -27,6 +27,7 @@ const DefaultEmptyState = props => {
|
|
27
27
|
component="a"
|
28
28
|
onClick={() => actionButtonClickHandler(action)}
|
29
29
|
variant="primary"
|
30
|
+
ouiaId="empty-state-primary-action-button"
|
30
31
|
>
|
31
32
|
{action.title}
|
32
33
|
</Button>
|
@@ -39,6 +40,7 @@ const DefaultEmptyState = props => {
|
|
39
40
|
key={`sec-button-${title}`}
|
40
41
|
onClick={() => actionButtonClickHandler({ url, onClick })}
|
41
42
|
variant="secondary"
|
43
|
+
ouiaId="empty-state-secondary-action-button"
|
42
44
|
>
|
43
45
|
{title}
|
44
46
|
</Button>
|
@@ -1,11 +1,12 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { Icon } from 'patternfly-react';
|
3
3
|
import {
|
4
|
-
Title,
|
5
4
|
EmptyState,
|
6
5
|
EmptyStateVariant,
|
7
6
|
EmptyStateBody,
|
8
|
-
|
7
|
+
EmptyStateActions,
|
8
|
+
EmptyStateHeader,
|
9
|
+
EmptyStateFooter,
|
9
10
|
} from '@patternfly/react-core';
|
10
11
|
import { emptyStatePatternPropTypes } from './EmptyStatePropTypes';
|
11
12
|
import { translate as __ } from '../../../common/I18n';
|
@@ -48,17 +49,15 @@ const EmptyStatePattern = props => {
|
|
48
49
|
{/* TODO: Add pf4 icons, Redmine issue: #30865 */}
|
49
50
|
<Icon name={icon} type={iconType} size="2x" />
|
50
51
|
</span>
|
51
|
-
<
|
52
|
-
{header}
|
53
|
-
</Title>
|
52
|
+
<EmptyStateHeader titleText={<>{header}</>} headingLevel="h5" />
|
54
53
|
<EmptyStateBody>
|
55
54
|
<div className="empty-state-description">{description}</div>
|
56
55
|
<DocumentationBlock />
|
57
56
|
</EmptyStateBody>
|
58
|
-
|
59
|
-
|
60
|
-
{secondaryActions}
|
61
|
-
</
|
57
|
+
<EmptyStateFooter>
|
58
|
+
{action}
|
59
|
+
<EmptyStateActions>{secondaryActions}</EmptyStateActions>
|
60
|
+
</EmptyStateFooter>
|
62
61
|
</EmptyState>
|
63
62
|
);
|
64
63
|
};
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_discovery
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 26.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Aditi Puntambekar
|
@@ -73,10 +73,9 @@ authors:
|
|
73
73
|
- Tom Caspy
|
74
74
|
- Tomer Brisker
|
75
75
|
- Yann Cézard
|
76
|
-
autorequire:
|
77
76
|
bindir: bin
|
78
77
|
cert_chain: []
|
79
|
-
date:
|
78
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
80
79
|
dependencies: []
|
81
80
|
description: MaaS Discovery Plugin engine for Foreman
|
82
81
|
email: gsutclif@redhat.com
|
@@ -313,7 +312,6 @@ homepage: https://github.com/theforeman/foreman_discovery
|
|
313
312
|
licenses:
|
314
313
|
- GPL-3.0
|
315
314
|
metadata: {}
|
316
|
-
post_install_message:
|
317
315
|
rdoc_options: []
|
318
316
|
require_paths:
|
319
317
|
- lib
|
@@ -328,8 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
328
326
|
- !ruby/object:Gem::Version
|
329
327
|
version: '0'
|
330
328
|
requirements: []
|
331
|
-
rubygems_version: 3.
|
332
|
-
signing_key:
|
329
|
+
rubygems_version: 3.6.9
|
333
330
|
specification_version: 4
|
334
331
|
summary: MaaS Discovery Plugin for Foreman
|
335
332
|
test_files:
|