hammer_cli_katello 0.23.1 → 1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/hammer_cli_katello.rb +20 -16
- data/lib/hammer_cli_katello/activation_key.rb +5 -5
- data/lib/hammer_cli_katello/capsule.rb +2 -3
- data/lib/hammer_cli_katello/command_extensions/lifecycle_environment.rb +10 -7
- data/lib/hammer_cli_katello/command_extensions/lifecycle_environments.rb +11 -8
- data/lib/hammer_cli_katello/content_credential.rb +20 -19
- data/lib/hammer_cli_katello/content_export.rb +73 -0
- data/lib/hammer_cli_katello/content_export_complete.rb +25 -0
- data/lib/hammer_cli_katello/content_export_helper.rb +181 -0
- data/lib/hammer_cli_katello/content_export_incremental.rb +25 -0
- data/lib/hammer_cli_katello/content_import.rb +63 -0
- data/lib/hammer_cli_katello/content_view.rb +19 -32
- data/lib/hammer_cli_katello/content_view_version.rb +4 -11
- data/lib/hammer_cli_katello/deb_package.rb +3 -3
- data/lib/hammer_cli_katello/erratum.rb +1 -1
- data/lib/hammer_cli_katello/erratum_info_command.rb +1 -1
- data/lib/hammer_cli_katello/file.rb +3 -3
- data/lib/hammer_cli_katello/filter.rb +2 -2
- data/lib/hammer_cli_katello/foreman_search_options_creators.rb +0 -12
- data/lib/hammer_cli_katello/host_collection.rb +2 -2
- data/lib/hammer_cli_katello/host_deb.rb +1 -1
- data/lib/hammer_cli_katello/host_errata.rb +1 -1
- data/lib/hammer_cli_katello/host_extensions.rb +5 -5
- data/lib/hammer_cli_katello/host_package.rb +1 -1
- data/lib/hammer_cli_katello/host_traces.rb +17 -0
- data/lib/hammer_cli_katello/hostgroup_extensions.rb +4 -4
- data/lib/hammer_cli_katello/id_resolver.rb +5 -6
- data/lib/hammer_cli_katello/lifecycle_environment.rb +2 -2
- data/lib/hammer_cli_katello/module_stream.rb +8 -8
- data/lib/hammer_cli_katello/organization_options.rb +8 -6
- data/lib/hammer_cli_katello/ostree_branch.rb +2 -2
- data/lib/hammer_cli_katello/package.rb +5 -5
- data/lib/hammer_cli_katello/package_group.rb +4 -4
- data/lib/hammer_cli_katello/ping.rb +2 -9
- data/lib/hammer_cli_katello/product.rb +3 -3
- data/lib/hammer_cli_katello/product_content.rb +2 -2
- data/lib/hammer_cli_katello/repository.rb +6 -37
- data/lib/hammer_cli_katello/repository_set.rb +4 -4
- data/lib/hammer_cli_katello/simple_content_access.rb +40 -0
- data/lib/hammer_cli_katello/srpm.rb +2 -2
- data/lib/hammer_cli_katello/subscription.rb +2 -3
- data/lib/hammer_cli_katello/sync_plan.rb +2 -2
- data/lib/hammer_cli_katello/version.rb +1 -1
- data/test/data/3.18/foreman_api.json +1 -0
- data/test/data/3.19/foreman_api.json +1 -0
- data/test/data/4.0/foreman_api.json +1 -0
- data/test/functional/capsule/content/info_test.rb +1 -2
- data/test/functional/content_credentials/create_test.rb +32 -0
- data/test/functional/{repository → content_credentials}/data/test_cert.json +0 -0
- data/test/functional/content_credentials/list_test.rb +6 -8
- data/test/functional/content_export/complete/library_test.rb +155 -0
- data/test/functional/content_export/complete/version_test.rb +217 -0
- data/test/functional/content_export/content_export_helpers.rb +26 -0
- data/test/functional/content_export/generate_metadata_test.rb +64 -0
- data/test/functional/content_export/incremental/library_test.rb +172 -0
- data/test/functional/content_export/incremental/version_test.rb +268 -0
- data/test/functional/content_export/list_test.rb +64 -0
- data/test/functional/content_import/library_test.rb +85 -0
- data/test/functional/content_import/metadata.json +1 -0
- data/test/functional/content_import/version_test.rb +85 -0
- data/test/functional/content_view/content_view_helpers.rb +3 -1
- data/test/functional/content_view/list_test.rb +0 -2
- data/test/functional/content_view/publish_test.rb +0 -21
- data/test/functional/content_view/version/promote_test.rb +1 -2
- data/test/functional/content_view/version/republish_repositories_test.rb +1 -2
- data/test/functional/host/errata/apply_test.rb +0 -2
- data/test/functional/host/errata/recalculate_test.rb +0 -2
- data/test/functional/host/extensions/update_test.rb +0 -1
- data/test/functional/host/traces/resolve_test.rb +31 -0
- data/test/functional/lifecycle_environment/lifecycle_environment_helpers.rb +1 -1
- data/test/functional/ping_test.rb +1 -2
- data/test/functional/repository/create_test.rb +0 -30
- data/test/functional/repository/info_test.rb +4 -4
- data/test/functional/repository/list_test.rb +0 -2
- data/test/functional/search_helpers.rb +11 -0
- data/test/functional/simple_content_access/disable_test.rb +48 -0
- data/test/functional/simple_content_access/enable_test.rb +46 -0
- data/test/test_helper.rb +1 -1
- metadata +45 -18
- data/lib/hammer_cli_katello/content_view_puppet_module.rb +0 -60
- data/lib/hammer_cli_katello/gpg_key.rb +0 -67
- data/lib/hammer_cli_katello/puppet_module.rb +0 -59
- data/test/functional/content_view/puppet_module/add_test.rb +0 -24
- data/test/functional/content_view/puppet_module/remove_test.rb +0 -54
- data/test/functional/gpg_test.rb +0 -39
- data/test/functional/repository/data/test_ca.json +0 -43
- data/test/functional/repository/data/test_key.json +0 -43
@@ -14,6 +14,23 @@ module HammerCLIKatello
|
|
14
14
|
end
|
15
15
|
build_options
|
16
16
|
end
|
17
|
+
|
18
|
+
class ResolveCommand < HammerCLIKatello::SingleResourceCommand
|
19
|
+
include HammerCLIForemanTasks::Async
|
20
|
+
resource :host_tracer, :resolve
|
21
|
+
command_name "resolve"
|
22
|
+
|
23
|
+
success_message _("Traces are being resolved with task %{id}.")
|
24
|
+
failure_message _("Could not resolve traces")
|
25
|
+
|
26
|
+
validate_options do
|
27
|
+
option(:option_trace_ids).required
|
28
|
+
option(:option_host_id).required
|
29
|
+
end
|
30
|
+
|
31
|
+
build_options
|
32
|
+
end
|
33
|
+
|
17
34
|
autoload_subcommands
|
18
35
|
end
|
19
36
|
end
|
@@ -45,22 +45,22 @@ module HammerCLIKatello
|
|
45
45
|
::HammerCLIForeman::Hostgroup::InfoCommand.instance_eval do
|
46
46
|
output do
|
47
47
|
label _("Content View") do
|
48
|
-
field :content_view_id, _("
|
48
|
+
field :content_view_id, _("Id")
|
49
49
|
field :content_view_name, _("Name")
|
50
50
|
end
|
51
51
|
|
52
52
|
label _("Lifecycle Environment") do
|
53
|
-
field :lifecycle_environment_id, _("
|
53
|
+
field :lifecycle_environment_id, _("Id")
|
54
54
|
field :lifecycle_environment_name, _("Name")
|
55
55
|
end
|
56
56
|
|
57
57
|
label _("Content Source") do
|
58
|
-
field :content_source_id, _("
|
58
|
+
field :content_source_id, _("Id")
|
59
59
|
field :content_source_name, _("Name")
|
60
60
|
end
|
61
61
|
|
62
62
|
label _("Kickstart Repository") do
|
63
|
-
field :kickstart_repository_id, _("
|
63
|
+
field :kickstart_repository_id, _("Id")
|
64
64
|
field :kickstart_repository_name, _("Name")
|
65
65
|
end
|
66
66
|
end
|
@@ -28,11 +28,6 @@ module HammerCLIKatello
|
|
28
28
|
:subscription => [s_name(_("Subscription name to search by"))],
|
29
29
|
:sync_plan => [s_name(_("Sync plan name to search by"))],
|
30
30
|
:task => [s_name(_("Task name to search by"))],
|
31
|
-
:content_view_puppet_module => [
|
32
|
-
s_name(_("Puppet module name to search by")),
|
33
|
-
s("author", _("Puppet module's author to search by")),
|
34
|
-
s("uuid", _("Puppet module's UUID to search by"))
|
35
|
-
],
|
36
31
|
:content_view_version => [s("version", _("Content view version number"))]
|
37
32
|
}.freeze
|
38
33
|
|
@@ -117,6 +112,7 @@ module HammerCLIKatello
|
|
117
112
|
end
|
118
113
|
end
|
119
114
|
|
115
|
+
# rubocop:disable Style/EmptyElse
|
120
116
|
def content_view_version_id(options)
|
121
117
|
key_id = HammerCLI.option_accessor_name("id")
|
122
118
|
key_content_view_id = HammerCLI.option_accessor_name("content_view_id")
|
@@ -129,6 +125,8 @@ module HammerCLIKatello
|
|
129
125
|
results = find_resources(:content_view_versions, options)
|
130
126
|
options[from_environment_id] ||= from_lifecycle_environment_id(options)
|
131
127
|
|
128
|
+
return pick_result(results, @api.resource(:content_view_versions))['id'] if results.size == 1
|
129
|
+
|
132
130
|
if results.size > 1 && options[from_environment_id]
|
133
131
|
results_in_from_environment = results.select do |version|
|
134
132
|
member_of_environment_ids = version['environments'].map { |env| env['id'].to_s }
|
@@ -137,9 +135,10 @@ module HammerCLIKatello
|
|
137
135
|
results_in_from_environment
|
138
136
|
.sort { |a, b| a['version'].to_f <=> b['version'].to_f }.last['id']
|
139
137
|
else
|
140
|
-
|
138
|
+
nil
|
141
139
|
end
|
142
140
|
end
|
141
|
+
# rubocop:enable Style/EmptyElse
|
143
142
|
|
144
143
|
private
|
145
144
|
|
@@ -29,7 +29,7 @@ module HammerCLIKatello
|
|
29
29
|
|
30
30
|
class ListCommand < HammerCLIKatello::ListCommand
|
31
31
|
output do
|
32
|
-
field :id, _("
|
32
|
+
field :id, _("Id")
|
33
33
|
field :name, _("Name")
|
34
34
|
from :prior do
|
35
35
|
field :name, _("Prior")
|
@@ -57,7 +57,7 @@ module HammerCLIKatello
|
|
57
57
|
|
58
58
|
class InfoCommand < HammerCLIKatello::InfoCommand
|
59
59
|
output do
|
60
|
-
field :id, _("
|
60
|
+
field :id, _("Id")
|
61
61
|
field :name, _("Name")
|
62
62
|
field :label, _("Label")
|
63
63
|
field :description, _("Description")
|
@@ -10,10 +10,10 @@ module HammerCLIKatello
|
|
10
10
|
validate_repo_name_requires_product_options(:option_repository_name)
|
11
11
|
|
12
12
|
output do
|
13
|
-
field :id, _("
|
13
|
+
field :id, _("Id")
|
14
14
|
field :name, _("Module Stream Name")
|
15
15
|
field :stream, _("Stream")
|
16
|
-
field :uuid, _("
|
16
|
+
field :uuid, _("Uuid")
|
17
17
|
field :version, _("Version")
|
18
18
|
field :arch, _("Architecture")
|
19
19
|
field :context, _("Context")
|
@@ -30,30 +30,30 @@ module HammerCLIKatello
|
|
30
30
|
validate_repo_name_requires_product_options(:option_repository_name)
|
31
31
|
|
32
32
|
output do
|
33
|
-
field :id, _("
|
33
|
+
field :id, _("Id")
|
34
34
|
field :name, _("Module Stream Name")
|
35
35
|
field :stream, _("Stream")
|
36
|
-
field :uuid, _("
|
36
|
+
field :uuid, _("Uuid")
|
37
37
|
field :version, _("Version")
|
38
38
|
field :arch, _("Architecture")
|
39
39
|
field :context, _("Context")
|
40
40
|
|
41
41
|
collection :repositories, _("Repositories") do
|
42
|
-
field :id, _("
|
42
|
+
field :id, _("Id")
|
43
43
|
field :name, _("Name")
|
44
44
|
field :label, _("Label")
|
45
45
|
end
|
46
46
|
|
47
47
|
collection :artifacts, _("Artifacts") do
|
48
|
-
field :id, _("
|
48
|
+
field :id, _("Id")
|
49
49
|
field :name, _("Name")
|
50
50
|
end
|
51
51
|
|
52
52
|
collection :profiles, _("Profiles") do
|
53
|
-
field :id, _("
|
53
|
+
field :id, _("Id")
|
54
54
|
field :name, _("Name")
|
55
55
|
collection :rpms, _("RPMs") do
|
56
|
-
field :id, _("
|
56
|
+
field :id, _("Id")
|
57
57
|
field :name, _("Name")
|
58
58
|
end
|
59
59
|
end
|
@@ -1,12 +1,14 @@
|
|
1
1
|
module HammerCLIKatello
|
2
2
|
module OrganizationOptions
|
3
3
|
def self.included(base)
|
4
|
-
base.
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
4
|
+
base.option_family do
|
5
|
+
parent '--organization-id', 'ORGANIZATION_ID',
|
6
|
+
_('Organization ID to search by'), attribute_name: :option_organization_id
|
7
|
+
child '--organization', 'ORGANIZATION_NAME',
|
8
|
+
_('Organization name to search by'), attribute_name: :option_organization_name
|
9
|
+
child '--organization-label', 'ORGANIZATION_LABEL',
|
10
|
+
_('Organization label to search by'), attribute_name: :option_organization_label
|
11
|
+
end
|
10
12
|
end
|
11
13
|
|
12
14
|
def org_options
|
@@ -8,7 +8,7 @@ module HammerCLIKatello
|
|
8
8
|
validate_repo_name_requires_product_options(:option_repository_name)
|
9
9
|
|
10
10
|
output do
|
11
|
-
field :id, _("
|
11
|
+
field :id, _("Id")
|
12
12
|
field :name, _("Name")
|
13
13
|
field :version, _("version")
|
14
14
|
end
|
@@ -20,7 +20,7 @@ module HammerCLIKatello
|
|
20
20
|
|
21
21
|
class InfoCommand < HammerCLIKatello::InfoCommand
|
22
22
|
output do
|
23
|
-
field :id, _("
|
23
|
+
field :id, _("Id")
|
24
24
|
field :name, _("Name")
|
25
25
|
field :version, _("Version")
|
26
26
|
field :commit, _("Commit")
|
@@ -7,7 +7,7 @@ module HammerCLIKatello
|
|
7
7
|
include LifecycleEnvironmentNameMapping
|
8
8
|
|
9
9
|
output do
|
10
|
-
field :id, _("
|
10
|
+
field :id, _("Id")
|
11
11
|
field :filename, _("Filename")
|
12
12
|
field :sourcerpm, _("Source RPM")
|
13
13
|
end
|
@@ -44,9 +44,9 @@ module HammerCLIKatello
|
|
44
44
|
|
45
45
|
class InfoCommand < HammerCLIKatello::InfoCommand
|
46
46
|
output do
|
47
|
-
field :id, _("
|
47
|
+
field :id, _("Id")
|
48
48
|
field :pulp_id, _("Pulp ID")
|
49
|
-
field :uuid, _("
|
49
|
+
field :uuid, _("Uuid")
|
50
50
|
field :name, _("Name")
|
51
51
|
field :version, _("Version")
|
52
52
|
field :arch, _("Architecture")
|
@@ -55,7 +55,7 @@ module HammerCLIKatello
|
|
55
55
|
field :author, _("Author")
|
56
56
|
field :filename, _("Filename")
|
57
57
|
field :sourcerpm, _("Source rpm")
|
58
|
-
field :nvrea, _("
|
58
|
+
field :nvrea, _("Nvrea")
|
59
59
|
field :buildhost, _("Build Host")
|
60
60
|
field :hosts_available_count, _("Available Host Count")
|
61
61
|
field :hosts_applicable_count, _("Applicable Host Count")
|
@@ -65,7 +65,7 @@ module HammerCLIKatello
|
|
65
65
|
field :relativepath, _("Relative Path")
|
66
66
|
field :description, _("Description")
|
67
67
|
field :summary, _("Summary")
|
68
|
-
field :url, _("
|
68
|
+
field :url, _("Url")
|
69
69
|
field :build_time, _("Build Time")
|
70
70
|
field :group, _("Group")
|
71
71
|
field :requires, _("Requires")
|
@@ -8,10 +8,10 @@ module HammerCLIKatello
|
|
8
8
|
validate_repo_name_requires_product_options(:option_repository_name)
|
9
9
|
|
10
10
|
output do
|
11
|
-
field :id, _("
|
11
|
+
field :id, _("Id")
|
12
12
|
field :name, _("Package Group Name")
|
13
13
|
field :repo_name, _("Repository Name")
|
14
|
-
field :uuid, _("
|
14
|
+
field :uuid, _("Uuid")
|
15
15
|
end
|
16
16
|
|
17
17
|
def extend_data(data)
|
@@ -26,10 +26,10 @@ module HammerCLIKatello
|
|
26
26
|
|
27
27
|
class InfoCommand < HammerCLIKatello::InfoCommand
|
28
28
|
output do
|
29
|
-
field :id, _("
|
29
|
+
field :id, _("Id")
|
30
30
|
field :name, _("Package Group Name")
|
31
31
|
field :repo_name, _("Repository Name")
|
32
|
-
field :uuid, _("
|
32
|
+
field :uuid, _("Uuid")
|
33
33
|
field :description, _("Description")
|
34
34
|
field :default_package_names, _("Default Packages"), Fields::List
|
35
35
|
field :mandatory_package_names, _("Mandatory Packages"), Fields::List
|
@@ -36,15 +36,8 @@ module HammerCLIKatello
|
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
39
|
-
label "
|
40
|
-
from "
|
41
|
-
field "status", _("Status")
|
42
|
-
field "_response", _("Server Response")
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
label "pulp_auth", :hide_blank => true do
|
47
|
-
from "pulp_auth" do
|
39
|
+
label "pulp3", :hide_blank => true do
|
40
|
+
from "pulp3" do
|
48
41
|
field "status", _("Status"), Fields::Field, :hide_blank => true
|
49
42
|
field "_response", _("Server Response"), Fields::Field, :hide_blank => true
|
50
43
|
end
|
@@ -4,7 +4,7 @@ module HammerCLIKatello
|
|
4
4
|
|
5
5
|
class ListCommand < HammerCLIKatello::ListCommand
|
6
6
|
output do
|
7
|
-
field :id, _("
|
7
|
+
field :id, _("Id")
|
8
8
|
field :name, _("Name")
|
9
9
|
field :description, _("Description")
|
10
10
|
|
@@ -28,7 +28,7 @@ module HammerCLIKatello
|
|
28
28
|
|
29
29
|
class InfoCommand < HammerCLIKatello::InfoCommand
|
30
30
|
output do
|
31
|
-
field :id, _("
|
31
|
+
field :id, _("Id")
|
32
32
|
field :name, _("Name")
|
33
33
|
field :label, _("Label")
|
34
34
|
field :description, _("Description")
|
@@ -61,7 +61,7 @@ module HammerCLIKatello
|
|
61
61
|
collection :product_content, _("Content") do
|
62
62
|
from :content do
|
63
63
|
field :name, _("Repo Name")
|
64
|
-
field :contentUrl, _("
|
64
|
+
field :contentUrl, _("Url")
|
65
65
|
field :type, _("Content Type")
|
66
66
|
end
|
67
67
|
end
|
@@ -7,10 +7,10 @@ module HammerCLIKatello
|
|
7
7
|
|
8
8
|
output do
|
9
9
|
from :content do
|
10
|
-
field :id, _("
|
10
|
+
field :id, _("Id")
|
11
11
|
field :name, _("Name")
|
12
12
|
field :type, _("Type")
|
13
|
-
field :contentUrl, _("
|
13
|
+
field :contentUrl, _("Url")
|
14
14
|
field :gpgUrl, _("GPG Key")
|
15
15
|
field :label, _("Label")
|
16
16
|
end
|
@@ -12,7 +12,7 @@ module HammerCLIKatello
|
|
12
12
|
field :name, _("Product")
|
13
13
|
end
|
14
14
|
field :content_type, _("Content Type")
|
15
|
-
field :url, _("
|
15
|
+
field :url, _("Url")
|
16
16
|
end
|
17
17
|
|
18
18
|
build_options
|
@@ -27,7 +27,7 @@ module HammerCLIKatello
|
|
27
27
|
validate_repo_name_requires_product_options
|
28
28
|
|
29
29
|
output do
|
30
|
-
field :id, _("
|
30
|
+
field :id, _("Id")
|
31
31
|
field :name, _("Name")
|
32
32
|
field :label, _("Label")
|
33
33
|
field :description, _("Description")
|
@@ -38,7 +38,7 @@ module HammerCLIKatello
|
|
38
38
|
field :content_type, _("Content Type")
|
39
39
|
field :checksum_type, _("Checksum Type"), Fields::Field, :hide_blank => true
|
40
40
|
field :_mirror_on_sync, _("Mirror on Sync")
|
41
|
-
field :url, _("
|
41
|
+
field :url, _("Url")
|
42
42
|
field :_publish_via_http, _("Publish Via HTTP")
|
43
43
|
field :full_path, _("Published At")
|
44
44
|
field :relative_path, _("Relative Path")
|
@@ -57,7 +57,7 @@ module HammerCLIKatello
|
|
57
57
|
|
58
58
|
label _("HTTP Proxy") do
|
59
59
|
from :http_proxy do
|
60
|
-
field :id, _("
|
60
|
+
field :id, _("Id"), Fields::Field, :hide_blank => true
|
61
61
|
field :name, _("Name"), Fields::Field, :hide_blank => true
|
62
62
|
field :policy, _("HTTP Proxy Policy"), Fields::Field, :hide_blank => true
|
63
63
|
end
|
@@ -65,14 +65,14 @@ module HammerCLIKatello
|
|
65
65
|
|
66
66
|
label _("Product") do
|
67
67
|
from :product do
|
68
|
-
field :id, _("
|
68
|
+
field :id, _("Id")
|
69
69
|
field :name, _("Name")
|
70
70
|
end
|
71
71
|
end
|
72
72
|
|
73
73
|
label _("GPG Key") do
|
74
74
|
from :gpg_key do
|
75
|
-
field :id, _("
|
75
|
+
field :id, _("Id"), Fields::Field, :hide_blank => true
|
76
76
|
field :name, _("Name"), Fields::Field, :hide_blank => true
|
77
77
|
end
|
78
78
|
end
|
@@ -90,7 +90,6 @@ module HammerCLIKatello
|
|
90
90
|
field :srpm_total, _("Source RPMS"), Fields::Field, :hide_blank => true
|
91
91
|
field :package_group_total, _("Package Groups"), Fields::Field, :hide_blank => true
|
92
92
|
field :errata_total, _("Errata"), Fields::Field, :hide_blank => true
|
93
|
-
field :puppet_total, _("Puppet Modules"), Fields::Field, :hide_blank => true
|
94
93
|
field :docker_manifest_list_total, _("Container Image Manifest Lists"),
|
95
94
|
Fields::Field, :hide_blank => true
|
96
95
|
field :docker_manifest_total, _("Container Image Manifests"), Fields::Field,
|
@@ -145,8 +144,6 @@ module HammerCLIKatello
|
|
145
144
|
data["docker_manifest_list_total"] = content_counts["docker_manifest_list"]
|
146
145
|
data["docker_manifest_total"] = content_counts["docker_manifest"]
|
147
146
|
data["docker_tag_total"] = content_counts["docker_tag"]
|
148
|
-
when "puppet"
|
149
|
-
data["puppet_total"] = content_counts["puppet_module"]
|
150
147
|
when "ostree"
|
151
148
|
setup_ostree(data)
|
152
149
|
when "file"
|
@@ -202,35 +199,7 @@ module HammerCLIKatello
|
|
202
199
|
:attribute_name => :option_unprotected,
|
203
200
|
:format => HammerCLI::Options::Normalizers::Bool.new
|
204
201
|
|
205
|
-
option "--ssl-client-cert", "SSL_CLIENT_CERT",
|
206
|
-
_("Name of content credential containing client certificate"),
|
207
|
-
:attribute_name => :option_ssl_client_cert
|
208
|
-
|
209
|
-
option "--ssl-client-key", "SSL_CLIENT_KEY",
|
210
|
-
_("Name of content credential containing client key"),
|
211
|
-
:attribute_name => :option_ssl_client_key
|
212
|
-
|
213
|
-
option "--ssl-ca-cert", "SSL_CA_CERT",
|
214
|
-
_("Name of content credential containing CA certificate"),
|
215
|
-
:attribute_name => :option_ssl_ca_cert
|
216
|
-
|
217
202
|
build_options :without => [:unprotected]
|
218
|
-
|
219
|
-
def request_params
|
220
|
-
params = super
|
221
|
-
|
222
|
-
params["ssl_client_cert_id"] ||= get_gpg_key_id("ssl_client_cert") if option_ssl_client_cert
|
223
|
-
params["ssl_client_key_id"] ||= get_gpg_key_id("ssl_client_key") if option_ssl_client_key
|
224
|
-
params["ssl_ca_cert_id"] ||= get_gpg_key_id("ssl_ca_cert") if option_ssl_ca_cert
|
225
|
-
|
226
|
-
params
|
227
|
-
end
|
228
|
-
|
229
|
-
def get_gpg_key_id(ssl_type)
|
230
|
-
options_clone = options.clone
|
231
|
-
options_clone["option_gpg_key_name"] = self.send("option_#{ssl_type}")
|
232
|
-
resolver.gpg_key_id(resolver.scoped_options("gpg_key", options_clone))
|
233
|
-
end
|
234
203
|
end
|
235
204
|
|
236
205
|
class UpdateCommand < HammerCLIKatello::UpdateCommand
|
@@ -18,7 +18,7 @@ module HammerCLIKatello
|
|
18
18
|
resource :repository_sets, :index
|
19
19
|
|
20
20
|
output do
|
21
|
-
field :id, _("
|
21
|
+
field :id, _("Id")
|
22
22
|
field :type, _("Type")
|
23
23
|
field :name, _("Name"), nil, :max_width => 300
|
24
24
|
end
|
@@ -37,15 +37,15 @@ module HammerCLIKatello
|
|
37
37
|
extend Validations
|
38
38
|
|
39
39
|
output do
|
40
|
-
field :id, _("
|
40
|
+
field :id, _("Id")
|
41
41
|
field :name, _("Name")
|
42
42
|
field :type, _("Type")
|
43
|
-
field :contentUrl, _("
|
43
|
+
field :contentUrl, _("Url")
|
44
44
|
field :gpgUrl, _("GPG Key")
|
45
45
|
field :label, _("Label")
|
46
46
|
|
47
47
|
collection :repositories, _("Enabled Repositories") do
|
48
|
-
field :id, _("
|
48
|
+
field :id, _("Id")
|
49
49
|
field :name, _("Name")
|
50
50
|
end
|
51
51
|
end
|