diff --git a/lib/hammer_cli_katello/activation_key.rb b/lib/hammer_cli_katello/activation_key.rb index d8b4e036..870d2cd1 100644 --- a/lib/hammer_cli_katello/activation_key.rb +++ b/lib/hammer_cli_katello/activation_key.rb @@ -70,6 +70,7 @@ def request_params field :content_view_version, _("Version") field :content_view_version_id, _("Content View version Id") field :composite, _("Composite"), Fields::Boolean + field :rolling, _("Rolling"), Fields::Boolean field :content_view_environment_id, _("Content View Environment id"), Fields::Field end end diff --git a/lib/hammer_cli_katello/capsule.rb b/lib/hammer_cli_katello/capsule.rb index 0d459861..73456b7e 100644 --- a/lib/hammer_cli_katello/capsule.rb +++ b/lib/hammer_cli_katello/capsule.rb @@ -205,6 +205,7 @@ class InfoCommand < HammerCLIKatello::InfoCommand collection :content_views, _("Content Views") do field nil, _("Name"), Fields::Reference field :composite, _('Composite'), Fields::Boolean + field :rolling, _('Rolling'), Fields::Boolean field :last_published, _('Last Published'), Fields::Date collection :repositories, _('Repositories') do field :id, _("Repository ID") diff --git a/lib/hammer_cli_katello/content_view.rb b/lib/hammer_cli_katello/content_view.rb index 9f74a953..1368473c 100644 --- a/lib/hammer_cli_katello/content_view.rb +++ b/lib/hammer_cli_katello/content_view.rb @@ -15,6 +15,7 @@ class ListCommand < HammerCLIKatello::ListCommand field :name, _("Name") field :label, _("Label") field :composite, _("Composite"), Fields::Boolean + field :rolling, _("Rolling"), Fields::Boolean field :last_published, _("Last Published"), Fields::Date, :hide_blank => true field :repository_ids, _("Repository IDs"), Fields::List, :max_width => 300 end @@ -32,6 +33,7 @@ class InfoCommand < HammerCLIKatello::InfoCommand field :name, _("Name") field :label, _("Label") field :composite, _("Composite"), Fields::Boolean + field :rolling, _("Rolling"), Fields::Boolean field :description, _("Description") field :content_host_count, _("Content Host Count") field :solve_dependencies, _("Solve Dependencies"), Fields::Boolean @@ -142,11 +144,13 @@ class CreateCommand < HammerCLIKatello::CreateCommand failure_message _("Could not create the content view") option ["--composite"], :flag, _("Create a composite content view") + option ["--rolling"], :flag, _("Create a rolling content view") option ["--import-only"], :flag, _("Designate this Content View for "\ "importing from upstream servers only.") def request_params super.tap do |opts| opts['composite'] = option_composite? || false + opts['rolling'] = option_rolling? || false opts['import_only'] = option_import_only? || false end end diff --git a/lib/hammer_cli_katello/host_extensions.rb b/lib/hammer_cli_katello/host_extensions.rb index 971b6c15..3cda962f 100644 --- a/lib/hammer_cli_katello/host_extensions.rb +++ b/lib/hammer_cli_katello/host_extensions.rb @@ -60,6 +60,7 @@ module HostExtensions field :id, _("Id") field :name, _("Name") field :composite, _("Composite"), Fields::Boolean + field :rolling, _("Rolling"), Fields::Boolean end end from :lifecycle_environment do diff --git a/test/functional/content_view/list_test.rb b/test/functional/content_view/list_test.rb index 94427f1f..9f0a5aed 100644 --- a/test/functional/content_view/list_test.rb +++ b/test/functional/content_view/list_test.rb @@ -36,9 +36,9 @@ ex.returns(empty_response) expected_result = success_result( - "----------------|------|-------|-----------|----------------|--------------- -CONTENT VIEW ID | NAME | LABEL | COMPOSITE | LAST PUBLISHED | REPOSITORY IDS -----------------|------|-------|-----------|----------------|--------------- + "----------------|------|-------|-----------|---------|----------------|--------------- +CONTENT VIEW ID | NAME | LABEL | COMPOSITE | ROLLING | LAST PUBLISHED | REPOSITORY IDS +----------------|------|-------|-----------|---------|----------------|--------------- ") result = run_cmd(@cmd + params) @@ -57,9 +57,9 @@ ex.returns(empty_response) expected_result = success_result( - "----------------|------|-------|-----------|----------------|--------------- -CONTENT VIEW ID | NAME | LABEL | COMPOSITE | LAST PUBLISHED | REPOSITORY IDS -----------------|------|-------|-----------|----------------|--------------- + "----------------|------|-------|-----------|---------|----------------|--------------- +CONTENT VIEW ID | NAME | LABEL | COMPOSITE | ROLLING | LAST PUBLISHED | REPOSITORY IDS +----------------|------|-------|-----------|---------|----------------|--------------- ") result = run_cmd(@cmd + params)