hammer_cli_katello 1.3.0 → 1.4.1

data/test/functional/content_units/info_test.rb

@@ -0,0 +1,29 @@
+require_relative '../test_helper.rb'
+require_relative '../organization/organization_helpers'
+require_relative '../content_view/content_view_helpers'
+require_relative '../repository/repository_helpers'
+require_relative '../product/product_helpers'
+require 'hammer_cli_katello/content_units'
+
+module HammerCLIKatello
+  describe ContentUnitsCommand::InfoCommand do
+    include ContentViewHelpers
+    include RepositoryHelpers
+    include ProductHelpers
+    include OrganizationHelpers
+
+    it 'allows minimal options' do
+      api_expects(:generic_content_units, :show)
+        .with_params('content_type' => 'python_package', 'id' => '1492')
+
+      run_cmd(%w(content-units info --content-type python_package --id 1492))
+    end
+
+    it 'requires content_type param' do
+      api_expects_no_call
+
+      r = run_cmd(%w(content-units info --id 1492))
+      assert(r.err.include?("Missing arguments for '--content-type'"), "Invalid error message")
+    end
+  end
+end

data/test/functional/content_units/list_test.rb

@@ -0,0 +1,106 @@
+require_relative '../test_helper.rb'
+require_relative '../organization/organization_helpers'
+require_relative '../content_view/content_view_helpers'
+require_relative '../repository/repository_helpers'
+require_relative '../product/product_helpers'
+require 'hammer_cli_katello/content_units'
+
+module HammerCLIKatello
+  describe ContentUnitsCommand::ListCommand do
+    include ContentViewHelpers
+    include RepositoryHelpers
+    include ProductHelpers
+    include OrganizationHelpers
+
+    it 'allows minimal options' do
+      api_expects(:generic_content_units, :index)
+        .with_params('content_type' => 'python_package')
+
+      run_cmd(%w(content-units list --content-type python_package))
+    end
+
+    it 'requires content_type param' do
+      api_expects_no_call
+
+      r = run_cmd(%w(content-units list))
+      assert(r.err.include?("Missing arguments for '--content-type'"), "Invalid error message")
+    end
+
+    describe 'repository options' do
+      it 'may be specified by ID' do
+        api_expects(:generic_content_units, :index)
+          .with_params('content_type' => 'python_package', 'repository_id' => 1)
+
+        run_cmd(%w(content-units list --content-type python_package --repository-id 1))
+      end
+
+      it 'require product ID when given repository name' do
+        api_expects_no_call
+
+        r = run_cmd(%w(content-units list --content-type python_package --repository repo1))
+        assert(r.err.include?("--product, --product-id is required"), "Invalid error message")
+      end
+
+      # rubocop:disable LineLength
+      it 'may be specified by name and product ID' do
+        expect_repository_search(2, 'repo1', 1)
+
+        api_expects(:generic_content_units, :index)
+          .with_params('content_type' => 'python_package', 'repository_id' => 1)
+        run_cmd(%w(content-units list --content-type python_package --repository repo1 --product-id 2))
+      end
+      # rubocop:enable LineLength
+    end
+
+    describe 'organization options' do
+      it 'may be specified by ID' do
+        api_expects(:generic_content_units, :index)
+          .with_params('organization_id' => 1, 'content_type' => 'python_package')
+
+        run_cmd(%w(content-units list --organization-id 1 --content-type python_package))
+      end
+
+      it 'may be specified by name' do
+        expect_organization_search('org3', 1)
+        api_expects(:generic_content_units, :index)
+          .with_params('organization_id' => 1, 'content_type' => 'python_package')
+
+        run_cmd(%w(content-units list --organization org3 --content-type python_package))
+      end
+
+      it 'may be specified by label' do
+        expect_organization_search('org3', 1, field: 'label')
+        api_expects(:generic_content_units, :index)
+          .with_params('organization_id' => 1, 'content_type' => 'python_package')
+
+        run_cmd(%w(content-units list --organization-label org3 --content-type python_package))
+      end
+    end
+
+    describe 'content-view options' do
+      # rubocop:disable LineLength
+      it 'may be specified by ID' do
+        api_expects(:content_view_versions, :index)
+          .with_params('content_view_id' => 1, 'version' => '2.1')
+          .returns(index_response([{'id' => 5}]))
+        api_expects(:generic_content_units, :index)
+          .with_params('content_view_version_id' => 5, 'content_type' => 'python_package')
+
+        run_cmd(
+          %w(
+            content-units list --content-view-id 1 --content-view-version 2.1 --content-type python_package
+          )
+        )
+      end
+
+      it 'requires organization ID when given content view name' do
+        api_expects_no_call
+
+        r = run_cmd(%w(content-units list --content-view cv1 --content-view-version 2.1 --content-type python_package))
+        expected_error = "--organization-id, --organization, --organization-label is required"
+        assert(r.err.include?(expected_error), "Invalid error message")
+      end
+      # rubocop:enable LineLength
+    end
+  end
+end

data/test/functional/organization/cdn_configuration_test.rb

@@ -16,12 +16,14 @@ describe HammerCLIKatello::Organization::ConfigureCdnCommand do
     username = "foo"
     url = "https://goo.com"
     upstream_label = "GreatOrg"
+    type = 'upstream_server'
     params = ["--label=#{org_label}",
               "--url=#{url}",
               "--username=#{username}",
               "--upstream-organization-label=#{upstream_label}",
               "--password=#{password}",
-              "--ssl-ca-credential-id=#{ssl_cred_id}"
+              "--ssl-ca-credential-id=#{ssl_cred_id}",
+              "--type=#{type}"
             ]
     expect_organization_search(org_label, org_id, field: 'label')
 
@@ -31,7 +33,8 @@ describe HammerCLIKatello::Organization::ConfigureCdnCommand do
         par['url'] == url &&
         par['password'] == password &&
         par['ssl_ca_credential_id'].to_s == ssl_cred_id &&
-        par['upstream_organization_label'] == upstream_label
+        par['upstream_organization_label'] == upstream_label &&
+        par['type'] == type
     end
 
     assert_equal(

data/test/functional/repository/info_test.rb

@@ -42,6 +42,10 @@ describe "get repository info" do
         'package_group' => 0,
         'erratum' => 1,
         'module_stream' => 0
+      },
+      'content_credential' => {
+        'id' => 1,
+        'name' => 'pizza'
       }
     )
     result = run_cmd(@cmd + params)
@@ -62,6 +66,8 @@ describe "get repository info" do
                        ['Id', '79'],
                        ['Name', 'test'],
                        ['GPG Key', ''],
+                       ['Id', '1'],
+                       ['Name', 'pizza'],
                        ['Sync', ''],
                        ['Status', 'Not Synced'],
                        ['Last Sync Date', '3 minutes'],

data/test/functional/repository/reclaim_space_test.rb

@@ -0,0 +1,105 @@
+require_relative '../test_helper'
+require_relative '../organization/organization_helpers'
+require 'hammer_cli_katello/repository'
+module HammerCLIKatello
+  describe Repository::ReclaimSpaceCommand do
+    include OrganizationHelpers
+    it 'allows minimal options' do
+      api_expects(:repositories, :reclaim_space) do |p|
+        p['id'] == 1
+      end
+      run_cmd(%w(repository reclaim-space --id 1))
+    end
+
+    describe 'resolves repository ID' do
+      it 'by requiring product' do
+        api_expects_no_call
+        result = run_cmd(%w(repository reclaim-space --name repo1))
+        assert(result.err[/--product, --product-id is required/], 'Incorrect error message')
+      end
+
+      it 'by product ID' do
+        ex = api_expects(:repositories, :index) do |p|
+          p['name'] == 'repo1' && p['product_id'] == 3
+        end
+        ex.returns(index_response([{'id' => 1}]))
+
+        api_expects(:repositories, :reclaim_space) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository reclaim-space --name repo1 --product-id 3))
+      end
+    end
+
+    describe 'resolves product ID' do
+      it 'by requiring organization options' do
+        api_expects_no_call
+        result = run_cmd(%w(repository reclaim-space --name repo1 --product prod1))
+        assert(result.err[/--organization-id, --organization, --organization-label is required/],
+               "Organization option requirements must be validated")
+      end
+
+      it 'by organization ID' do
+        ex = api_expects(:products, :index) do |p|
+          p['name'] == 'prod3' && p['organization_id'] == '5'
+        end
+        ex.returns(index_response([{'id' => 3}]))
+
+        ex = api_expects(:repositories, :index) do |p|
+          p['name'] == 'repo1' && p['product_id'] == 3
+        end
+        ex.returns(index_response([{'id' => 1}]))
+
+        api_expects(:repositories, :reclaim_space) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository reclaim-space --name repo1 --product prod3 --organization-id 5
+                  ))
+      end
+
+      it 'by organization name' do
+        expect_organization_search('org5', 5)
+
+        ex = api_expects(:products, :index) do |p|
+          p['name'] == 'prod3' && p['organization_id'] == 5
+        end
+        ex.returns(index_response([{'id' => 3}]))
+
+        ex = api_expects(:repositories, :index) do |p|
+          p['name'] == 'repo1' && p['product_id'] == 3
+        end
+        ex.returns(index_response([{'id' => 1}]))
+
+        api_expects(:repositories, :reclaim_space) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository reclaim-space --name repo1 --product prod3 --organization org5
+                  ))
+      end
+
+      it 'by organization label' do
+        expect_organization_search('org5', 5, field: 'label')
+
+        ex = api_expects(:products, :index) do |p|
+          p['name'] == 'prod3' && p['organization_id'] == 5
+        end
+        ex.returns(index_response([{'id' => 3}]))
+
+        ex = api_expects(:repositories, :index) do |p|
+          p['name'] == 'repo1' && p['product_id'] == 3
+        end
+        ex.returns(index_response([{'id' => 1}]))
+
+        api_expects(:repositories, :reclaim_space) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository reclaim-space --name repo1 --product prod3 --organization-label org5
+                  ))
+      end
+    end
+  end
+end

data/test/functional/repository/upload_test.rb

@@ -17,10 +17,16 @@ describe 'upload repository' do
   let(:path) { "./test.rpm" }
   let(:upload_id) { "1234" }
   let(:_href) { "/pulp/api/v2/content/uploads/#{upload_id}" }
+  let(:task_id) { "2ea4f" }
   let(:upload_response) do
     {
       "upload_id" => upload_id,
-      "_href" => _href
+      "href" => _href
+    }
+  end
+  let(:import_uploads_response) do
+    {
+      "id" => task_id
     }
   end
 
@@ -36,7 +42,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.rpm',
@@ -47,14 +53,16 @@ describe 'upload repository' do
                       )
     # rubocop:enable LineLength
 
-    ex2.returns("")
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params('id' => upload_id, 'repository_id' => repo_id)
 
     ex3.returns("")
-
     result = run_cmd(@cmd + params)
+
     assert_equal(result.exit_code, 0)
     File.delete("test.rpm")
   end
@@ -70,7 +78,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :content_type => 'srpm',
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :content_type => 'srpm', :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.src.rpm',
@@ -79,9 +87,11 @@ describe 'upload repository' do
                          :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
                        }]
                       )
-
     # rubocop:enable LineLength
-    ex2.returns("")
+
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params(:id => upload_id, :repository_id => repo_id)
@@ -105,7 +115,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.src.rpm',
@@ -140,7 +150,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.rpm',
@@ -150,13 +160,20 @@ describe 'upload repository' do
                        }]
                       )
     # rubocop:enable LineLength
-    ex2.returns('output' => {'upload_results' => [{'type' => 'docker_manifest',
-                                                   'digest' => 'sha256:1234'}]})
 
-    ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+
+    ex3 = api_expects(:foreman_tasks, :show, 'Show task')
+    ex3.returns('id' => task_id, 'state' => 'stopped', 'progress' => 1,
+                'humanized' => {'output' => {'upload_results' => [{'type' => 'docker_manifest',
+                                                                   'digest' => 'sha256:1234'}]},
+                                'errors' => ''})
+
+    ex4 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params(:id => upload_id, :repository_id => repo_id)
 
-    ex3.returns("")
+    ex4.returns("")
 
     result = run_cmd(@cmd + params)
     assert_equal(result.exit_code, 0)
@@ -180,7 +197,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.rpm',
@@ -191,7 +208,9 @@ describe 'upload repository' do
                       )
     # rubocop:enable LineLength
 
-    ex2.returns("")
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params(:id => upload_id, :repository_id => repo_id)
@@ -212,10 +231,9 @@ describe 'upload repository' do
          .with_params(:repository_id => repo_id, :size => file.size)
 
     ex.returns(upload_response)
-
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.rpm',
@@ -225,8 +243,9 @@ describe 'upload repository' do
                        }]
                       )
     # rubocop:enable LineLength
-
-    ex2.returns("")
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params(:id => upload_id, :repository_id => repo_id)
@@ -253,7 +272,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex = api_expects(:repositories, :import_uploads, 'Take in an upload')
-         .with_params(:id => repo_id, :sync_capsule => false, :publish_repository => false,
+         .with_params(:id => repo_id, :sync_capsule => false, :publish_repository => false, :async => true,
                       :uploads => [{
                         :id => '1234',
                         :name => 'test1.rpm',
@@ -264,7 +283,9 @@ describe 'upload repository' do
                      )
     # rubocop:enable LineLength
 
-    ex.returns("")
+    ex.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex = api_expects(:content_uploads, :destroy, "Delete the upload")
          .with_params(:id => upload_id, :repository_id => repo_id)
@@ -280,7 +301,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex = api_expects(:repositories, :import_uploads, 'Take in an upload')
-         .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+         .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                       :uploads => [{
                         :id => '1234',
                         :name => 'test2.rpm',
@@ -291,7 +312,9 @@ describe 'upload repository' do
                      )
     # rubocop:enable LineLength
 
-    ex.returns("")
+    ex.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex = api_expects(:content_uploads, :destroy, "Delete the upload")
          .with_params(:id => upload_id, :repository_id => repo_id)

data/test/test_helper.rb

@@ -17,7 +17,7 @@ require 'minitest/spec'
 require 'mocha/minitest'
 require 'hammer_cli'
 
-KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.3')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.4')
 
 if HammerCLI.context[:api_connection]
   HammerCLI.context[:api_connection].create('foreman') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -220,6 +220,7 @@ files:
 - lib/hammer_cli_katello/content_export_incremental.rb
 - lib/hammer_cli_katello/content_import.rb
 - lib/hammer_cli_katello/content_override.rb
+- lib/hammer_cli_katello/content_units.rb
 - lib/hammer_cli_katello/content_view.rb
 - lib/hammer_cli_katello/content_view_component.rb
 - lib/hammer_cli_katello/content_view_name_resolvable.rb
@@ -262,7 +263,6 @@ files:
 - lib/hammer_cli_katello/option_sources/lifecycle_environment_params.rb
 - lib/hammer_cli_katello/organization.rb
 - lib/hammer_cli_katello/organization_options.rb
-- lib/hammer_cli_katello/ostree_branch.rb
 - lib/hammer_cli_katello/output/fields.rb
 - lib/hammer_cli_katello/output/formatters.rb
 - lib/hammer_cli_katello/package.rb
@@ -318,6 +318,7 @@ files:
 - test/data/4.0/foreman_api.json
 - test/data/4.1/foreman_api.json
 - test/data/4.3/foreman_api.json
+- test/data/4.4/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -358,6 +359,8 @@ files:
 - test/functional/content_import/list_test.rb
 - test/functional/content_import/metadata.json
 - test/functional/content_import/version_test.rb
+- test/functional/content_units/info_test.rb
+- test/functional/content_units/list_test.rb
 - test/functional/content_view/add_content_view_version_test.rb
 - test/functional/content_view/add_repository_test.rb
 - test/functional/content_view/component/add_test.rb
@@ -460,6 +463,7 @@ files:
 - test/functional/repository/delete_test.rb
 - test/functional/repository/info_test.rb
 - test/functional/repository/list_test.rb
+- test/functional/repository/reclaim_space_test.rb
 - test/functional/repository/remove_content_test.rb
 - test/functional/repository/repository_helpers.rb
 - test/functional/repository/synchronize_test.rb
@@ -535,6 +539,7 @@ test_files:
 - test/data/4.0/foreman_api.json
 - test/data/4.1/foreman_api.json
 - test/data/4.3/foreman_api.json
+- test/data/4.4/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -575,6 +580,8 @@ test_files:
 - test/functional/content_import/list_test.rb
 - test/functional/content_import/metadata.json
 - test/functional/content_import/version_test.rb
+- test/functional/content_units/info_test.rb
+- test/functional/content_units/list_test.rb
 - test/functional/content_view/add_content_view_version_test.rb
 - test/functional/content_view/add_repository_test.rb
 - test/functional/content_view/component/add_test.rb
@@ -677,6 +684,7 @@ test_files:
 - test/functional/repository/delete_test.rb
 - test/functional/repository/info_test.rb
 - test/functional/repository/list_test.rb
+- test/functional/repository/reclaim_space_test.rb
 - test/functional/repository/remove_content_test.rb
 - test/functional/repository/repository_helpers.rb
 - test/functional/repository/synchronize_test.rb

data/lib/hammer_cli_katello/ostree_branch.rb

@@ -1,34 +0,0 @@
-module HammerCLIKatello
-  class OstreeBranchCommand < HammerCLIKatello::Command
-    resource :ostree_branches
-
-    class ListCommand < HammerCLIKatello::ListCommand
-      extend RepositoryScopedToProduct
-
-      validate_repo_name_requires_product_options(:option_repository_name)
-
-      output do
-        field :id, _("Id")
-        field :name, _("Name")
-        field :version, _("version")
-      end
-
-      build_options do |o|
-        o.expand.including(:products, :organizations, :content_views)
-      end
-    end
-
-    class InfoCommand < HammerCLIKatello::InfoCommand
-      output do
-        field :id, _("Id")
-        field :name, _("Name")
-        field :version, _("Version")
-        field :commit, _("Commit")
-      end
-
-      build_options
-    end
-
-    autoload_subcommands
-  end
-end