hammer_cli_katello 0.24.3 → 1.1.1
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 +11 -15
- 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 +1 -0
- data/lib/hammer_cli_katello/content_export_helper.rb +1 -1
- data/lib/hammer_cli_katello/content_import.rb +16 -1
- data/lib/hammer_cli_katello/content_view.rb +16 -31
- data/lib/hammer_cli_katello/content_view_version.rb +4 -272
- data/lib/hammer_cli_katello/deb_package.rb +3 -3
- data/lib/hammer_cli_katello/docker.rb +13 -0
- data/lib/hammer_cli_katello/docker_manifest.rb +53 -0
- data/lib/hammer_cli_katello/docker_tag.rb +40 -0
- 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/hostgroup_extensions.rb +4 -4
- data/lib/hammer_cli_katello/id_resolver.rb +3 -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.rb +10 -0
- 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 +13 -19
- 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 +27 -37
- data/lib/hammer_cli_katello/repository_set.rb +4 -4
- data/lib/hammer_cli_katello/simple_content_access.rb +42 -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/locale/hammer-cli-katello.pot +0 -25
- data/test/data/3.18/foreman_api.json +1 -1
- data/test/data/3.19/foreman_api.json +1 -0
- data/test/data/4.0/foreman_api.json +1 -0
- data/test/data/4.1/foreman_api.json +1 -0
- data/test/functional/activation_key/subscriptions_test.rb +5 -2
- 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/version_test.rb +35 -0
- data/test/functional/content_export/list_test.rb +9 -9
- data/test/functional/content_import/list_test.rb +65 -0
- data/test/functional/content_import/version_test.rb +6 -6
- 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/organization/info_test.rb +22 -0
- data/test/functional/ping_test.rb +52 -15
- 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/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 +25 -53
- data/lib/hammer_cli_katello/content_view_puppet_module.rb +0 -60
- data/lib/hammer_cli_katello/cv_import_export_helper.rb +0 -166
- 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/content_view/version/default_export_test.rb +0 -40
- data/test/functional/content_view/version/export_test.rb +0 -136
- data/test/functional/content_view/version/import_test.rb +0 -318
- 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
@@ -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
|
@@ -6,6 +6,14 @@ module HammerCLIKatello
|
|
6
6
|
|
7
7
|
output do
|
8
8
|
from "services" do
|
9
|
+
label "katello_agent", hide_blank: true do
|
10
|
+
from "katello_agent" do
|
11
|
+
field "status", _("Status"), Fields::Field, hide_blank: true
|
12
|
+
field "message", _("message"), Fields::Field, hide_blank: true
|
13
|
+
field "_response", _("Server Response"), Fields::Field, hide_blank: true
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
9
17
|
label "candlepin" do
|
10
18
|
from "candlepin" do
|
11
19
|
field "status", _("Status")
|
@@ -13,17 +21,17 @@ module HammerCLIKatello
|
|
13
21
|
end
|
14
22
|
end
|
15
23
|
|
16
|
-
label "
|
17
|
-
from "
|
24
|
+
label "candlepin_auth" do
|
25
|
+
from "candlepin_auth" do
|
18
26
|
field "status", _("Status")
|
19
|
-
field "message", _("message")
|
20
27
|
field "_response", _("Server Response")
|
21
28
|
end
|
22
29
|
end
|
23
30
|
|
24
|
-
label "
|
25
|
-
from "
|
31
|
+
label "candlepin_events" do
|
32
|
+
from "candlepin_events" do
|
26
33
|
field "status", _("Status")
|
34
|
+
field "message", _("message")
|
27
35
|
field "_response", _("Server Response")
|
28
36
|
end
|
29
37
|
end
|
@@ -36,20 +44,6 @@ module HammerCLIKatello
|
|
36
44
|
end
|
37
45
|
end
|
38
46
|
|
39
|
-
label "pulp", :hide_blank => true do
|
40
|
-
from "pulp" do
|
41
|
-
field "status", _("Status"), Fields::Field, :hide_blank => true
|
42
|
-
field "_response", _("Server Response"), Fields::Field, :hide_blank => true
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
label "pulp_auth", :hide_blank => true do
|
47
|
-
from "pulp_auth" do
|
48
|
-
field "status", _("Status"), Fields::Field, :hide_blank => true
|
49
|
-
field "_response", _("Server Response"), Fields::Field, :hide_blank => true
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
47
|
label "pulp3", :hide_blank => true do
|
54
48
|
from "pulp3" do
|
55
49
|
field "status", _("Status"), Fields::Field, :hide_blank => true
|
@@ -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
|
@@ -2,6 +2,25 @@ module HammerCLIKatello
|
|
2
2
|
class Repository < HammerCLIKatello::Command
|
3
3
|
resource :repositories
|
4
4
|
|
5
|
+
module AnsibleCollectionRequirementsHelper
|
6
|
+
def self.included(base)
|
7
|
+
base.option "--ansible-collection-requirements-file",
|
8
|
+
"REQUIREMENTS_FILE", _("Location of the ansible collections "\
|
9
|
+
"requirements.yml file. "),
|
10
|
+
:attribute_name => :option_ansible_collection_requirements_file,
|
11
|
+
:required => false
|
12
|
+
end
|
13
|
+
|
14
|
+
def request_params
|
15
|
+
super.tap do |opts|
|
16
|
+
requirements_file = option_ansible_collection_requirements_file
|
17
|
+
if requirements_file
|
18
|
+
opts["ansible_collection_requirements"] = File.read(requirements_file)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
5
24
|
class ListCommand < HammerCLIKatello::ListCommand
|
6
25
|
include LifecycleEnvironmentNameMapping
|
7
26
|
|
@@ -12,7 +31,7 @@ module HammerCLIKatello
|
|
12
31
|
field :name, _("Product")
|
13
32
|
end
|
14
33
|
field :content_type, _("Content Type")
|
15
|
-
field :url, _("
|
34
|
+
field :url, _("Url")
|
16
35
|
end
|
17
36
|
|
18
37
|
build_options
|
@@ -27,7 +46,7 @@ module HammerCLIKatello
|
|
27
46
|
validate_repo_name_requires_product_options
|
28
47
|
|
29
48
|
output do
|
30
|
-
field :id, _("
|
49
|
+
field :id, _("Id")
|
31
50
|
field :name, _("Name")
|
32
51
|
field :label, _("Label")
|
33
52
|
field :description, _("Description")
|
@@ -38,7 +57,7 @@ module HammerCLIKatello
|
|
38
57
|
field :content_type, _("Content Type")
|
39
58
|
field :checksum_type, _("Checksum Type"), Fields::Field, :hide_blank => true
|
40
59
|
field :_mirror_on_sync, _("Mirror on Sync")
|
41
|
-
field :url, _("
|
60
|
+
field :url, _("Url")
|
42
61
|
field :_publish_via_http, _("Publish Via HTTP")
|
43
62
|
field :full_path, _("Published At")
|
44
63
|
field :relative_path, _("Relative Path")
|
@@ -57,7 +76,7 @@ module HammerCLIKatello
|
|
57
76
|
|
58
77
|
label _("HTTP Proxy") do
|
59
78
|
from :http_proxy do
|
60
|
-
field :id, _("
|
79
|
+
field :id, _("Id"), Fields::Field, :hide_blank => true
|
61
80
|
field :name, _("Name"), Fields::Field, :hide_blank => true
|
62
81
|
field :policy, _("HTTP Proxy Policy"), Fields::Field, :hide_blank => true
|
63
82
|
end
|
@@ -65,14 +84,14 @@ module HammerCLIKatello
|
|
65
84
|
|
66
85
|
label _("Product") do
|
67
86
|
from :product do
|
68
|
-
field :id, _("
|
87
|
+
field :id, _("Id")
|
69
88
|
field :name, _("Name")
|
70
89
|
end
|
71
90
|
end
|
72
91
|
|
73
92
|
label _("GPG Key") do
|
74
93
|
from :gpg_key do
|
75
|
-
field :id, _("
|
94
|
+
field :id, _("Id"), Fields::Field, :hide_blank => true
|
76
95
|
field :name, _("Name"), Fields::Field, :hide_blank => true
|
77
96
|
end
|
78
97
|
end
|
@@ -90,7 +109,6 @@ module HammerCLIKatello
|
|
90
109
|
field :srpm_total, _("Source RPMS"), Fields::Field, :hide_blank => true
|
91
110
|
field :package_group_total, _("Package Groups"), Fields::Field, :hide_blank => true
|
92
111
|
field :errata_total, _("Errata"), Fields::Field, :hide_blank => true
|
93
|
-
field :puppet_total, _("Puppet Modules"), Fields::Field, :hide_blank => true
|
94
112
|
field :docker_manifest_list_total, _("Container Image Manifest Lists"),
|
95
113
|
Fields::Field, :hide_blank => true
|
96
114
|
field :docker_manifest_total, _("Container Image Manifests"), Fields::Field,
|
@@ -145,8 +163,6 @@ module HammerCLIKatello
|
|
145
163
|
data["docker_manifest_list_total"] = content_counts["docker_manifest_list"]
|
146
164
|
data["docker_manifest_total"] = content_counts["docker_manifest"]
|
147
165
|
data["docker_tag_total"] = content_counts["docker_tag"]
|
148
|
-
when "puppet"
|
149
|
-
data["puppet_total"] = content_counts["puppet_module"]
|
150
166
|
when "ostree"
|
151
167
|
setup_ostree(data)
|
152
168
|
when "file"
|
@@ -195,6 +211,7 @@ module HammerCLIKatello
|
|
195
211
|
end
|
196
212
|
|
197
213
|
class CreateCommand < HammerCLIKatello::CreateCommand
|
214
|
+
include AnsibleCollectionRequirementsHelper
|
198
215
|
success_message _("Repository created.")
|
199
216
|
failure_message _("Could not create the repository")
|
200
217
|
|
@@ -202,39 +219,12 @@ module HammerCLIKatello
|
|
202
219
|
:attribute_name => :option_unprotected,
|
203
220
|
:format => HammerCLI::Options::Normalizers::Bool.new
|
204
221
|
|
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
222
|
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
223
|
end
|
235
224
|
|
236
225
|
class UpdateCommand < HammerCLIKatello::UpdateCommand
|
237
226
|
extend RepositoryScopedToProduct
|
227
|
+
include AnsibleCollectionRequirementsHelper
|
238
228
|
|
239
229
|
validate_repo_name_requires_product_options
|
240
230
|
include OrganizationOptions
|
@@ -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
|
@@ -0,0 +1,42 @@
|
|
1
|
+
module HammerCLIKatello
|
2
|
+
class SimpleContentAccess < HammerCLIKatello::Command
|
3
|
+
desc "Toggle simple content access mode across organization"
|
4
|
+
|
5
|
+
module EligibleCheck
|
6
|
+
include ApipieHelper
|
7
|
+
def request_params
|
8
|
+
super.tap do |opts|
|
9
|
+
unless call(:eligible, :simple_content_access, opts)["simple_content_access_eligible"]
|
10
|
+
raise _("This organization is not eligible for Simple Content Access")
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
|
16
|
+
class EnableCommand < HammerCLIKatello::SingleResourceCommand
|
17
|
+
include EligibleCheck
|
18
|
+
include HammerCLIForemanTasks::Async
|
19
|
+
resource :simple_content_access, :enable
|
20
|
+
command_name "enable"
|
21
|
+
|
22
|
+
success_message _("Simple Content Access Enabled.")
|
23
|
+
failure_message _("Could not enable Simple Content Access for this organization")
|
24
|
+
|
25
|
+
build_options
|
26
|
+
end
|
27
|
+
|
28
|
+
class DisableCommand < HammerCLIKatello::SingleResourceCommand
|
29
|
+
include EligibleCheck
|
30
|
+
include HammerCLIForemanTasks::Async
|
31
|
+
resource :simple_content_access, :disable
|
32
|
+
command_name "disable"
|
33
|
+
|
34
|
+
success_message _("Simple Content Access Disabled.")
|
35
|
+
failure_message _("Could not disable Simple Content Access for this organization")
|
36
|
+
|
37
|
+
build_options
|
38
|
+
end
|
39
|
+
|
40
|
+
autoload_subcommands
|
41
|
+
end
|
42
|
+
end
|
@@ -5,7 +5,7 @@ module HammerCLIKatello
|
|
5
5
|
class ListCommand < HammerCLIKatello::ListCommand
|
6
6
|
include LifecycleEnvironmentNameMapping
|
7
7
|
output do
|
8
|
-
field :id, _("
|
8
|
+
field :id, _("Id")
|
9
9
|
field :name, _("Name")
|
10
10
|
field :filename, _("Filename")
|
11
11
|
end
|
@@ -43,7 +43,7 @@ module HammerCLIKatello
|
|
43
43
|
|
44
44
|
class InfoCommand < HammerCLIKatello::InfoCommand
|
45
45
|
output do
|
46
|
-
field :id, _("
|
46
|
+
field :id, _("Id")
|
47
47
|
field :name, _("Name")
|
48
48
|
field :version, _("Version")
|
49
49
|
field :arch, _("Architecture")
|
@@ -6,10 +6,9 @@ module HammerCLIKatello
|
|
6
6
|
class SubscriptionCommand < HammerCLI::AbstractCommand
|
7
7
|
class ListCommand < HammerCLIKatello::ListCommand
|
8
8
|
resource :subscriptions, :index
|
9
|
-
|
10
9
|
output do
|
11
|
-
field :id, _("
|
12
|
-
field :cp_id, _("
|
10
|
+
field :id, _("Id")
|
11
|
+
field :cp_id, _("Uuid")
|
13
12
|
field :product_name, _("Name")
|
14
13
|
field :subscription_type, _("Type")
|
15
14
|
field :contract_number, _("Contract")
|
@@ -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 :sync_date, _("Start Date"), Fields::Date
|
10
10
|
field :interval, _("Interval")
|
@@ -24,7 +24,7 @@ module HammerCLIKatello
|
|
24
24
|
field :next_sync, _("Next Sync"), Fields::Date
|
25
25
|
|
26
26
|
collection :products, _("Products") do
|
27
|
-
field :id, _("
|
27
|
+
field :id, _("Id")
|
28
28
|
field :name, _("Name")
|
29
29
|
end
|
30
30
|
end
|