hammer_cli_katello 1.11.2 → 1.13.0

data/locale/zh_TW/hammer-cli-katello.po

@@ -11,7 +11,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.11.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"
@@ -2137,96 +2137,3 @@ msgstr "同步計劃已刪除"
 
 msgid "Could not destroy the sync plan"
 msgstr "無法刪除同步計劃"
-
-msgid "Refresh all alternate content sources"
-msgstr ""
-
-msgid "Successfully refreshed all alternate content sources"
-msgstr ""
-
-msgid "Could not refresh all alternate content sources"
-msgstr ""
-
-msgid "Refresh alternate content sources"
-msgstr ""
-
-msgid "Successfully refreshed specified alternate content sources"
-msgstr ""
-
-msgid "Could not refresh the specified alternate content sources"
-msgstr ""
-
-msgid "Destroy alternate content sources"
-msgstr ""
-
-msgid "Sucessfully destroyed specified alternate content sources"
-msgstr ""
-
-msgid "Could not destroy the specified alternate content sources"
-msgstr ""
-
-msgid "Capsule reclaim space has been started in task %{id}."
-msgstr ""
-
-msgid "Capsule reclaim space was unsuccessful."
-msgstr ""
-
-msgid "Capsule content counts are being updated in task %{id}."
-msgstr ""
-
-msgid "Could not update capsule content counts"
-msgstr ""
-
-msgid "SRPMs"
-msgstr ""
-
-msgid "Debian Packages"
-msgstr ""
-
-msgid "Container Tags"
-msgstr ""
-
-msgid "Container Manifests"
-msgstr ""
-
-msgid "Container Manifest Lists"
-msgstr ""
-
-msgid "Ansible Collections"
-msgstr ""
-
-msgid "OSTree Refs"
-msgstr ""
-
-msgid "Python Packages"
-msgstr ""
-
-msgid "Content view must be synced to see content counts"
-msgstr ""
-
-msgid "Original packages"
-msgstr ""
-
-msgid "Original module streams"
-msgstr ""
-
-msgid "UUID"
-msgstr ""
-
-msgid "Module stream Id"
-msgstr ""
-
-msgid "Content view filter Id"
-msgstr ""
-
-msgid "Errata Id"
-msgstr ""
-
-msgid "Date type"
-msgstr ""
-
-msgid "Start date"
-msgstr ""
-
-msgid "End date"
-msgstr ""

data/test/functional/acs/create_test.rb

@@ -1,11 +1,11 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 
-describe 'create content-credentials' do
+describe 'create alternate content source' do
   before do
     @cmd = %w(alternate-content-source create)
   end
 
-  let(:name) { 'pizza' }
+  let(:acs_name) { 'pizza' }
   let(:url) { 'http://proxy.example.com' }
   let(:acs_type) { 'custom' }
   let(:acs_content) { 'yum' }
@@ -14,7 +14,7 @@ describe 'create content-credentials' do
   let(:subpaths) { ['test/repo1/'] }
 
   it 'Creates an ACS' do
-    params = ["--name=#{name}", "--alternate-content-source-type=#{acs_type}",
+    params = ["--name=#{acs_name}", "--alternate-content-source-type=#{acs_type}",
               "--base-url=#{url}", "--content-type=#{acs_content}", "--verify-ssl=#{verify_ssl}",
               "--smart-proxy-ids=#{proxy_id}", "--subpaths=#{subpaths}"]
 

data/test/functional/content_credentials/create_test.rb

@@ -3,11 +3,11 @@ require File.join(File.dirname(__FILE__), '../test_helper')
 describe 'create content-credentials' do
   before do
     @cmd = %w(content-credentials create)
-    @base_params = ["--organization-id=#{org_id}", "--name=#{name}"]
+    @base_params = ["--organization-id=#{org_id}", "--name=#{cred_name}"]
   end
 
   let(:org_id) { 1 }
-  let(:name) { 'sslcert' }
+  let(:cred_name) { 'sslcert' }
   let(:cert) { File.join(File.dirname(__FILE__), 'data', 'test_cert.json') }
 
   it 'Creates a SSL Content Credential' do

data/test/functional/content_export/complete/repository_test.rb

@@ -40,7 +40,7 @@ describe 'content-export complete repository' do
   let(:product_id) { '77' }
   let(:repository_id) { '1001' }
 
-  let(:name) { 'repo' }
+  let(:repo_name) { 'repo' }
 
   it "performs export with required options and async" do
     params = [
@@ -111,7 +111,7 @@ describe 'content-export complete repository' do
   end
 
   it 'fails on missing product missing org' do
-    params = ["--product=lol", "--name=#{name}"]
+    params = ["--product=lol", "--name=#{repo_name}"]
     result = run_cmd(@cmd + params)
     expected_error = "At least one of options --organization-id,"\
                         " --organization, --organization-label is required"
@@ -122,13 +122,13 @@ describe 'content-export complete repository' do
 
   it 'correctly resolves product_id and repository name' do
     params = ["--product-id=#{product_id}",
-              "--name=#{name}",
+              "--name=#{repo_name}",
               "--async"]
     expects_repository(repository_id, default_repository_options)
 
     cvv_expect = api_expects(:repositories, :index) do |p|
       assert_equal p['product_id'].to_s, product_id.to_s
-      assert_equal p["name"], name
+      assert_equal p["name"], repo_name
     end
 
     cvv_expect.at_least_once.
@@ -203,11 +203,11 @@ describe 'content-export complete repository' do
 
   it 'should accept product and get the right repository' do
     params = ["--product-id=#{product_id}",
-              "--name=#{name}"]
-    expect_repository_search(product_id.to_i, name, repository_id).at_least_once
+              "--name=#{repo_name}"]
+    expect_repository_search(product_id.to_i, repo_name, repository_id).at_least_once
     repo_search = api_expects(:repositories, :index, 'Find a repository') do |p|
       assert_equal p["product_id"].to_s, product_id.to_s
-      assert_equal p["name"], name
+      assert_equal p["name"], repo_name
     end
     repo_search.returns(index_response([{'id' => repository_id}]))
 

data/test/functional/content_export/incremental/repository_test.rb

@@ -42,7 +42,7 @@ describe 'content-export incremental version' do
   let(:product_id) { '77' }
   let(:repository_id) { 100 }
 
-  let(:name) { 'great' }
+  let(:repo_name) { 'great' }
 
   it "performs export with required options and async" do
     params = [
@@ -120,13 +120,13 @@ describe 'content-export incremental version' do
 
   it 'correctly resolves product_id and repository name' do
     params = ["--product-id=#{product_id}",
-              "--name=#{name}",
+              "--name=#{repo_name}",
               "--async"]
     expects_repository(repository_id, default_repository_options)
 
     cvv_expect = api_expects(:repositories, :index) do |p|
       assert_equal p['product_id'].to_s, product_id.to_s
-      assert_equal p["name"], name
+      assert_equal p["name"], repo_name
     end
 
     cvv_expect.at_least_once.
@@ -157,7 +157,7 @@ describe 'content-export incremental version' do
   end
 
   it 'fails on missing product missing org' do
-    params = ["--product=lol", "--name=#{name}"]
+    params = ["--product=lol", "--name=#{repo_name}"]
     result = run_cmd(@cmd + params)
     expected_error = "At least one of options --organization-id,"\
                       " --organization, --organization-label is required"
@@ -168,13 +168,13 @@ describe 'content-export incremental version' do
 
   it 'correctly resolves product_id and repository name' do
     params = ["--product-id=#{product_id}",
-              "--name=#{name}",
+              "--name=#{repo_name}",
               "--async"]
     expects_repository(repository_id, default_repository_options)
 
     cvv_expect = api_expects(:repositories, :index) do |p|
       assert_equal p['product_id'].to_s, product_id.to_s
-      assert_equal p["name"], name
+      assert_equal p["name"], repo_name
     end
 
     cvv_expect.at_least_once.

data/test/functional/content_import/library_test.rb

@@ -21,7 +21,7 @@ describe 'content-import library' do
     File.dirname(__FILE__)
   end
 
-  let(:metadata) do
+  let(:metadata_json) do
     JSON.parse(File.read("#{path}/metadata.json"))
   end
 
@@ -34,7 +34,8 @@ describe 'content-import library' do
       '--async'
     ]
     api_expects(:content_imports, :library)
-      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
+      .with_params('organization_id' => organization_id, 'path' => path,
+                   'metadata' => metadata_json)
       .returns(response)
 
     result = run_cmd(@cmd + params)
@@ -50,7 +51,8 @@ describe 'content-import library' do
     ]
 
     api_expects(:content_imports, :library)
-      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
+      .with_params('organization_id' => organization_id, 'path' => path,
+                   'metadata' => metadata_json)
       .returns(response)
 
     expect_foreman_task(task_id)

data/test/functional/content_import/version_test.rb

@@ -21,7 +21,7 @@ describe 'content-import version' do
     File.dirname(__FILE__)
   end
 
-  let(:metadata) do
+  let(:metadata_json) do
     JSON.parse(File.read("#{path}/metadata.json"))
   end
 
@@ -34,7 +34,8 @@ describe 'content-import version' do
       '--async'
     ]
     api_expects(:content_imports, :version)
-      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
+      .with_params('organization_id' => organization_id, 'path' => path,
+                   'metadata' => metadata_json)
       .returns(response)
 
     result = run_cmd(@cmd + params)
@@ -50,7 +51,8 @@ describe 'content-import version' do
     ]
 
     api_expects(:content_imports, :version)
-      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
+      .with_params('organization_id' => organization_id, 'path' => path,
+                   'metadata' => metadata_json)
       .returns(response)
 
     expect_foreman_task(task_id)

data/test/functional/content_view/component/add_test.rb

@@ -5,11 +5,11 @@ module HammerCLIKatello
   describe ContentViewComponent::AddComponents do
     before do
       @cmd = %w(content-view component add)
-      @composite = OpenStruct.new(:id => 2, :name => "composite")
-      @component_version = OpenStruct.new(:id => 666, :version => "1.0")
-      @component = OpenStruct.new(:id => 6, :name => "component",
+      @composite = ::OpenStruct.new(:id => 2, :name => "composite")
+      @component_version = ::OpenStruct.new(:id => 666, :version => "1.0")
+      @component = ::OpenStruct.new(:id => 6, :name => "component",
                                   :content_view_version => @component_version)
-      @organization = OpenStruct.new(:id => 1, :name => "great", :label => "label")
+      @organization = ::OpenStruct.new(:id => 1, :name => "great", :label => "label")
     end
 
     def setup_org_expectations

data/test/functional/content_view/component/remove_test.rb

@@ -5,18 +5,18 @@ module HammerCLIKatello
     before do
       @cmd = %w(content-view component remove)
 
-      @component = OpenStruct.new(:id => 6, :name => "component")
-      @component2 = OpenStruct.new(:id => 7, :name => "component2")
+      @component = ::OpenStruct.new(:id => 6, :name => "component")
+      @component2 = ::OpenStruct.new(:id => 7, :name => "component2")
 
-      @content_view_component = OpenStruct.new(:id => 1444,
+      @content_view_component = ::OpenStruct.new(:id => 1444,
                                                :content_view => @component)
 
-      @content_view_component2 = OpenStruct.new(:id => 1445,
+      @content_view_component2 = ::OpenStruct.new(:id => 1445,
                                                 :content_view => @component2)
 
-      @composite = OpenStruct.new(:id => 2, :name => "composite",
+      @composite = ::OpenStruct.new(:id => 2, :name => "composite",
                                   :content_view_components => [@content_view_component])
-      @organization = OpenStruct.new(:id => 1, :name => "great", :label => "label")
+      @organization = ::OpenStruct.new(:id => 1, :name => "great", :label => "label")
       @content_view_components = [@content_view_component, @content_view_component2]
     end
 

data/test/functional/content_view/component/update_test.rb

@@ -5,16 +5,16 @@ module HammerCLIKatello
   describe ContentViewComponent::UpdateCommand do
     before do
       @cmd = %w(content-view component update)
-      @component_version = OpenStruct.new(:id => 666, :version => "1.0")
-      @component = OpenStruct.new(:id => 6, :name => "component",
+      @component_version = ::OpenStruct.new(:id => 666, :version => "1.0")
+      @component = ::OpenStruct.new(:id => 6, :name => "component",
                                   :content_view_version => @component_version)
-      @content_view_component = OpenStruct.new(:id => 1444,
+      @content_view_component = ::OpenStruct.new(:id => 1444,
                                                :content_view => @component,
                                                :content_view_version => @component_version)
 
-      @composite = OpenStruct.new(:id => 2, :name => "composite",
+      @composite = ::OpenStruct.new(:id => 2, :name => "composite",
                                   :content_view_components => [@content_view_component])
-      @organization = OpenStruct.new(:id => 1, :name => "great", :label => "label")
+      @organization = ::OpenStruct.new(:id => 1, :name => "great", :label => "label")
     end
 
     def setup_org_expectations

data/test/functional/content_view/create_test.rb

@@ -3,10 +3,10 @@ require_relative '../test_helper'
 describe 'content-view create' do
   before do
     @cmd = %w(content-view create)
-    @base_params = ["--organization-id=#{org_id}", "--name=#{name}"]
+    @base_params = ["--organization-id=#{org_id}", "--name=#{cv_name}"]
   end
   let(:error_heading) { "Could not create the content view" }
-  let(:name) { 'test-cv' }
+  let(:cv_name) { 'test-cv' }
   let(:org_id) { 1 }
   let(:repositories) do
     [
@@ -22,7 +22,7 @@ describe 'content-view create' do
     params = %W(--repository-ids=#{ids.join(',')})
 
     api_expects(:content_views, :create, 'Create content view') do |par|
-      par['name'] == name &&
+      par['name'] == cv_name &&
         par['repository_ids'] == ids &&
         par['organization_id'] == org_id
     end

data/test/functional/organization/info_test.rb

@@ -11,20 +11,6 @@ describe HammerCLIKatello::Organization::InfoCommand do
     { "type" => 'network_sync' }
   end
 
-  it "includes simple content access attributes" do
-    org_id = 2
-    params = ["--id=#{org_id}"]
-    api_expects(:organizations, :index).returns(index_response([{'id' => org_id}]))
-
-    api_expects(:organizations, :show)
-      .with_params('id' => org_id.to_s)
-      .returns("simple_content_access" => true, "id" => org_id,
-               "cdn_configuration" => cdn_configuration)
-    result = run_cmd(@cmd + params)
-    expected = success_result(FieldMatcher.new('Simple Content Access', 'Enabled'))
-    assert_cmd(expected, result)
-  end
-
   it "includes cdn configuration attributes" do
     org_id = 2
     params = ["--id=#{org_id}"]

data/test/functional/product/{update_proxy.rb → update_proxy_test.rb}

@@ -9,9 +9,8 @@ describe 'update an http proxy on a product' do
 
   let(:sync_response) do
     {
-      'id' => 1,
-      'state' => 'planned',
-      'action' => 'Update http proxy'
+      'id' => '1',
+      'state' => 'planned'
     }
   end
 
@@ -23,8 +22,8 @@ describe 'update an http proxy on a product' do
     ]
 
     ex = api_expects(:products_bulk_actions, :update_http_proxy, 'update an http-proxy')
-         .with_params('ids' => '1', 'http_proxy_policy' => 'use_selected_http_proxy',
-                      'http_proxy_id' => '1')
+         .with_params("ids" => [1], "http_proxy_policy" => "use_selected_http_proxy",
+                      "http_proxy_id" => 1)
     ex.returns(sync_response)
 
     expect_foreman_task('3')
@@ -34,15 +33,10 @@ describe 'update an http proxy on a product' do
   end
 
   it 'fails with missing required params' do
-    params = ['--proxy-id=1']
-
-    ex = api_expects(:products_bulk_actions, :update_http_proxy, 'update an http-proxy')
-         .with_params('proxy_id' => '1')
-    ex.returns(
-      'proxy_id' => '1'
-    )
-
+    params = ['--http-proxy-id=1']
+    api_expects_no_call
     result = run_cmd(@cmd + params)
-    assert_equal(result.exit_code, 70)
+    assert(result.err[/--ids is required/],
+       "ids requirements must be validated")
   end
 end

data/test/functional/product/verify_checksum_test.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__), '../test_helper')
+
+describe 'verify checksum on a product' do
+  include ForemanTaskHelpers
+
+  before do
+    @cmd = %w(product verify-checksum)
+  end
+
+  let(:sync_response) do
+    {
+      'id' => '1',
+      'state' => 'planned'
+    }
+  end
+
+  it 'verifies products ' do
+    params = [
+      '--ids=1'
+    ]
+
+    ex = api_expects(:products_bulk_actions, :verify_checksum_products, 'verify checksum')
+         .with_params('ids' => [1])
+    ex.returns(sync_response)
+
+    expect_foreman_task('3')
+
+    result = run_cmd(@cmd + params)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
+end

data/test/functional/repository/create_test.rb

@@ -3,18 +3,18 @@ require_relative '../test_helper'
 describe "create repository" do
   let(:org_id) { 1 }
   let(:product_id) { 2 }
-  let(:name) { "repo1" }
+  let(:repo_name) { "repo1" }
   let(:content_type) { "yum" }
 
   it 'with basic options' do
     api_expects(:repositories, :create)
       .with_params(
-        name: name,
+        name: repo_name,
         product_id: product_id,
         content_type: content_type)
 
     command = %W(repository create --organization-id #{org_id} --product-id #{product_id}
-                 --content-type #{content_type} --name #{name})
+                 --content-type #{content_type} --name #{repo_name})
 
     assert_equal(0, run_cmd(command).exit_code)
   end

data/test/functional/repository/info_test.rb

@@ -69,7 +69,7 @@ describe "get repository info" do
                        ['Updated', '2020/08/05 15:35:36'],
                        ['Content Counts', ''],
                        ['Packages', '1'],
-                       ['Source RPMS', '0'],
+                       ['SRPMs', '0'],
                        ['Package Groups', '0'],
                        ['Errata', '1'],
                        ['Module Streams', '0']]
@@ -145,7 +145,7 @@ describe "get repository info" do
                        ['Updated', '2020/08/05 15:35:36'],
                        ['Content Counts', ''],
                        ['Packages', '1'],
-                       ['Source RPMS', '0'],
+                       ['SRPMs', '0'],
                        ['Package Groups', '0'],
                        ['Errata', '1'],
                        ['Module Streams', '0']]

data/test/functional/repository/verify_checksum_test.rb

@@ -0,0 +1,105 @@
+require_relative '../test_helper'
+require_relative '../organization/organization_helpers'
+require 'hammer_cli_katello/repository'
+module HammerCLIKatello
+  describe Repository::VerifyChecksum do
+    include OrganizationHelpers
+    it 'allows minimal options' do
+      api_expects(:repositories, :verify_checksum) do |p|
+        p['id'] == 1
+      end
+      run_cmd(%w(repository verify-checksum --id 1))
+    end
+
+    describe 'resolves repository ID' do
+      it 'by requiring product' do
+        api_expects_no_call
+        result = run_cmd(%w(repository verify-checksum --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, :verify_checksum) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository verify-checksum --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 verify-checksum --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, :verify_checksum) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository verify-checksum --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, :verify_checksum) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository verify-checksum --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, :verify_checksum) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository verify-checksum --name repo1 --product prod3 --organization-label org5
+                  ))
+      end
+    end
+  end
+end