hammer_cli_katello 1.8.0 → 1.9.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/activation_key.rb +13 -3
- data/lib/hammer_cli_katello/content_view_version.rb +11 -2
- data/lib/hammer_cli_katello/organization.rb +12 -0
- data/lib/hammer_cli_katello/repository.rb +3 -0
- data/lib/hammer_cli_katello/search_options_creators.rb +3 -2
- data/lib/hammer_cli_katello/version.rb +1 -1
- data/locale/bn/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/bn/hammer-cli-katello.po +1698 -0
- data/locale/bn_IN/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/bn_IN/hammer-cli-katello.po +1699 -0
- data/locale/ca/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ca/hammer-cli-katello.po +1698 -0
- data/locale/cs_CZ/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/cs_CZ/hammer-cli-katello.po +1701 -0
- data/locale/de/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/de/hammer-cli-katello.po +1499 -1101
- data/locale/de_AT/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/de_AT/hammer-cli-katello.po +1695 -0
- data/locale/de_DE/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/de_DE/hammer-cli-katello.po +1701 -0
- data/locale/el/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/el/hammer-cli-katello.po +1698 -0
- data/locale/en/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/en/hammer-cli-katello.po +1010 -233
- data/locale/en_GB/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/en_GB/hammer-cli-katello.po +1700 -0
- data/locale/en_US/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/en_US/hammer-cli-katello.po +1695 -0
- data/locale/es/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/es/hammer-cli-katello.po +1622 -1121
- data/locale/et_EE/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/et_EE/hammer-cli-katello.po +1695 -0
- data/locale/fr/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/fr/hammer-cli-katello.po +1635 -1136
- data/locale/gl/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/gl/hammer-cli-katello.po +1698 -0
- data/locale/gu/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/gu/hammer-cli-katello.po +1698 -0
- data/locale/he_IL/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/he_IL/hammer-cli-katello.po +1700 -0
- data/locale/hi/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/hi/hammer-cli-katello.po +1698 -0
- data/locale/id/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/id/hammer-cli-katello.po +1694 -0
- data/locale/it/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/it/hammer-cli-katello.po +1623 -1120
- data/locale/ja/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ja/hammer-cli-katello.po +1640 -1135
- data/locale/ka/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ka/hammer-cli-katello.po +1747 -0
- data/locale/kn/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/kn/hammer-cli-katello.po +1698 -0
- data/locale/ko/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ko/hammer-cli-katello.po +1625 -1123
- data/locale/ml_IN/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ml_IN/hammer-cli-katello.po +1695 -0
- data/locale/mr/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/mr/hammer-cli-katello.po +1698 -0
- data/locale/nl_NL/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/nl_NL/hammer-cli-katello.po +1702 -0
- data/locale/or/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/or/hammer-cli-katello.po +1698 -0
- data/locale/pa/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/pa/hammer-cli-katello.po +1699 -0
- data/locale/pl/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/pl/hammer-cli-katello.po +1701 -0
- data/locale/pl_PL/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/pl_PL/hammer-cli-katello.po +1697 -0
- data/locale/pt/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/pt/hammer-cli-katello.po +1699 -0
- data/locale/pt_BR/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/pt_BR/hammer-cli-katello.po +1633 -1129
- data/locale/ro/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ro/hammer-cli-katello.po +1695 -0
- data/locale/ro_RO/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ro_RO/hammer-cli-katello.po +1696 -0
- data/locale/ru/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ru/hammer-cli-katello.po +1635 -1128
- data/locale/sl/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/sl/hammer-cli-katello.po +1699 -0
- data/locale/sv_SE/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/sv_SE/hammer-cli-katello.po +1700 -0
- data/locale/ta/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ta/hammer-cli-katello.po +1698 -0
- data/locale/ta_IN/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/ta_IN/hammer-cli-katello.po +1699 -0
- data/locale/te/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/te/hammer-cli-katello.po +1698 -0
- data/locale/tr/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/tr/hammer-cli-katello.po +1698 -0
- data/locale/vi/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/vi/hammer-cli-katello.po +1694 -0
- data/locale/vi_VN/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/vi_VN/hammer-cli-katello.po +1695 -0
- data/locale/zh/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/zh/hammer-cli-katello.po +1694 -0
- data/locale/zh_CN/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/zh_CN/hammer-cli-katello.po +1617 -1114
- data/locale/zh_TW/LC_MESSAGES/hammer-cli-katello.mo +0 -0
- data/locale/zh_TW/hammer-cli-katello.po +1593 -1099
- data/test/data/4.8/foreman_api.json +1 -0
- data/test/data/4.9/foreman_api.json +1 -0
- data/test/functional/repository/list_test.rb +16 -16
- data/test/test_helper.rb +1 -14
- metadata +90 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '087997f9ecd956e28e1a16af8a0a9b7d58c8545a21823983a4262455440a4450'
|
4
|
+
data.tar.gz: 24f3198cbecc8efe78ab7307deef8ae037acb150b1fdbbb663f1187e37b0b255
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 11f48385ad699c7ffec842e06f80614892d533a5f3aada8a320fbdade7054e31205893e42ce7711eb365f680e0e8166fae6d605251f9ebabd91420e4330e3ea6
|
7
|
+
data.tar.gz: ab4c2fe345e087af5f6bb30ca575f8273212080ab504fc5d5003e721d6f5e2264ed4d837650b4b8598dd31f61acaad08860f53d41ba5d29d44490651aeb0d2b9
|
@@ -55,7 +55,7 @@ module HammerCLIKatello
|
|
55
55
|
field :name, _("Name")
|
56
56
|
field :id, _("Id")
|
57
57
|
field :description, _("Description"), Fields::Field, :hide_blank => true
|
58
|
-
field :
|
58
|
+
field :format_consumed, _("Host Limit")
|
59
59
|
field :auto_attach, _("Auto Attach")
|
60
60
|
field :release_version, _("Release Version"), Fields::Field, :hide_blank => true
|
61
61
|
|
@@ -66,6 +66,11 @@ module HammerCLIKatello
|
|
66
66
|
field :name, _("Content View")
|
67
67
|
end
|
68
68
|
|
69
|
+
collection :hosts, _("Associated Hosts") do
|
70
|
+
field :id, _('Id')
|
71
|
+
field :name, _("Name")
|
72
|
+
end
|
73
|
+
|
69
74
|
collection :host_collections, _("Host Collections") do
|
70
75
|
field :id, _("Id")
|
71
76
|
field :name, _("Name")
|
@@ -86,8 +91,13 @@ module HammerCLIKatello
|
|
86
91
|
end
|
87
92
|
|
88
93
|
def extend_data(data)
|
89
|
-
data["
|
90
|
-
|
94
|
+
limit = data["unlimited_hosts"] ? _("Unlimited") : data["max_hosts"]
|
95
|
+
|
96
|
+
data["format_consumed"] = _("%{consumed} of %{limit}") %
|
97
|
+
{
|
98
|
+
:consumed => data["usage_count"],
|
99
|
+
:limit => limit
|
100
|
+
}
|
91
101
|
data
|
92
102
|
end
|
93
103
|
|
@@ -32,8 +32,6 @@ module HammerCLIKatello
|
|
32
32
|
class InfoCommand < HammerCLIKatello::InfoCommand
|
33
33
|
include LifecycleEnvironmentNameMapping
|
34
34
|
|
35
|
-
resource :content_view_versions, :show
|
36
|
-
|
37
35
|
output do
|
38
36
|
field :id, _("Id")
|
39
37
|
field :name, _("Name")
|
@@ -57,6 +55,17 @@ module HammerCLIKatello
|
|
57
55
|
field :name, _("Name")
|
58
56
|
field :label, _("Label")
|
59
57
|
end
|
58
|
+
|
59
|
+
field :filters_applied, _("Has Applied Filters"), Fields::Boolean, hide_blank: true
|
60
|
+
from :applied_filters do
|
61
|
+
collection :applied_filters, _("Applied Filters"), hide_blank: true, hide_empty: true do
|
62
|
+
from :filter do
|
63
|
+
field :id, _("Id")
|
64
|
+
field :name, _("Name")
|
65
|
+
end
|
66
|
+
end
|
67
|
+
field :dependency_solving, _("Dependency Solving"), Fields::Field, :hide_blank => true
|
68
|
+
end
|
60
69
|
end
|
61
70
|
|
62
71
|
build_options do |o|
|
@@ -68,6 +68,18 @@ module HammerCLIKatello
|
|
68
68
|
success_message _("Organization updated.")
|
69
69
|
failure_message _("Could not update the organization")
|
70
70
|
|
71
|
+
def request_params
|
72
|
+
params = super
|
73
|
+
# This is so Hammer doesn't say "Nothing to update" when toggling SCA.
|
74
|
+
# (see hammer-cli-foreman)
|
75
|
+
# Rails will safely ignore the extra parameter.
|
76
|
+
if params.key?('simple_content_access')
|
77
|
+
params["organization"] = params.fetch('organization', {}).merge(
|
78
|
+
"_simple_content_access" => params['simple_content_access'])
|
79
|
+
end
|
80
|
+
params
|
81
|
+
end
|
82
|
+
|
71
83
|
build_options do |o|
|
72
84
|
o.expand(:all).except(:environments)
|
73
85
|
end
|
@@ -31,6 +31,7 @@ module HammerCLIKatello
|
|
31
31
|
field :name, _("Product")
|
32
32
|
end
|
33
33
|
field :content_type, _("Content Type")
|
34
|
+
field :content_label, _("Content Label")
|
34
35
|
field :url, _("Url")
|
35
36
|
end
|
36
37
|
|
@@ -67,6 +68,7 @@ module HammerCLIKatello
|
|
67
68
|
end
|
68
69
|
field :_redhat_repo, _("Red Hat Repository")
|
69
70
|
field :content_type, _("Content Type")
|
71
|
+
field :content_label, _("Content Label")
|
70
72
|
field :checksum_type, _("Checksum Type"), Fields::Field, :hide_blank => true
|
71
73
|
field :_mirroring_policy, _("Mirroring Policy"), Fields::Field, :hide_blank => true
|
72
74
|
field :url, _("Url")
|
@@ -74,6 +76,7 @@ module HammerCLIKatello
|
|
74
76
|
field :full_path, _("Published At")
|
75
77
|
field :relative_path, _("Relative Path")
|
76
78
|
field :download_policy, _("Download Policy"), Fields::Field, :hide_blank => true
|
79
|
+
field :metadata_expire, _("Metadata Expiration"), Fields::Field, :hide_blank => true
|
77
80
|
field :docker_upstream_name, _("Upstream Repository Name"),
|
78
81
|
Fields::Field, :hide_blank => true
|
79
82
|
field :docker_tags_whitelist, _("Container Image Tags Filter"),
|
@@ -57,8 +57,9 @@ module HammerCLIKatello
|
|
57
57
|
def create_lifecycle_environments_search_options(options, mode = nil)
|
58
58
|
search_options = {}
|
59
59
|
if mode != :multi
|
60
|
-
name = options[HammerCLI.option_accessor_name("
|
61
|
-
options[HammerCLI.option_accessor_name("
|
60
|
+
name = options[HammerCLI.option_accessor_name("name")] ||
|
61
|
+
options[HammerCLI.option_accessor_name("environment_name")]
|
62
|
+
|
62
63
|
search_options['name'] = name if name
|
63
64
|
end
|
64
65
|
organization_id = organization_id(scoped_options('organization', options, :single))
|
Binary file
|