hammer_cli_katello 0.24.1 → 1.0.1

data/test/functional/content_export/content_export_helpers.rb

@@ -1,21 +1,26 @@
+require_relative '../search_helpers'
+
 module ContentExportHelpers
+  include SearchHelpers
   def expects_repositories_in_library(organization_id, returns = [])
-    export_task = api_expects(:repositories, :index) do |p|
-      assert_equal organization_id.to_s, p[:organization_id].to_s
-      assert p[:library]
-      assert_equal "download_policy != immediate", p[:search]
-      assert_equal "yum", p[:content_type]
-    end
-    export_task.returns(index_response(returns))
+    expect_lenient_search(:repositories,
+                          params: {
+                            organization_id: organization_id,
+                            library: true,
+                            search: "download_policy != immediate",
+                            content_type: 'yum'
+                          },
+                          returns: returns)
   end
 
   def expects_repositories_in_version(version_id, returns = [])
-    export_task = api_expects(:repositories, :index) do |p|
-      assert_equal version_id.to_s, p[:content_view_version_id].to_s
-      assert p[:library]
-      assert_equal "download_policy != immediate", p[:search]
-      assert_equal "yum", p[:content_type]
-    end
-    export_task.returns(index_response(returns))
+    expect_lenient_search(:repositories,
+                          params: {
+                            content_view_version_id: version_id,
+                            library: true,
+                            search: "download_policy != immediate",
+                            content_type: 'yum'
+                          },
+                          returns: returns)
   end
 end

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

@@ -1,10 +1,14 @@
-require File.join(File.dirname(__FILE__), '../../../test_helper')
-require_relative '../content_export_helpers'
+require_relative '../../test_helper'
 require 'hammer_cli_katello/content_export'
+require_relative '../../lifecycle_environment/lifecycle_environment_helpers'
+require_relative '../../content_view/content_view_helpers'
+require_relative '../content_export_helpers'
 
 describe 'content-export incremental version' do
   include ForemanTaskHelpers
   include ContentExportHelpers
+  include ContentViewHelpers
+  include LifecycleEnvironmentHelpers
 
   before do
     @cmd = %w(content-export incremental version)
@@ -151,8 +155,8 @@ describe 'content-export incremental version' do
   it 'fails on missing content-view version' do
     params = ["--content-view-id=2"]
     result = run_cmd(@cmd + params)
-    expected_error = "Option --version is required"
 
+    expected_error = "--version, --lifecycle-environment-id, --lifecycle-environment is required."
     assert_equal(result.exit_code, HammerCLI::EX_USAGE)
     assert_match(/#{expected_error}/, result.err)
   end
@@ -233,4 +237,32 @@ describe 'content-export incremental version' do
     assert_match(/Unable to fully export this version because/, result.out)
     assert_match(/200/, result.out)
   end
+
+  it 'should accept content view and lifecycle environment and get the right version' do
+    env = "foo"
+    org_id = '100'
+    env_id = '223'
+    params = ["--content-view-id=#{content_view_id}",
+              "--lifecycle-environment=#{env}",
+              "--organization-id=#{org_id}"]
+    expect_lifecycle_environment_search(org_id, env, env_id)
+    expect_content_view_version_search({'environment_id' => env_id,
+                                        'content_view_id' => content_view_id},
+                                       'id' => content_view_version_id).at_least_once
+
+    expects_repositories_in_version(content_view_version_id)
+    ex = api_expects(:content_export_incrementals, :version)
+    ex.returns(response)
+
+    expect_foreman_task(task_id).at_least_once
+
+    HammerCLIKatello::ContentExportIncremental::VersionCommand.
+      any_instance.
+      expects(:fetch_export_history).
+      returns(export_history)
+
+    result = run_cmd(@cmd + params)
+    assert_match(/Generated .*metadata.*json/, result.out)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
 end

data/test/functional/content_export/list_test.rb

@@ -23,12 +23,42 @@ describe 'content-export list' do
 
     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
----|--------------------|------|----------------------|-------------------------|------------|-----------
+    expected_result = success_result('---|--------------------|------|------|----------------------|-------------------------|------------|-----------
+ID | DESTINATION SERVER | PATH | TYPE | 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 | TYPE | 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 | TYPE | 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_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/content_view/list_test.rb

@@ -1,8 +1,6 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 require File.join(File.dirname(__FILE__), '../lifecycle_environment/lifecycle_environment_helpers')
 
-require 'hammer_cli_katello/content_view_puppet_module'
-
 describe 'listing content-views' do
   include LifecycleEnvironmentHelpers
 

data/test/functional/content_view/publish_test.rb

@@ -1,5 +1,4 @@
 require_relative '../test_helper'
-require 'hammer_cli_katello/content_view_puppet_module'
 require 'hammer_cli_katello/content_view'
 
 module HammerCLIKatello
@@ -22,24 +21,4 @@ module HammerCLIKatello
       run_cmd(%w(content-view publish --major 5 --minor 1 --organization org1 --name cv --async))
     end
   end
-
-  describe ContentViewPuppetModule do
-    it 'allows adding a puppet module' do
-      ex = api_expects(:organizations, :index) do |p|
-        p[:search] == "name = \"org1\""
-      end
-      ex.returns(index_response([{'id' => 1}]))
-
-      ex = api_expects(:content_views, :index) do |p|
-        p['name'] == 'cv' && p['organization_id'] == 1
-      end
-      ex.returns(index_response([{'id' => 3}]))
-
-      api_expects(:content_views, :publish) do |p|
-        p['id'] == 3
-      end
-
-      run_cmd(%w(content-view publish --organization org1 --name cv --async))
-    end
-  end
 end

data/test/functional/content_view/version/cv_import_export_helper_test.rb

@@ -0,0 +1,20 @@
+require_relative '../../test_helper'
+describe 'CVImportExportHelper' do
+  describe 'validate_pulp3_not_enabled' do
+    include HammerCLIKatello::CVImportExportHelper
+    it 'returns true when the api endpoint does not return a value' do
+      api_expects(:content_exports, :api_status)
+      assert_equal true, validate_pulp3_not_enabled('fail_msg')
+    end
+
+    it 'raises error when the api reports Pulp 3 is enabled' do
+      api_expects(:content_exports, :api_status).returns('api_usable' => true)
+      assert_raises(RuntimeError, 'fail msg') { validate_pulp3_not_enabled('fail msg') }
+    end
+
+    it 'returns nil when the api reports Pulp 3 is not enabled' do
+      api_expects(:content_exports, :api_status).returns('api_usable' => false)
+      assert_equal nil, validate_pulp3_not_enabled('fail_msg')
+    end
+  end
+end

data/test/functional/content_view/version/export_test.rb

@@ -8,6 +8,10 @@ describe 'content-view version export' do
   end
 
   it "performs export" do
+    HammerCLIKatello::ContentViewVersion::ExportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--id=5',
       '--export-dir=/tmp/exports'
@@ -65,6 +69,10 @@ describe 'content-view version export' do
   end
 
   it "performs composite export" do
+    HammerCLIKatello::ContentViewVersion::ExportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--id=999',
       '--export-dir=/tmp/exports'
@@ -101,6 +109,10 @@ describe 'content-view version export' do
   end
 
   it "fails export if content view version has no repository" do
+    HammerCLIKatello::ContentViewVersion::ExportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--id=5',
       '--export-dir=/tmp/exports'

data/test/functional/content_view/version/import_test.rb

@@ -8,6 +8,10 @@ describe 'content-view version import' do
   end
 
   it "performs import" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'
@@ -75,6 +79,10 @@ describe 'content-view version import' do
   end
 
   it "performs composite import" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-999.tar',
       '--organization-id=1'
@@ -135,6 +143,10 @@ describe 'content-view version import' do
   end
 
   it "performs composite import, component not found" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-999.tar',
       '--organization-id=1'
@@ -184,6 +196,10 @@ describe 'content-view version import' do
   end
 
   it "fails import if cv has not been created" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'
@@ -210,6 +226,10 @@ describe 'content-view version import' do
   end
 
   it "fails import if repo is set to mirror-on-sync" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'
@@ -244,6 +264,10 @@ describe 'content-view version import' do
   end
 
   it "fails import if cv version already exists" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'
@@ -278,6 +302,10 @@ describe 'content-view version import' do
   end
 
   it "fails import if any repository does not exist" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'

data/test/functional/content_view/version/promote_test.rb

@@ -1,8 +1,7 @@
 require_relative '../../test_helper'
-require 'hammer_cli_katello/content_view_puppet_module'
 
 module HammerCLIKatello
-  describe ContentViewPuppetModule do
+  describe ContentViewVersion::PromoteCommand do
     it 'allows promoting a content view' do
       ex = api_expects(:organizations, :index) do |p|
         p[:search] == "name = \"org1\""

data/test/functional/content_view/version/republish_repositories_test.rb

@@ -1,8 +1,7 @@
 require_relative '../../test_helper'
-require 'hammer_cli_katello/content_view_puppet_module'
 
 module HammerCLIKatello
-  describe ContentViewPuppetModule do
+  describe ContentViewVersion::RepublishRepositoriesCommand do
     include ForemanTaskHelpers
     include OrganizationHelpers
 

data/test/functional/host/errata/apply_test.rb

@@ -1,7 +1,5 @@
 require File.join(File.dirname(__FILE__), '../../test_helper')
 
-require 'hammer_cli_katello/content_view_puppet_module'
-
 describe 'apply an errata' do
   include ForemanTaskHelpers
 

data/test/functional/host/errata/recalculate_test.rb

@@ -1,7 +1,5 @@
 require File.join(File.dirname(__FILE__), '../../test_helper')
 
-require 'hammer_cli_katello/content_view_puppet_module'
-
 describe 'recalculate errata' do
   include ForemanTaskHelpers
 

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

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

data/test/functional/repository/create_test.rb

@@ -18,34 +18,4 @@ describe "create repository" do
 
     assert_equal(0, run_cmd(command).exit_code)
   end
-
-  it 'with ssl options by name' do
-    def stub_gpg_key(gpg_key_name)
-      gpg_key_index = api_expects(:gpg_keys, :index)
-                      .with_params(
-                        name: gpg_key_name.to_s,
-                        organization_id: 1,
-                        per_page: 1000,
-                        page: 1)
-      gpg_response = File.join(File.dirname(__FILE__), 'data', "#{gpg_key_name}.json")
-      gpg_key_index.returns(JSON.parse(File.read(gpg_response)))
-    end
-
-    api_expects(:repositories, :create)
-      .with_params(
-        name: name,
-        product_id: product_id,
-        ssl_ca_cert_id: 1,
-        ssl_client_cert_id: 2,
-        ssl_client_key_id: 3,
-        content_type: content_type)
-
-    %w(test_cert test_key test_ca).each { |cred| stub_gpg_key(cred) }
-
-    command = %W(repository create --organization-id #{org_id} --product-id #{product_id}
-                 --content-type #{content_type} --name #{name} --ssl-client-cert test_cert
-                 --ssl-client-key test_key --ssl-ca-cert test_ca)
-
-    assert_equal(0, run_cmd(command).exit_code)
-  end
 end

data/test/functional/repository/info_test.rb

@@ -46,7 +46,7 @@ describe "get repository info" do
     )
     result = run_cmd(@cmd + params)
     # rubocop:disable Style/WordArray
-    expected_fields = [['ID', '1'],
+    expected_fields = [['Id', '1'],
                        ['Name', 'Test Repo'],
                        ['Label', 'Test_Repo'],
                        ['Description', 'hammertime'],
@@ -59,7 +59,7 @@ describe "get repository info" do
                        ['Download Policy', 'immediate'],
                        ['HTTP Proxy', ''],
                        ['Product', ''],
-                       ['ID', '79'],
+                       ['Id', '79'],
                        ['Name', 'test'],
                        ['GPG Key', ''],
                        ['Sync', ''],
@@ -122,7 +122,7 @@ describe "get repository info" do
     )
     result = run_cmd(@cmd + params)
     # rubocop:disable Style/WordArray
-    expected_fields = [['ID', '1'],
+    expected_fields = [['Id', '1'],
                        ['Name', 'Test Repo'],
                        ['Label', 'Test_Repo'],
                        ['Description', 'hammertime'],
@@ -135,7 +135,7 @@ describe "get repository info" do
                        ['Download Policy', 'immediate'],
                        ['HTTP Proxy', ''],
                        ['Product', ''],
-                       ['ID', '79'],
+                       ['Id', '79'],
                        ['Name', 'Test_Product'],
                        ['GPG Key', ''],
                        ['Sync', ''],