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
@@ -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
|
end
|
13
13
|
|
@@ -43,9 +43,9 @@ module HammerCLIKatello
|
|
43
43
|
|
44
44
|
class InfoCommand < HammerCLIKatello::InfoCommand
|
45
45
|
output do
|
46
|
-
field :id, _("
|
46
|
+
field :id, _("Id")
|
47
47
|
field :pulp_id, _("Pulp ID")
|
48
|
-
field :uuid, _("
|
48
|
+
field :uuid, _("Uuid")
|
49
49
|
field :name, _("Name")
|
50
50
|
field :version, _("Version")
|
51
51
|
field :checksum, _("checksum")
|
@@ -0,0 +1,13 @@
|
|
1
|
+
module HammerCLIKatello
|
2
|
+
class DockerCommand < HammerCLI::AbstractCommand
|
3
|
+
require 'hammer_cli_katello/docker_manifest'
|
4
|
+
subcommand 'manifest',
|
5
|
+
HammerCLIKatello::DockerManifestCommand.desc,
|
6
|
+
HammerCLIKatello::DockerManifestCommand
|
7
|
+
|
8
|
+
require 'hammer_cli_katello/docker_tag'
|
9
|
+
subcommand 'tag',
|
10
|
+
HammerCLIKatello::DockerTagCommand.desc,
|
11
|
+
HammerCLIKatello::DockerTagCommand
|
12
|
+
end
|
13
|
+
end
|
@@ -0,0 +1,53 @@
|
|
1
|
+
module HammerCLIKatello
|
2
|
+
class DockerManifestCommand < HammerCLIForeman::Command
|
3
|
+
resource :docker_manifests
|
4
|
+
command_name 'manifest'
|
5
|
+
desc _('Manage docker manifests')
|
6
|
+
|
7
|
+
class ListCommand < HammerCLIKatello::ListCommand
|
8
|
+
include HammerCLIKatello::LifecycleEnvironmentNameMapping
|
9
|
+
|
10
|
+
output do
|
11
|
+
field :id, _("ID")
|
12
|
+
field :name, _("Name")
|
13
|
+
field :schema_version, _("Schema Version")
|
14
|
+
field :digest, _("Digest")
|
15
|
+
field :downloaded, _("Downloaded"), Fields::Boolean
|
16
|
+
field :_tags, _("Tags")
|
17
|
+
end
|
18
|
+
|
19
|
+
def extend_data(manifest)
|
20
|
+
manifest['_tags'] = manifest['tags'].map { |e| e["name"] }.join(", ")
|
21
|
+
manifest
|
22
|
+
end
|
23
|
+
|
24
|
+
build_options do |o|
|
25
|
+
o.expand.including(:products, :organizations, :content_views)
|
26
|
+
end
|
27
|
+
|
28
|
+
extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
|
29
|
+
end
|
30
|
+
|
31
|
+
class InfoCommand < HammerCLIKatello::InfoCommand
|
32
|
+
output do
|
33
|
+
field :id, _("ID")
|
34
|
+
field :name, _("Name")
|
35
|
+
field :schema_version, _("Schema Version")
|
36
|
+
field :digest, _("Digest")
|
37
|
+
field :downloaded, _("Downloaded"), Fields::Boolean
|
38
|
+
collection :tags, _("Tags") do
|
39
|
+
field :name, _("Name")
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
def extend_data(manifest)
|
44
|
+
manifest['_tags'] = manifest['tags'].map { |e| { name: e["name"] } }.join(", ")
|
45
|
+
manifest
|
46
|
+
end
|
47
|
+
|
48
|
+
build_options
|
49
|
+
end
|
50
|
+
|
51
|
+
autoload_subcommands
|
52
|
+
end
|
53
|
+
end
|
@@ -0,0 +1,40 @@
|
|
1
|
+
module HammerCLIKatello
|
2
|
+
class DockerTagCommand < HammerCLIForeman::Command
|
3
|
+
resource :docker_tags
|
4
|
+
command_name 'tag'
|
5
|
+
desc _('Manage docker tags')
|
6
|
+
|
7
|
+
class ListCommand < HammerCLIKatello::ListCommand
|
8
|
+
include HammerCLIKatello::LifecycleEnvironmentNameMapping
|
9
|
+
|
10
|
+
output do
|
11
|
+
field :id, _("ID")
|
12
|
+
field :name, _("Tag")
|
13
|
+
field :repository_id, _("Repository ID")
|
14
|
+
end
|
15
|
+
|
16
|
+
build_options do |o|
|
17
|
+
o.expand.including(:products, :organizations, :content_views)
|
18
|
+
end
|
19
|
+
|
20
|
+
extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
|
21
|
+
end
|
22
|
+
|
23
|
+
class InfoCommand < HammerCLIKatello::InfoCommand
|
24
|
+
output do
|
25
|
+
field :id, _("ID")
|
26
|
+
field :name, _("Tag")
|
27
|
+
field :repository_id, _("Repository ID")
|
28
|
+
|
29
|
+
from :manifest do
|
30
|
+
field :id, _("Docker Manifest ID")
|
31
|
+
field :name, _("Docker Manifest Name")
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
35
|
+
build_options
|
36
|
+
end
|
37
|
+
|
38
|
+
autoload_subcommands
|
39
|
+
end
|
40
|
+
end
|
@@ -7,7 +7,7 @@ module HammerCLIKatello
|
|
7
7
|
field :version, _("Version")
|
8
8
|
field :description, _("Description")
|
9
9
|
field :status, _("Status")
|
10
|
-
field :id, _("
|
10
|
+
field :id, _("Id")
|
11
11
|
field :errata_id, _("Errata ID")
|
12
12
|
field :reboot_suggested, _("Reboot Suggested")
|
13
13
|
field :updated, _("Updated")
|
@@ -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 :path, _("Path")
|
14
14
|
end
|
@@ -28,10 +28,10 @@ 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 :path, _("Path")
|
34
|
-
field :uuid, _("
|
34
|
+
field :uuid, _("Uuid")
|
35
35
|
field :checksum, _("Checksum")
|
36
36
|
end
|
37
37
|
|
@@ -34,13 +34,13 @@ module HammerCLIKatello
|
|
34
34
|
field :description, _("Description")
|
35
35
|
|
36
36
|
collection :repositories, _("Repositories") do
|
37
|
-
field :id, _("
|
37
|
+
field :id, _("Id")
|
38
38
|
field :name, _("Name")
|
39
39
|
field :label, _("Label")
|
40
40
|
end
|
41
41
|
|
42
42
|
collection :rules, _("Rules") do
|
43
|
-
field :id, _("
|
43
|
+
field :id, _("Id")
|
44
44
|
field :name, _("Name"), Fields::Field, :hide_blank => true
|
45
45
|
field :version, _("Version"), Fields::Field, :hide_blank => true
|
46
46
|
field :min_version, _("Minimum Version"), Fields::Field, :hide_blank => true
|
@@ -48,18 +48,6 @@ module HammerCLIKatello
|
|
48
48
|
create_search_options_without_katello_api(options, api.resource(:ptables), mode)
|
49
49
|
end
|
50
50
|
|
51
|
-
def create_puppet_ca_proxies_search_options(options, mode = nil)
|
52
|
-
create_search_options_without_katello_api(options, api.resource(:puppet_ca_proxies), mode)
|
53
|
-
end
|
54
|
-
|
55
|
-
def create_puppet_proxies_search_options(options, mode = nil)
|
56
|
-
create_search_options_without_katello_api(options, api.resource(:puppet_proxies), mode)
|
57
|
-
end
|
58
|
-
|
59
|
-
def create_puppetclasses_search_options(options, mode = nil)
|
60
|
-
create_search_options_without_katello_api(options, api.resource(:puppetclasses), mode)
|
61
|
-
end
|
62
|
-
|
63
51
|
def create_subnets_search_options(options, mode = nil)
|
64
52
|
create_search_options_without_katello_api(options, api.resource(:subnets), mode)
|
65
53
|
end
|
@@ -28,7 +28,7 @@ module HammerCLIKatello
|
|
28
28
|
resource :host_collections, :index
|
29
29
|
|
30
30
|
output do
|
31
|
-
field :id, _("
|
31
|
+
field :id, _("Id")
|
32
32
|
field :name, _("Name")
|
33
33
|
field :_limit, _("Limit")
|
34
34
|
field :description, _("Description")
|
@@ -99,7 +99,7 @@ module HammerCLIKatello
|
|
99
99
|
end
|
100
100
|
|
101
101
|
output do
|
102
|
-
field :id, _("
|
102
|
+
field :id, _("Id")
|
103
103
|
field :name, _("Name")
|
104
104
|
from :content_facet_attributes do
|
105
105
|
from :errata_counts do
|
@@ -41,22 +41,22 @@ module HammerCLIKatello
|
|
41
41
|
label _('Content Information') do
|
42
42
|
from :content_facet_attributes do
|
43
43
|
label _("Content View") do
|
44
|
-
field :content_view_id, _("
|
44
|
+
field :content_view_id, _("Id")
|
45
45
|
field :content_view_name, _("Name")
|
46
46
|
end
|
47
47
|
|
48
48
|
label _("Lifecycle Environment") do
|
49
|
-
field :lifecycle_environment_id, _("
|
49
|
+
field :lifecycle_environment_id, _("Id")
|
50
50
|
field :lifecycle_environment_name, _("Name")
|
51
51
|
end
|
52
52
|
|
53
53
|
label _("Content Source") do
|
54
|
-
field :content_source_id, _("
|
54
|
+
field :content_source_id, _("Id")
|
55
55
|
field :content_source_name, _("Name")
|
56
56
|
end
|
57
57
|
|
58
58
|
label _("Kickstart Repository") do
|
59
|
-
field :kickstart_repository_id, _("
|
59
|
+
field :kickstart_repository_id, _("Id")
|
60
60
|
field :kickstart_repository_name, _("Name")
|
61
61
|
end
|
62
62
|
|
@@ -75,7 +75,7 @@ module HammerCLIKatello
|
|
75
75
|
|
76
76
|
label _('Subscription Information') do
|
77
77
|
from :subscription_facet_attributes do
|
78
|
-
field :uuid, _('
|
78
|
+
field :uuid, _('Uuid')
|
79
79
|
field :last_checkin, _('Last Checkin')
|
80
80
|
field :release_version, _('Release Version')
|
81
81
|
field :autoheal, _('Autoheal')
|
@@ -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,12 +28,9 @@ 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
|
-
:
|
32
|
-
|
33
|
-
|
34
|
-
s("uuid", _("Puppet module's UUID to search by"))
|
35
|
-
],
|
36
|
-
:content_view_version => [s("version", _("Content view version number"))]
|
31
|
+
:content_view_version => [s("version", _("Content view version number"))],
|
32
|
+
:content_export => [],
|
33
|
+
:content_import => []
|
37
34
|
}.freeze
|
38
35
|
|
39
36
|
DEFAULT_SEARCHABLES = [s_name(_("Name to search by"))].freeze
|
@@ -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
|
@@ -21,9 +21,19 @@ module HammerCLIKatello
|
|
21
21
|
field :label, _("Label")
|
22
22
|
field :description, _("Description")
|
23
23
|
field :redhat_repository_url, _("Red Hat Repository URL")
|
24
|
+
field :simple_content_access_label, _("Simple Content Access")
|
24
25
|
field :service_levels, _("Service Levels"), Fields::List
|
25
26
|
end
|
26
27
|
|
28
|
+
def extend_data(data)
|
29
|
+
data["simple_content_access_label"] = if data["simple_content_access"]
|
30
|
+
_("Enabled")
|
31
|
+
else
|
32
|
+
_("Disabled")
|
33
|
+
end
|
34
|
+
data
|
35
|
+
end
|
36
|
+
|
27
37
|
build_options
|
28
38
|
end
|
29
39
|
|
@@ -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
|