hammer_cli_katello 0.23.2 → 0.24.4

data/test/functional/content_export/list_test.rb

@@ -0,0 +1,64 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+require 'hammer_cli_katello/content_export'
+
+describe 'content-export list' do
+  let(:empty_response) do
+    {
+      "total" => 0,
+      "subtotal" => 0,
+      "page" => "1",
+      "per_page" => "1000",
+      "error" => nil,
+      "search" => nil,
+      "sort" => {
+        "by" => nil,
+        "order" => nil
+      },
+      "results" => []
+    }
+  end
+
+  it 'allows minimal options' do
+    ex = api_expects(:content_exports, :index)
+
+    ex.returns(empty_response)
+    # rubocop:disable LineLength
+    expected_result = success_result('---|--------------------|------|----------------------|-------------------------|------------|-----------
+ID | DESTINATION SERVER | PATH | CONTENT VIEW VERSION | CONTENT VIEW VERSION ID | CREATED AT | UPDATED AT
+---|--------------------|------|----------------------|-------------------------|------------|-----------
+')
+    # rubocop:enable LineLength
+    result = run_cmd(%w(content-export list))
+    assert_cmd(expected_result, result)
+  end
+
+  it 'works with content-view-id only' do
+    api_expects(:content_view_versions, :index).returns(empty_response)
+
+    ex = api_expects(:content_exports, :index)
+
+    ex.returns(empty_response)
+    # rubocop:disable LineLength
+    expected_result = success_result('---|--------------------|------|----------------------|-------------------------|------------|-----------
+ID | DESTINATION SERVER | PATH | CONTENT VIEW VERSION | CONTENT VIEW VERSION ID | CREATED AT | UPDATED AT
+---|--------------------|------|----------------------|-------------------------|------------|-----------
+')
+    # rubocop:enable LineLength
+    result = run_cmd(%w(content-export list --content-view-id=1))
+    assert_cmd(expected_result, result)
+  end
+
+  it 'works with content-view-version-id only' do
+    ex = api_expects(:content_exports, :index)
+
+    ex.returns(empty_response)
+    # rubocop:disable LineLength
+    expected_result = success_result('---|--------------------|------|----------------------|-------------------------|------------|-----------
+ID | DESTINATION SERVER | PATH | CONTENT VIEW VERSION | CONTENT VIEW VERSION ID | CREATED AT | UPDATED AT
+---|--------------------|------|----------------------|-------------------------|------------|-----------
+')
+    # rubocop:enable LineLength
+    result = run_cmd(%w(content-export list --content-view-version-id=1))
+    assert_cmd(expected_result, result)
+  end
+end

data/test/functional/content_import/library_test.rb

@@ -0,0 +1,85 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+require 'hammer_cli_katello/content_import'
+
+describe 'content-import library' do
+  include ForemanTaskHelpers
+
+  before do
+    @cmd = %w(content-import library)
+  end
+
+  let(:task_id) { '5' }
+
+  let(:response) do
+    {
+      'id' => task_id,
+      'state' => 'planned'
+    }
+  end
+
+  let(:path) do
+    File.dirname(__FILE__)
+  end
+
+  let(:metadata) do
+    JSON.parse(File.read("#{path}/metadata.json"))
+  end
+
+  let(:organization_id) { 3 }
+
+  it "performs import with required options and async" do
+    params = [
+      "--organization-id=#{organization_id}",
+      "--path=#{path}",
+      '--async'
+    ]
+    api_expects(:content_imports, :library)
+      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
+      .returns(response)
+
+    result = run_cmd(@cmd + params)
+
+    assert_equal("Archive is being imported in task #{task_id}.\n", result.out)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
+
+  it "performs import with required options" do
+    params = [
+      "--organization-id=#{organization_id}",
+      "--path=#{path}"
+    ]
+
+    api_expects(:content_imports, :library)
+      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
+      .returns(response)
+
+    expect_foreman_task(task_id)
+
+    result = run_cmd(@cmd + params)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
+
+  it 'fails on missing required params' do
+    params = [
+      '--id=2'
+    ]
+
+    result = run_cmd(@cmd + params)
+    expected_error = "Could not import the archive."
+
+    assert_equal(result.exit_code, HammerCLI::EX_USAGE)
+    assert_equal(result.err[/#{expected_error}/], expected_error)
+  end
+
+  it 'fails on missing metadata.json' do
+    bad_path = "/nosuchdir"
+    params = [
+      "--organization-id=#{organization_id}",
+      "--path=#{bad_path}"
+    ]
+    result = run_cmd(@cmd + params)
+    expected_error = "Unable to find '#{bad_path}/metadata.json'."
+
+    assert_match(/#{expected_error}/, result.err)
+  end
+end

data/test/functional/content_import/metadata.json

@@ -0,0 +1 @@
+{"organization":"export-9697","repository_mapping":{"katello-15062":{"repository":"katello","product":"prod","redhat":false},"misc-28137":{"repository":"misc","product":"prod","redhat":false},"candlepin-37918":{"repository":"candlepin","product":"prod","redhat":false}},"content_view":"view","content_view_version":{"major":1,"minor":0},"incremental":false,"toc":"export-24d91ced-3d11-4fa2-b5ea-19a41f7b97a5-20201118_1523-toc.json"}

data/test/functional/content_import/version_test.rb

@@ -0,0 +1,85 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+require 'hammer_cli_katello/content_import'
+
+describe 'content-import version' do
+  include ForemanTaskHelpers
+
+  before do
+    @cmd = %w(content-import version)
+  end
+
+  let(:task_id) { '5' }
+
+  let(:response) do
+    {
+      'id' => task_id,
+      'state' => 'planned'
+    }
+  end
+
+  let(:path) do
+    File.dirname(__FILE__)
+  end
+
+  let(:metadata) do
+    JSON.parse(File.read("#{path}/metadata.json"))
+  end
+
+  let(:content_view_id) { 3 }
+
+  it "performs import with required options and async" do
+    params = [
+      "--content-view-id=#{content_view_id}",
+      "--path=#{path}",
+      '--async'
+    ]
+    api_expects(:content_imports, :version)
+      .with_params('content_view_id' => content_view_id, 'path' => path, 'metadata' => metadata)
+      .returns(response)
+
+    result = run_cmd(@cmd + params)
+
+    assert_equal("Archive is being imported in task #{task_id}.\n", result.out)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
+
+  it "performs import with required options" do
+    params = [
+      "--content-view-id=#{content_view_id}",
+      "--path=#{path}"
+    ]
+
+    api_expects(:content_imports, :version)
+      .with_params('content_view_id' => content_view_id, 'path' => path, 'metadata' => metadata)
+      .returns(response)
+
+    expect_foreman_task(task_id)
+
+    result = run_cmd(@cmd + params)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
+
+  it 'fails on missing required params' do
+    params = [
+      '--id=2'
+    ]
+
+    result = run_cmd(@cmd + params)
+    expected_error = "Could not import the archive."
+
+    assert_equal(result.exit_code, HammerCLI::EX_USAGE)
+    assert_equal(result.err[/#{expected_error}/], expected_error)
+  end
+
+  it 'fails on missing metadata.json' do
+    bad_path = "/nosuchdir"
+    params = [
+      "--content-view-id=#{content_view_id}",
+      "--path=#{bad_path}"
+    ]
+    result = run_cmd(@cmd + params)
+    expected_error = "Unable to find '#{bad_path}/metadata.json'."
+
+    assert_match(/#{expected_error}/, result.err)
+  end
+end

data/test/functional/content_view/content_view_helpers.rb

@@ -13,6 +13,8 @@ module ContentViewHelpers
   end
 
   def expect_content_view_version_search(params, returns)
-    expect_generic_search(:content_view_versions, params: params, returns: returns)
+    expect_lenient_search(:content_view_versions,
+                          params: params,
+                          returns: returns)
   end
 end

data/test/functional/lifecycle_environment/lifecycle_environment_helpers.rb

@@ -4,7 +4,7 @@ module LifecycleEnvironmentHelpers
   include SearchHelpers
 
   def expect_lifecycle_environment_search(org_id, name, id)
-    expect_generic_search(:lifecycle_environments,
+    expect_lenient_search(:lifecycle_environments,
                           params: {'name' => name, 'organization_id' => org_id},
                           returns: {'id' => id})
   end

data/test/functional/ping_test.rb

@@ -12,7 +12,8 @@ describe 'ping' do
         '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'}
+        'pulp_auth' => {'status' => 'ok', 'duration_ms' => '34'},
+        'pulp3' => {'status' => 'ok', 'duration_ms' => '34'}
       }
     )
 

data/test/functional/search_helpers.rb

@@ -3,4 +3,15 @@ module SearchHelpers
     ex = api_expects(resource, :index, "Find the #{resource}").with_params(args[:params])
     ex.returns(index_response([args[:returns]]))
   end
+
+  def expect_lenient_search(resource, params:, returns:)
+    ex = api_expects(resource, :index, "Find the #{resource}") do |p|
+      params.each do |key, expected|
+        actual = p[key] || p[key.to_sym] || p[key.to_s]
+        assert_equal expected.to_s, actual.to_s, "key: '#{key}', resource: #{resource}"
+      end
+    end
+    returns = [returns] unless returns.is_a? Array
+    ex.returns(index_response(returns))
+  end
 end

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.17')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.18')
 
 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: 0.23.2
+  version: 0.24.4
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -240,6 +240,11 @@ files:
 - lib/hammer_cli_katello/commands.rb
 - lib/hammer_cli_katello/composite_content_view_name_resolvable.rb
 - lib/hammer_cli_katello/content_credential.rb
+- lib/hammer_cli_katello/content_export.rb
+- lib/hammer_cli_katello/content_export_complete.rb
+- lib/hammer_cli_katello/content_export_helper.rb
+- 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_view.rb
 - lib/hammer_cli_katello/content_view_component.rb
@@ -329,6 +334,7 @@ files:
 - test/data/3.15/foreman_api.json
 - test/data/3.16/foreman_api.json
 - test/data/3.17/foreman_api.json
+- test/data/3.18/foreman_api.json
 - test/data/3.2/foreman_api.json
 - test/data/3.4/foreman_api.json
 - test/data/3.5/foreman_api.json
@@ -363,6 +369,16 @@ files:
 - test/functional/capsule/list_test.rb
 - test/functional/content_credentials/info_test.rb
 - test/functional/content_credentials/list_test.rb
+- test/functional/content_export/complete/library_test.rb
+- test/functional/content_export/complete/version_test.rb
+- test/functional/content_export/content_export_helpers.rb
+- test/functional/content_export/generate_metadata_test.rb
+- test/functional/content_export/incremental/library_test.rb
+- test/functional/content_export/incremental/version_test.rb
+- test/functional/content_export/list_test.rb
+- test/functional/content_import/library_test.rb
+- test/functional/content_import/metadata.json
+- test/functional/content_import/version_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
@@ -519,8 +535,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
@@ -535,6 +550,7 @@ test_files:
 - test/data/3.15/foreman_api.json
 - test/data/3.16/foreman_api.json
 - test/data/3.17/foreman_api.json
+- test/data/3.18/foreman_api.json
 - test/data/3.2/foreman_api.json
 - test/data/3.4/foreman_api.json
 - test/data/3.5/foreman_api.json
@@ -569,6 +585,16 @@ test_files:
 - test/functional/capsule/list_test.rb
 - test/functional/content_credentials/info_test.rb
 - test/functional/content_credentials/list_test.rb
+- test/functional/content_export/complete/library_test.rb
+- test/functional/content_export/complete/version_test.rb
+- test/functional/content_export/content_export_helpers.rb
+- test/functional/content_export/generate_metadata_test.rb
+- test/functional/content_export/incremental/library_test.rb
+- test/functional/content_export/incremental/version_test.rb
+- test/functional/content_export/list_test.rb
+- test/functional/content_import/library_test.rb
+- test/functional/content_import/metadata.json
+- test/functional/content_import/version_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