hammer_cli_katello 0.11.5.1 → 0.12.0

data/lib/hammer_cli_katello/id_resolver.rb

@@ -7,6 +7,9 @@ module HammerCLIKatello
       :capsule =>               [s_name(_("Capsule name to search by"))],
       :content_view =>          [s_name(_("Content view name to search by"))],
       :content_view_component => [],
+      :file_unit =>             [s_name(_("File name to search by")),
+                                 s("content_view_version_id", _("Content View Version ID")),
+                                 s("repository_id", _("Repository ID"))],
       :gpg =>                   [s_name(_("Gpg key name to search by"))],
       :host_collection =>       [s_name(_("Host collection name to search by"))],
       :lifecycle_environment => [s_name(_("Lifecycle environment name to search by"))],
@@ -46,6 +49,14 @@ module HammerCLIKatello
     alias_method :create_search_options_without_katello_api, :create_search_options
     alias_method :create_search_options, :create_search_options_with_katello_api
 
+    def file_unit_id(options)
+      if options['option_content_view_version_version']
+        options['option_content_view_version_id'] ||=
+          content_view_version_id(scoped_options('content_view_version', options))
+      end
+      get_id(:file_units, options)
+    end
+
     def capsule_content_id(options)
       smart_proxy_id(options)
     end
@@ -105,11 +116,12 @@ module HammerCLIKatello
 
     def content_view_version_ids(options)
       key_content_view_id = HammerCLI.option_accessor_name("content_view_id")
+      options[key_content_view_id] ||= search_and_rescue(:content_view_id, "content_view", options)
       if options['option_versions'] && options[key_content_view_id]
-        options[key_content_view_id] ||= search_and_rescue(:content_view_id,
-                                                           "content_view", options)
         id_strings = options['option_versions'].map do |version|
-          content_view_version_id(options.merge('option_version' => version))
+          cvv_options = {'option_version' => version}
+          cvv_options['option_id'] = nil if options['option_id'] # hide irrelevant id
+          content_view_version_id(options.merge(cvv_options))
         end
         id_strings.join(',')
       end
@@ -117,17 +129,11 @@ module HammerCLIKatello
 
     def content_view_version_id(options)
       key_id = HammerCLI.option_accessor_name("id")
-      key_environment_id = HammerCLI.option_accessor_name("environment_id")
       key_content_view_id = HammerCLI.option_accessor_name("content_view_id")
       from_environment_id = HammerCLI.option_accessor_name("from_environment_id")
 
       return options[key_id] if options[key_id]
 
-      if options[key_environment_id]
-        options[key_environment_id] ||= search_and_rescue(
-          :lifecycle_environment_id, "environment", options)
-      end
-
       options[key_content_view_id] ||= search_and_rescue(:content_view_id, "content_view", options)
 
       results = find_resources(:content_view_versions, options)

data/lib/hammer_cli_katello/repository.rb

@@ -16,6 +16,7 @@ module HammerCLIKatello
       build_options
     end
 
+    # rubocop:disable ClassLength
     class InfoCommand < HammerCLIKatello::InfoCommand
       include RepositoryScopedToProduct
 
@@ -35,6 +36,10 @@ module HammerCLIKatello
         field :full_path, _("Published At")
         field :relative_path, _("Relative Path")
         field :download_policy, _("Download Policy"), Fields::Field, :hide_blank => true
+        field :ostree_upstream_sync_policy, _("OSTree Upstream Sync Policy"),
+              Fields::Field, :hide_blank => true
+        field :_ostree_upstream_sync_depth, _("OSTree Upstream Sync Depth"),
+              Fields::Field, :hide_blank => true
         field :docker_upstream_name, _("Upstream Repository Name"),
               Fields::Field, :hide_blank => true
         field :container_repository_name, _("Container Repository Name"),
@@ -64,12 +69,16 @@ module HammerCLIKatello
 
         label _("Content Counts") do
           field :package_total, _("Packages"), Fields::Field, :hide_blank => true
+          field :srpm_total, _("Source RPMS"), Fields::Field, :hide_blank => true
           field :package_group_total, _("Package Groups"), Fields::Field, :hide_blank => true
           field :errata_total, _("Errata"), Fields::Field, :hide_blank => true
           field :puppet_total, _("Puppet Modules"), Fields::Field, :hide_blank => true
+          field :docker_manifest_list_total, _("Docker Manifest Lists"),
+                                           Fields::Field, :hide_blank => true
           field :docker_manifest_total, _("Docker Manifests"), Fields::Field, :hide_blank => true
           field :docker_tag_total, _("Docker Tags"), Fields::Field, :hide_blank => true
           field :ostree_branch_total, _("OSTree Branches"), Fields::Field, :hide_blank => true
+          field :file_total, _("Files"), Fields::Field, :hide_blank => true
         end
       end
 
@@ -104,15 +113,27 @@ module HammerCLIKatello
         case data["content_type"]
         when "yum"
           data["package_total"] = content_counts["rpm"]
+          data["srpm_total"] = content_counts["srpm"]
           data["package_group_total"] = content_counts["package_group"]
           data["errata_total"] = content_counts["erratum"]
         when "docker"
+          data["docker_manifest_list_total"] = content_counts["docker_manifest_list"]
           data["docker_manifest_total"] = content_counts["docker_manifest"]
           data["docker_tag_total"] = content_counts["docker_tag"]
         when "puppet"
           data["puppet_total"] = content_counts["puppet_module"]
         when "ostree"
-          data["ostree_branch_total"] = content_counts["ostree_branch"]
+          setup_ostree(data)
+        when "file"
+          data["file_total"] = content_counts["file"]
+        end
+      end
+
+      def setup_ostree(data)
+        content_counts = data["content_counts"]
+        data["ostree_branch_total"] = content_counts["ostree_branch"]
+        if data["ostree_upstream_sync_policy"] == "custom"
+          data["_ostree_upstream_sync_depth"] = data["ostree_upstream_sync_depth"]
         end
       end
 
@@ -129,6 +150,7 @@ module HammerCLIKatello
         o.expand.including(:products, :organizations)
       end
     end
+    # rubocop:enable ClassLength
 
     class SyncCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
@@ -192,6 +214,7 @@ module HammerCLIKatello
       end
     end
 
+    # rubocop:disable ClassLength
     class UploadContentCommand < HammerCLIKatello::InfoCommand
       include RepositoryScopedToProduct
       include HammerCLIForemanTasks::Helper
@@ -239,6 +262,28 @@ module HammerCLIKatello
         ::HammerCLIForeman.foreman_resource(:content_uploads)
       end
 
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name,
+                                :option_organization_label]
+        product_options = [:option_product_id, :option_product_name]
+        repository_options = [:option_id, :option_name]
+
+        any(*repository_options).required
+
+        if option(:option_name).exist?
+          any(*product_options).required
+        end
+
+        if option(:option_id).exist?
+          any(*product_options).rejected(
+            msg: _("Cannot specify both product options and repository ID."))
+        end
+
+        if option(:option_product_name).exist?
+          any(*organization_options).required
+        end
+      end
+
       success_message _("Repository content uploaded")
       failure_message _("Could not upload the content")
 
@@ -315,6 +360,7 @@ module HammerCLIKatello
         resource.call(:import_uploads, params)
       end
     end
+    # rubocop:enable ClassLength
 
     class RemoveContentCommand < HammerCLIKatello::SingleResourceCommand
       include RepositoryScopedToProduct

data/lib/hammer_cli_katello/search_options_creators.rb

@@ -4,11 +4,17 @@ module HammerCLIKatello
   module SearchOptionsCreators
     include HammerCLIKatello::ForemanSearchOptionsCreators
 
-    def create_content_view_filter_rules_search_options(options)
-      create_search_options_without_katello_api(options, api.resource(:content_view_filter_rules))
+    def create_file_units_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:file_units), mode)
+        .merge(create_search_options(options, api.resource(:file_units), mode))
     end
 
-    def create_repositories_search_options(options)
+    def create_content_view_filter_rules_search_options(options, mode = nil)
+      create_search_options_without_katello_api(
+        options, api.resource(:content_view_filter_rules), mode)
+    end
+
+    def create_repositories_search_options(options, _mode = nil)
       name = options[HammerCLI.option_accessor_name("name")]
       names = options[HammerCLI.option_accessor_name("names")]
       product_id = options[HammerCLI.option_accessor_name("product_id")]
@@ -20,10 +26,10 @@ module HammerCLIKatello
       search_options
     end
 
-    def create_content_views_search_options(options)
+    def create_content_views_search_options(options, _mode = nil)
       name = options[HammerCLI.option_accessor_name('name')]
       organization_id = options[HammerCLI.option_accessor_name("organization_id")] ||
-                        organization_id(scoped_options('organization', options))
+                        organization_id(scoped_options('organization', options, :single))
 
       search_options = {}
       search_options['name'] = name if name
@@ -33,20 +39,21 @@ module HammerCLIKatello
       search_options
     end
 
-    def create_lifecycle_environments_search_options(options)
-      name = options[HammerCLI.option_accessor_name("name")]
-      organization_id = options[HammerCLI.option_accessor_name("organization_id")] ||
-                        organization_id(scoped_options('organization', options))
-
+    def create_lifecycle_environments_search_options(options, mode = nil)
       search_options = {}
-      search_options['name'] = name if name
+      if mode != :multi
+        name = options[HammerCLI.option_accessor_name("name")]
+        search_options['name'] = name if name
+      end
+      organization_id = organization_id(scoped_options('organization', options, :single))
+
       if options['option_lifecycle_environment_names'] || name
         search_options['organization_id'] = organization_id
       end
       search_options
     end
 
-    def create_content_view_versions_search_options(options)
+    def create_content_view_versions_search_options(options, _mode = nil)
       environment_id = options[HammerCLI.option_accessor_name("environment_id")]
       content_view_id = options[HammerCLI.option_accessor_name("content_view_id")]
       version = options[HammerCLI.option_accessor_name("version")]
@@ -59,18 +66,18 @@ module HammerCLIKatello
       search_options
     end
 
-    def create_host_collections_search_options(options)
+    def create_host_collections_search_options(options, mode = nil)
       options[HammerCLI.option_accessor_name("organization_id")] ||= organization_id(
-        scoped_options("organization", options)
+        scoped_options("organization", options, :single)
       )
       search_options = create_search_options_with_katello_api(
-        options, api.resource(:host_collections)
+        options, api.resource(:host_collections), mode
       ) || {}
       search_options['organization_id'] ||= options['option_organization_id']
       search_options
     end
 
-    def create_search_options_with_katello_api(options, resource)
+    def create_search_options_with_katello_api(options, resource, _mode = nil)
       search_options = {}
       searchables(resource).each do |s|
         value = options[HammerCLI.option_accessor_name(s.name.to_s)]

data/lib/hammer_cli_katello/sync_plan.rb

@@ -19,6 +19,11 @@ module HammerCLIKatello
         field :description, _("Description")
         field :created_at, _("Created at"), Fields::Date
         field :updated_at, _("Updated at"), Fields::Date
+
+        collection :products, _("Products") do
+          field :id, _("ID")
+          field :name, _("Name")
+        end
       end
 
       build_options

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('0.11.5.1')
+    @version ||= Gem::Version.new('0.12.0')
   end
 end

data/test/functional/capsule/content/add_lifecycle_environment_test.rb

@@ -13,14 +13,14 @@ module HammerCLIKatello
         include OrganizationHelpers
 
         it 'allows minimal options' do
-          expect_lifecycle_environment_add('id' => '1', 'environment_id' => 2)
+          expect_lifecycle_environment_add('id' => 1, 'environment_id' => 2)
 
           run_cmd(%w(capsule content add-lifecycle-environment --id 1 --environment-id 2))
         end
 
         it 'resolves environment ID from name' do
           expect_lifecycle_environment_search('3', 'env2', 2)
-          expect_lifecycle_environment_add('id' => '1', 'environment_id' => 2)
+          expect_lifecycle_environment_add('id' => 1, 'environment_id' => 2)
 
           run_cmd(%w(capsule content add-lifecycle-environment --id 1 --environment env2
                      --organization-id 3))
@@ -29,7 +29,7 @@ module HammerCLIKatello
         it 'resolves organization ID from name' do
           expect_organization_search('org3', 3)
           expect_lifecycle_environment_search(3, 'env2', 2)
-          expect_lifecycle_environment_add('id' => '1', 'environment_id' => 2)
+          expect_lifecycle_environment_add('id' => 1, 'environment_id' => 2)
 
           run_cmd(%w(capsule content add-lifecycle-environment --id 1 --environment env2
                      --organization org3))

data/test/functional/capsule/content/cancel_synchronization_test.rb

@@ -15,7 +15,7 @@ describe 'capsule content cancel-synchronization' do
     params = ['--id=3']
 
     ex = api_expects(:capsule_content, :cancel_sync, 'Cancel sync') do |par|
-      par['id'] == '3'
+      par['id'] == 3
     end
     ex.returns("message" => MESSAGE)
 
@@ -27,10 +27,10 @@ describe 'capsule content cancel-synchronization' do
     params = ['--name=capsule1']
 
     ex = api_expects(:capsule_content, :cancel_sync, 'Cancel sync') do |par|
-      par['id'] == '3'
+      par['id'] == 3
     end
     ex.returns("message" => MESSAGE)
-    expect_capsule_search('capsule1', '3')
+    expect_capsule_search('capsule1', 3)
 
     run_cmd(@cmd + params)
   end

data/test/functional/capsule/content/info_test.rb

@@ -16,7 +16,7 @@ describe 'capsule content info' do
     ]
 
     ex = api_expects(:capsule_content, :sync_status, 'Get sync info') do |par|
-      par['id'] == '3'
+      par['id'] == 3
     end
     ex.returns(@sync_status)
 
@@ -48,9 +48,9 @@ describe 'capsule content info' do
     params = ['--name=capsule1']
 
     api_expects(:capsule_content, :sync_status, 'Get sync info') do |par|
-      par['id'] == '3'
+      par['id'] == 3
     end
-    expect_capsule_search('capsule1', '3')
+    expect_capsule_search('capsule1', 3)
 
     run_cmd(@cmd + params)
   end

data/test/functional/capsule/content/lifecycle_environments_test.rb

@@ -9,7 +9,7 @@ module HammerCLIKatello
         include CapsuleContentHelpers
 
         it 'allows minimal options' do
-          expect_lifecycle_environments_list(params: {'id' => '1'}, returns: {})
+          expect_lifecycle_environments_list(params: {'id' => 1}, returns: {})
 
           run_cmd(%w(capsule content lifecycle-environments --id 1))
         end

data/test/functional/capsule/content/remove_lifecycle_environment_test.rb

@@ -13,14 +13,14 @@ module HammerCLIKatello
         include OrganizationHelpers
 
         it 'allows minimal options' do
-          expect_lifecycle_environment_remove('id' => '1', 'environment_id' => 2)
+          expect_lifecycle_environment_remove('id' => 1, 'environment_id' => 2)
 
           run_cmd(%w(capsule content remove-lifecycle-environment --id 1 --environment-id 2))
         end
 
         it 'resolves environment ID from name' do
           expect_lifecycle_environment_search('3', 'env2', 2)
-          expect_lifecycle_environment_remove('id' => '1', 'environment_id' => 2)
+          expect_lifecycle_environment_remove('id' => 1, 'environment_id' => 2)
 
           run_cmd(%w(capsule content remove-lifecycle-environment --id 1 --environment env2
                      --organization-id 3))
@@ -29,7 +29,7 @@ module HammerCLIKatello
         it 'resolves organization ID from name' do
           expect_organization_search('org3', 3)
           expect_lifecycle_environment_search(3, 'env2', 2)
-          expect_lifecycle_environment_remove('id' => '1', 'environment_id' => 2)
+          expect_lifecycle_environment_remove('id' => 1, 'environment_id' => 2)
 
           run_cmd(%w(capsule content remove-lifecycle-environment --id 1 --environment env2
                      --organization org3))

data/test/functional/capsule/content/synchronization_status_test.rb

@@ -14,7 +14,7 @@ describe 'capsule content synchronization_status' do
     before do
       @sync_status = load_json('./data/sync_status.json', __FILE__)
       ex = api_expects(:capsule_content, :sync_status, 'Get sync info') do |par|
-        par['id'] == '3'
+        par['id'] == 3
       end
       ex.returns(@sync_status)
     end
@@ -93,9 +93,9 @@ describe 'capsule content synchronization_status' do
     params = ['--name=capsule1']
 
     api_expects(:capsule_content, :sync_status, 'Get sync info') do |par|
-      par['id'] == '3'
+      par['id'] == 3
     end
-    expect_capsule_search('capsule1', '3')
+    expect_capsule_search('capsule1', 3)
 
     run_cmd(@cmd + params)
   end

data/test/functional/content_view/content_view_helpers.rb

@@ -11,4 +11,8 @@ module ContentViewHelpers
   def expect_generic_content_view_search(args)
     expect_generic_search(:content_views, args)
   end
+
+  def expect_content_view_version_search(params, returns)
+    expect_generic_search(:content_view_versions, params: params, returns: returns)
+  end
 end

data/test/functional/content_view/create_test.rb

@@ -91,7 +91,7 @@ describe 'content-view create' do
 
     expected_result = usage_error_result(
       @cmd,
-      'At least one of options --product-id, --product is required',
+      'At least one of options --product-id, --product is required.',
       error_heading
     )
 
@@ -105,7 +105,7 @@ describe 'content-view create' do
 
     expected_result = usage_error_result(
       @cmd,
-      "You can't set any of options --product-id, --product",
+      "You can't set any of options --product-id, --product.",
       error_heading
     )
 

data/test/functional/content_view/filter/delete_test.rb

@@ -26,7 +26,6 @@ module HammerCLIKatello
 
       expect_organization_search('pkd', 1)
       expect_content_view_search(1, 'darkly', 1)
-      expect_content_view_search(1, 'darkly', 1) # redmine #15930
 
       ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
         par['content_view_id'] == 1 && par['name'] == 'scanner'
@@ -45,7 +44,6 @@ module HammerCLIKatello
 
       expect_organization_search('pkd', 1, field: 'label')
       expect_content_view_search(1, 'darkly', 1)
-      expect_content_view_search(1, 'darkly', 1) # redmine #15930
 
       ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
         par['content_view_id'] == 1 && par['name'] == 'scanner'
@@ -63,7 +61,6 @@ module HammerCLIKatello
       params = ['--name=scanner', '--content-view=darkly', '--organization-id=1']
 
       expect_content_view_search('1', 'darkly', 1)
-      expect_content_view_search('1', 'darkly', 1) # redmine #15930
 
       ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
         par['content_view_id'] == 1 && par['name'] == 'scanner'
@@ -82,7 +79,7 @@ module HammerCLIKatello
       expected_result = usage_error_result(
         @cmd,
         'At least one of options --organization-id, --organization, --organization-label ' \
-          'is required',
+        'is required.',
         'Could not delete the filter'
       )
       api_expects_no_call