hammer_cli_katello 0.21.0 → 0.23.1

data/test/functional/ping_test.rb

@@ -8,7 +8,9 @@ describe 'ping' do
         'foreman_tasks' => {'status' => 'ok', 'duration_ms' => '34'},
         'foreman_auth' => {'status' => 'ok', 'duration_ms' => '34'},
         'candlepin' => {'status' => 'ok', 'duration_ms' => '34'},
+        'candlepin_events' => {'status' => 'ok', 'message' => '0 messages', 'duration_ms' => '34'},
         'candlepin_auth' => {'status' => 'ok', 'duration_ms' => '34'},
+        'katello_events' => {'status' => 'ok', 'message' => '0 messages', 'duration_ms' => '34'},
         'pulp' => {'status' => 'ok', 'duration_ms' => '34'},
         'pulp_auth' => {'status' => 'ok', 'duration_ms' => '34'}
       }

data/test/functional/repository/create_test.rb

@@ -48,36 +48,4 @@ describe "create repository" do
 
     assert_equal(0, run_cmd(command).exit_code)
   end
-
-  it 'shows deprecation warning on puppet content type' do
-    dep_warning = "Puppet and OSTree will no longer be supported in Katello 3.16\nRepository created.\n" # rubocop:disable LineLength
-
-    api_expects(:repositories, :create)
-      .with_params(
-        name: name,
-        product_id: product_id,
-        content_type: "puppet")
-
-    result = run_cmd(%w(repository create --organization-id 1 --product-id 2
-                        --content-type puppet --name repo1))
-
-    assert_equal(dep_warning, result.out)
-    assert_equal(HammerCLI::EX_OK, result.exit_code)
-  end
-
-  it 'shows deprecation warning on ostree content type' do
-    dep_warning = "Puppet and OSTree will no longer be supported in Katello 3.16\nRepository created.\n" # rubocop:disable LineLength
-
-    api_expects(:repositories, :create)
-      .with_params(
-        name: name,
-        product_id: product_id,
-        content_type: "ostree")
-
-    result = run_cmd(%w(repository create --organization-id 1 --product-id 2
-                        --content-type ostree --name repo1))
-
-    assert_equal(dep_warning, result.out)
-    assert_equal(HammerCLI::EX_OK, result.exit_code)
-  end
 end

data/test/functional/repository/info_test.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 require File.join(File.dirname(__FILE__), '../product/product_helpers')
 require File.join(File.dirname(__FILE__), './repository_helpers')
+require 'hammer_cli_katello/associating_commands'
 
 describe "get repository info" do
   include ProductHelpers
@@ -10,37 +11,146 @@ describe "get repository info" do
     @cmd = %w(repository info)
   end
 
-  let(:org_id) { 1 }
-  let(:product_id) { 2 }
-  let(:repo_id) { 3 }
-
-  it "Shows information about a repository" do
-    params = ["--id=#{repo_id}"]
-
-    ex = api_expects(:repositories, :show, "Get info") do |par|
-      par["id"] == repo_id
-    end
-
-    ex.returns({})
-
+  it "shows repository info by id" do
+    params = ['--id=1']
+    ex = api_expects(:repositories, :show, "Get info")
+    ex.returns(
+      'id' => 1,
+      'name' => 'Test Repo',
+      'label' => 'Test_Repo',
+      'description' => 'hammertime',
+      'organization' => {
+        'name' => 'Default Organization',
+        'label' => 'Default_Organization',
+        'id' => 1
+      },
+      'created_at' => '2020-08-05 15:35:36 UTC',
+      'updated_at' => '2020-08-05 15:35:36 UTC',
+      'content_type' => 'yum',
+      'product' => {
+        'id' => 79,
+        'name' => 'test'
+      },
+      'download_policy' => 'immediate',
+      'unprotected' => true,
+      'last_sync_words' => '3 minutes',
+      'mirror_on_sync' => true,
+      'relative_path' => 'Default_Organization/Library/Test_Repo',
+      'content_counts' => {
+        'rpm' => 1,
+        'srpm' => 0,
+        'package_group' => 0,
+        'erratum' => 1,
+        'module_stream' => 0
+      }
+    )
     result = run_cmd(@cmd + params)
-    assert_equal(result.exit_code, 0)
+    # rubocop:disable Style/WordArray
+    expected_fields = [['ID', '1'],
+                       ['Name', 'Test Repo'],
+                       ['Label', 'Test_Repo'],
+                       ['Description', 'hammertime'],
+                       ['Organization', 'Default Organization'],
+                       ['Red Hat Repository', 'no'],
+                       ['Content Type', 'yum'],
+                       ['Mirror on Sync', 'yes'],
+                       ['Publish Via HTTP', 'yes'],
+                       ['Relative Path', 'Default_Organization/Library/Test_Repo'],
+                       ['Download Policy', 'immediate'],
+                       ['HTTP Proxy', ''],
+                       ['Product', ''],
+                       ['ID', '79'],
+                       ['Name', 'test'],
+                       ['GPG Key', ''],
+                       ['Sync', ''],
+                       ['Status', 'Not Synced'],
+                       ['Last Sync Date', '3 minutes'],
+                       ['Created', '2020/08/05 15:35:36'],
+                       ['Updated', '2020/08/05 15:35:36'],
+                       ['Content Counts', ''],
+                       ['Packages', '1'],
+                       ['Source RPMS', '0'],
+                       ['Package Groups', '0'],
+                       ['Errata', '1'],
+                       ['Module Streams', '0']]
+    # rubocop:enable Style/WordArray
+    expected_results = expected_fields.map { |field| success_result(FieldMatcher.new(*field)) }
+    expected_results.each { |expected|  assert_cmd(expected, result) }
   end
 
   it "Shows information about a repository with organization-id and product name" do
-    params = ["--name=test_repo", "--product=test_product", "--organization-id=#{org_id}"]
-
-    expect_product_search(org_id, 'test_product', product_id)
+    org_id = 1
+    product_id = 2
+    repo_id = 3
+    params = ["--name=Test_Repo", "--product=Test_Product", "--organization-id=1"]
 
-    expect_repository_search(product_id, 'test_repo', repo_id)
+    expect_product_search(org_id, 'Test_Product', product_id)
 
-    ex2 = api_expects(:repositories, :show, "Get info") do |par|
-      par["id"] == repo_id
-    end
+    expect_repository_search(product_id, 'Test_Repo', repo_id)
 
-    ex2.returns({})
+    ex = api_expects(:repositories, :show, "Get info")
 
+    ex.returns(
+      'id' => 1,
+      'name' => 'Test Repo',
+      'label' => 'Test_Repo',
+      'description' => 'hammertime',
+      'organization' => {
+        'name' => 'Default Organization',
+        'label' => 'Default_Organization',
+        'id' => 1
+      },
+      'created_at' => '2020-08-05 15:35:36 UTC',
+      'updated_at' => '2020-08-05 15:35:36 UTC',
+      'content_type' => 'yum',
+      'product' => {
+        'id' => 79,
+        'name' => 'Test_Product'
+      },
+      'download_policy' => 'immediate',
+      'unprotected' => true,
+      'last_sync_words' => '3 minutes',
+      'mirror_on_sync' => true,
+      'relative_path' => 'Default_Organization/Library/Test_Repo',
+      'content_counts' => {
+        'rpm' => 1,
+        'srpm' => 0,
+        'package_group' => 0,
+        'erratum' => 1,
+        'module_stream' => 0
+      }
+    )
     result = run_cmd(@cmd + params)
-    assert_equal(result.exit_code, 0)
+    # rubocop:disable Style/WordArray
+    expected_fields = [['ID', '1'],
+                       ['Name', 'Test Repo'],
+                       ['Label', 'Test_Repo'],
+                       ['Description', 'hammertime'],
+                       ['Organization', 'Default Organization'],
+                       ['Red Hat Repository', 'no'],
+                       ['Content Type', 'yum'],
+                       ['Mirror on Sync', 'yes'],
+                       ['Publish Via HTTP', 'yes'],
+                       ['Relative Path', 'Default_Organization/Library/Test_Repo'],
+                       ['Download Policy', 'immediate'],
+                       ['HTTP Proxy', ''],
+                       ['Product', ''],
+                       ['ID', '79'],
+                       ['Name', 'Test_Product'],
+                       ['GPG Key', ''],
+                       ['Sync', ''],
+                       ['Status', 'Not Synced'],
+                       ['Last Sync Date', '3 minutes'],
+                       ['Created', '2020/08/05 15:35:36'],
+                       ['Updated', '2020/08/05 15:35:36'],
+                       ['Content Counts', ''],
+                       ['Packages', '1'],
+                       ['Source RPMS', '0'],
+                       ['Package Groups', '0'],
+                       ['Errata', '1'],
+                       ['Module Streams', '0']]
+    # rubocop:enable Style/WordArray
+    expected_results = expected_fields.map { |field| success_result(FieldMatcher.new(*field)) }
+    expected_results.each { |expected|  assert_cmd(expected, result) }
   end
 end

data/test/functional/repository/update_test.rb

@@ -2,7 +2,7 @@ require_relative '../test_helper'
 require_relative '../organization/organization_helpers'
 require 'hammer_cli_katello/repository'
 
-module HammerCLIKatello
+module HammerCLIKatello # rubocop:disable Metrics/ModuleLength
   describe Repository::UpdateCommand do
     include OrganizationHelpers
 
@@ -14,6 +14,46 @@ module HammerCLIKatello
       run_cmd(%w(repository update --id 1 --new-name rep1))
     end
 
+    describe 'tags docker images' do
+      let(:repo_id) { 3 }
+      let(:tag_name) { "latest" }
+      let(:digest) { "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }
+      let(:upload_id) { "1234" }
+      let(:_href) { "/pulp/api/v2/content/uploads/#{upload_id}" }
+      let(:upload_response) do
+        {
+          "upload_id" => upload_id,
+          "_href" => _href
+        }
+      end
+      it "adds a tag to an image" do
+        ex = api_expects(:content_uploads, :create)
+             .with_params('repository_id' => repo_id, :size => 0)
+
+        ex.returns(upload_response)
+        ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
+              .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+                           :uploads => [{
+                             :id => '1234',
+                             :name => tag_name,
+                             :digest => digest
+                           }],
+                           :content_type => "docker_tag"
+                          )
+
+        ex2.returns("")
+
+        ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
+              .with_params('id' => upload_id, 'repository_id' => repo_id)
+
+        ex3.returns("")
+        # rubocop:disable LineLength
+        result = run_cmd(%W(repository update --id #{repo_id} --docker-tag #{tag_name} --docker-digest #{digest}))
+        # rubocop:enable LineLength
+        assert_equal(result.exit_code, 0)
+      end
+    end
+
     describe 'resolves repository ID' do
       it 'by requiring product' do
         api_expects_no_call

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'] || '3.15')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.17')
 
 if HammerCLI.context[:api_connection]
   HammerCLI.context[:api_connection].create('foreman') do

data/test/unit/search_options_creators_test.rb

@@ -110,6 +110,12 @@ describe HammerCLIKatello::SearchOptionsCreators do
       end
     end
 
+    describe '#create_usergroups_search_options(options)' do
+      it 'does not use the katello api' do
+        search_options_creators.create_usergroups_search_options(:anything)
+      end
+    end
+
     describe '#create_compute_profiles_search_options(options, mode = nil)' do
       it 'does not use the katello api' do
         search_options_creators.create_compute_profiles_search_options(:anything)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Adam Price
@@ -35,22 +35,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman_tasks
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,7 @@ files:
 - lib/hammer_cli_katello/content_view_purge.rb
 - lib/hammer_cli_katello/content_view_version.rb
 - lib/hammer_cli_katello/cv_import_export_helper.rb
+- lib/hammer_cli_katello/deb_package.rb
 - lib/hammer_cli_katello/erratum.rb
 - lib/hammer_cli_katello/erratum_info_command.rb
 - lib/hammer_cli_katello/exception_handler.rb
@@ -262,12 +263,14 @@ files:
 - lib/hammer_cli_katello/host_collection_package.rb
 - lib/hammer_cli_katello/host_collection_package_group.rb
 - lib/hammer_cli_katello/host_content_source_options.rb
+- lib/hammer_cli_katello/host_deb.rb
 - lib/hammer_cli_katello/host_errata.rb
 - lib/hammer_cli_katello/host_extensions.rb
 - lib/hammer_cli_katello/host_kickstart_repository_options.rb
 - lib/hammer_cli_katello/host_package.rb
 - lib/hammer_cli_katello/host_package_group.rb
 - lib/hammer_cli_katello/host_subscription.rb
+- lib/hammer_cli_katello/host_traces.rb
 - lib/hammer_cli_katello/hostgroup.rb
 - lib/hammer_cli_katello/hostgroup_extensions.rb
 - lib/hammer_cli_katello/i18n.rb
@@ -324,6 +327,8 @@ files:
 - test/data/3.13/foreman_api.json
 - test/data/3.14/foreman_api.json
 - test/data/3.15/foreman_api.json
+- test/data/3.16/foreman_api.json
+- test/data/3.17/foreman_api.json
 - test/data/3.2/foreman_api.json
 - test/data/3.4/foreman_api.json
 - test/data/3.5/foreman_api.json
@@ -420,6 +425,7 @@ files:
 - test/functional/host/subscription/register_test.rb
 - test/functional/host/subscription/remove_test.rb
 - test/functional/host/subscription/unregister_test.rb
+- test/functional/host/traces/list_test.rb
 - test/functional/host_collection/add_host_test.rb
 - test/functional/host_collection/content_api_expectations.rb
 - test/functional/host_collection/content_install_test.rb
@@ -512,8 +518,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer
@@ -526,6 +531,8 @@ test_files:
 - test/data/3.13/foreman_api.json
 - test/data/3.14/foreman_api.json
 - test/data/3.15/foreman_api.json
+- test/data/3.16/foreman_api.json
+- test/data/3.17/foreman_api.json
 - test/data/3.2/foreman_api.json
 - test/data/3.4/foreman_api.json
 - test/data/3.5/foreman_api.json
@@ -622,6 +629,7 @@ test_files:
 - test/functional/host/subscription/register_test.rb
 - test/functional/host/subscription/remove_test.rb
 - test/functional/host/subscription/unregister_test.rb
+- test/functional/host/traces/list_test.rb
 - test/functional/host_collection/add_host_test.rb
 - test/functional/host_collection/content_api_expectations.rb
 - test/functional/host_collection/content_install_test.rb