hammer_cli_katello 0.18.2 → 0.19.0

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

@@ -195,7 +195,7 @@ describe 'content-view version export' do
     ex = api_expects(:content_view_versions, :show)
     ex.returns(
       'id' => '5',
-      'repositories' => [{'id' => '2'}],
+      'repositories' => [{'id' => '2'}, {'id' => '3'}],
       'major' => 1,
       'minor' => 0,
       'content_view' => {'name' => 'cv'},
@@ -213,21 +213,42 @@ describe 'content-view version export' do
     ex.returns(
       'id' => '2',
       'label' => 'Test_Repo',
+      'name' => 'Test_Repo',
       'content_type' => 'yum',
       'backend_identifier' => 'Default_Organization-Library-Test_Repo',
       'relative_path' => 'Default_Organization/Library/Test_Repo',
       'library_instance_id' => '1'
     )
 
+    api_expects(:repositories, :show).with_params('id' => '3').returns(
+      'id' => '3',
+      'label' => 'Test_Repo_3',
+      'name' => 'Test_Repo_3',
+      'content_type' => 'yum',
+      'backend_identifier' => 'Default_Organization-Library-Test_Repo_3',
+      'relative_path' => 'Default_Organization/Library/Test_Repo_3',
+      'library_instance_id' => '4'
+    )
+
     api_expects(:repositories, :show).with_params('id' => '1').returns(
       'id' => '1',
       'download_policy' => 'on_demand'
     )
+    api_expects(:repositories, :show).with_params('id' => '4').returns(
+      'id' => '4',
+      'download_policy' => 'immediate'
+    )
 
     File.expects(:exist?).with('/usr/share/foreman').returns(true)
     File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
 
     result = run_cmd(@cmd + params)
+    assert_equal(result.err, "Could not export the content view:\n" \
+                                "  Error: All exported repositories must be set to an "\
+                                "immediate download policy and re-synced.\n" \
+                                "  The following repositories need action:\n" \
+                                "    Test_Repo\n" \
+                )
     assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
   end
 
@@ -269,4 +290,38 @@ describe 'content-view version export' do
     result = run_cmd(@cmd + params)
     assert_equal(result.exit_code, 70)
   end
+
+  it "fails export if content view version has no repository" do
+    params = [
+      '--id=5',
+      '--export-dir=/tmp/exports'
+    ]
+
+    ex = api_expects(:content_view_versions, :show)
+    ex.returns(
+      'id' => '5',
+      'name' => 'Test_version',
+      'repositories' => [],
+      'major' => 1,
+      'minor' => 0,
+      'content_view' => {'name' => 'cv'},
+      'content_view_id' => 4321,
+      'puppet_modules' => []
+    )
+
+    ex = api_expects(:content_views, :show)
+    ex.returns(
+      'id' => '4321',
+      'composite' => false
+    )
+
+    File.expects(:exist?).with('/usr/share/foreman').returns(true)
+    File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
+
+    result = run_cmd(@cmd + params)
+    assert_equal(result.err, "Could not export the content view:\n"\
+                             "  Error: Ensure the content view version 'Test_version'"\
+                             " has at least one repository.\n")
+    assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
+  end
 end

data/test/functional/host/extensions/data/host.json

@@ -106,6 +106,9 @@
       "last_checkin":"2016-05-26 10:46:18 -0400",
       "service_level":"high",
       "release_version":"7Server",
+      "purpose_usage":"Production",
+      "purpose_role":"Role",
+      "purpose_addons":"Test Addon1, Test Addon2",
       "autoheal":true,
       "registered_at":"2016-05-26 10:46:22 -0400",
       "activation_keys":[

data/test/functional/host/extensions/info_test.rb

@@ -24,7 +24,10 @@ describe 'host info' do
                        ['Bug Fix', '0'],
                        ['Name', 'my host collection'],
                        ['Applicable Packages', '5'],
-                       ['Upgradable Packages', '4']]
+                       ['Upgradable Packages', '4'],
+                       ['Purpose Usage', 'Production'],
+                       ['Purpose Role', 'Role'],
+                       ['Purpose Addons', 'Test Addon1, Test Addon2']]
     expected_results = expected_fields.map { |field| success_result(FieldMatcher.new(*field)) }
     expected_results.each { |expected|  assert_cmd(expected, result) }
   end

data/test/functional/host/extensions/update_test.rb

@@ -27,11 +27,13 @@ module HammerCLIForeman
 
         api_expects(:hosts, :update).
           with_params('id' => host_id.to_s,
+                      'organization_id' => organization_id,
                       'host' => {
-                        'organization_id' => organization_id,
+                        'puppetclass_ids' => [],
+                        'compute_attributes' => {},
                         'content_facet_attributes' => {
-                          'lifecycle_environment_id' => env_id,
                           'content_view_id' => cv_id,
+                          'lifecycle_environment_id' => env_id,
                           'kickstart_repository_id' => repo_id
                         }
                       })

data/test/functional/repository/upload_test.rb

@@ -29,28 +29,27 @@ describe 'upload repository' do
 
     params = ["--id=#{repo_id}", "--path=#{path}"]
 
-    ex = api_expects(:content_uploads, :create, "Create upload for content") do |par|
-      par[:repository_id] == repo_id
-    end
+    ex = api_expects(:content_uploads, :create, "Create upload for content")
+         .with_params('repository_id' => repo_id)
 
     ex.returns(upload_response)
 
-    ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload') do |par|
-      upload = {
-        :id => '1234',
-        :name => 'test.rpm',
-        :size => 0,
-        :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
-      }
-      par[:id] == repo_id && par[:uploads] == [upload] && par[:sync_capsule] == true &&
-        par[:publish_repository] == true
-    end
+    # rubocop:disable LineLength
+    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 => 'test.rpm',
+                         :size => 0,
+                         :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+                       }]
+                      )
+    # rubocop:enable LineLength
 
     ex2.returns("")
 
-    ex3 = api_expects(:content_uploads, :destroy, "Delete the upload") do |par|
-      par[:id] == upload_id && par[:repository_id] == repo_id
-    end
+    ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
+          .with_params('id' => upload_id, 'repository_id' => repo_id)
 
     ex3.returns("")
 
@@ -59,6 +58,74 @@ describe 'upload repository' do
     File.delete("test.rpm")
   end
 
+  it "uploads srpm with content-type" do
+    File.new("test.src.rpm", "w")
+
+    params = ["--id=#{repo_id}", '--path=./test.src.rpm', '--content-type=srpm']
+
+    ex = api_expects(:content_uploads, :create, "Create upload for content")
+         .with_params('repository_id' => repo_id)
+
+    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, :content_type => 'srpm',
+                       :uploads => [{
+                         :id => '1234',
+                         :name => 'test.src.rpm',
+                         :size => 0,
+                         :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+                       }]
+                      )
+
+    # rubocop:enable LineLength
+    ex2.returns("")
+
+    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.src.rpm")
+  end
+
+  it 'fails upload of srpm with no content-type' do
+    File.new("test.src.rpm", "w")
+
+    params = ["--id=#{repo_id}", '--path=./test.src.rpm']
+
+    ex = api_expects(:content_uploads, :create, "Create upload for content")
+         .with_params('repository_id' => repo_id)
+
+    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,
+                       :uploads => [{
+                         :id => '1234',
+                         :name => 'test.src.rpm',
+                         :size => 0,
+                         :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+                       }]
+                      )
+    # rubocop:enable LineLength
+
+    ex2.returns(400)
+
+    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, 65)
+    File.delete("test.src.rpm")
+  end
+
   it "uploads a docker image" do
     File.new("test.rpm", "w")
 
@@ -103,28 +170,27 @@ describe 'upload repository' do
 
     expect_repository_search(product_id, 'test_repo', repo_id)
 
-    ex = api_expects(:content_uploads, :create, "Create upload for content") do |par|
-      par[:repository_id] == repo_id
-    end
+    ex = api_expects(:content_uploads, :create, "Create upload for content")
+         .with_params(:repository_id => repo_id)
 
     ex.returns(upload_response)
 
-    ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload') do |par|
-      upload = {
-        :id => '1234',
-        :name => 'test.rpm',
-        :size => 0,
-        :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
-      }
-      par[:id] == repo_id && par[:uploads] == [upload] && par[:sync_capsule] == true &&
-        par[:publish_repository] == true
-    end
+    # rubocop:disable LineLength
+    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 => 'test.rpm',
+                         :size => 0,
+                         :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+                       }]
+                      )
+    # rubocop:enable LineLength
 
     ex2.returns("")
 
-    ex3 = api_expects(:content_uploads, :destroy, "Delete the upload") do |par|
-      par[:id] == upload_id && par[:repository_id] == repo_id
-    end
+    ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
+          .with_params(:id => upload_id, :repository_id => repo_id)
 
     ex3.returns("")
 
@@ -138,28 +204,27 @@ describe 'upload repository' do
 
     params = ["--id=#{repo_id}", "--path={test}.[r{1}]pm"]
 
-    ex = api_expects(:content_uploads, :create, "Create upload for content") do |par|
-      par[:repository_id] == repo_id
-    end
+    ex = api_expects(:content_uploads, :create, "Create upload for content")
+         .with_params(:repository_id => repo_id)
 
     ex.returns(upload_response)
 
-    ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload') do |par|
-      upload = {
-        :id => '1234',
-        :name => 'test.rpm',
-        :size => 0,
-        :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
-      }
-      par[:id] == repo_id && par[:uploads] == [upload] && par[:sync_capsule] == true &&
-        par[:publish_repository] == true
-    end
+    # rubocop:disable LineLength
+    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 => 'test.rpm',
+                         :size => 0,
+                         :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+                       }]
+                      )
+    # rubocop:enable LineLength
 
     ex2.returns("")
 
-    ex3 = api_expects(:content_uploads, :destroy, "Delete the upload") do |par|
-      par[:id] == upload_id && par[:repository_id] == repo_id
-    end
+    ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
+          .with_params(:id => upload_id, :repository_id => repo_id)
 
     ex3.returns("")
 
@@ -176,43 +241,53 @@ describe 'upload repository' do
 
     # Begin first upload cycle
 
-    ex = api_expects(:content_uploads, :create, "Create upload for content") do |par|
-      par[:repository_id] == repo_id
-    end
+    ex = api_expects(:content_uploads, :create, "Create upload for content")
+         .with_params(:repository_id => repo_id)
 
     ex.returns(upload_response)
 
-    ex = api_expects(:repositories, :import_uploads, 'Take in an upload') do |par|
-      par[:id] == repo_id && par[:uploads].one? && par[:sync_capsule] == false &&
-        par[:publish_repository] == false
-    end
+    # rubocop:disable LineLength
+    ex = api_expects(:repositories, :import_uploads, 'Take in an upload')
+         .with_params(:id => repo_id, :sync_capsule => false, :publish_repository => false,
+                      :uploads => [{
+                        :id => '1234',
+                        :name => 'test1.rpm',
+                        :size => 0,
+                        :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+                      }]
+                     )
+    # rubocop:enable LineLength
 
     ex.returns("")
 
-    ex = api_expects(:content_uploads, :destroy, "Delete the upload") do |par|
-      par[:id] == upload_id && par[:repository_id] == repo_id
-    end
+    ex = api_expects(:content_uploads, :destroy, "Delete the upload")
+         .with_params(:id => upload_id, :repository_id => repo_id)
 
     ex.returns("")
 
     # Begin second upload cycle
 
-    ex = api_expects(:content_uploads, :create, "Create upload for content") do |par|
-      par[:repository_id] == repo_id
-    end
+    ex = api_expects(:content_uploads, :create, "Create upload for content")
+         .with_params(:repository_id => repo_id)
 
     ex.returns(upload_response)
 
-    ex = api_expects(:repositories, :import_uploads, 'Take in an upload') do |par|
-      par[:id] == repo_id && par[:uploads].one? && par[:sync_capsule] == true &&
-        par[:publish_repository] == true
-    end
+    # rubocop:disable LineLength
+    ex = api_expects(:repositories, :import_uploads, 'Take in an upload')
+         .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+                      :uploads => [{
+                        :id => '1234',
+                        :name => 'test2.rpm',
+                        :size => 0,
+                        :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+                      }]
+                     )
+    # rubocop:enable LineLength
 
     ex.returns("")
 
-    ex = api_expects(:content_uploads, :destroy, "Delete the upload") do |par|
-      par[:id] == upload_id && par[:repository_id] == repo_id
-    end
+    ex = api_expects(:content_uploads, :destroy, "Delete the upload")
+         .with_params(:id => upload_id, :repository_id => repo_id)
 
     ex.returns("")
 

data/test/functional/subscription/list_test.rb

@@ -36,7 +36,7 @@ module HammerCLIKatello
       result = run_cmd(@cmd + params)
 
       fields = ['ID', 'UUID', 'NAME', 'TYPE', 'CONTRACT', 'ACCOUNT', 'SUPPORT',
-                'END DATE', 'QUANTITY', 'CONSUMED']
+                'START DATE', 'END DATE', 'QUANTITY', 'CONSUMED']
       expected_result = success_result(IndexMatcher.new([fields, []]))
       assert_cmd(expected_result, result)
     end

data/test/test_helper.rb

@@ -17,7 +17,7 @@ require 'minitest/spec'
 require 'mocha/setup'
 require 'hammer_cli'
 
-KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.12')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.13')
 
 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.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - Adam Price
@@ -11,6 +11,7 @@ authors:
 - Bryan Kearney
 - Chris Duryee
 - Christine Fouant
+- Chris Roberts
 - Daniel Lobato García
 - David Davis
 - Dustin Tsang
@@ -34,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -42,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman_tasks
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +317,7 @@ files:
 - test/data/3.10/foreman_api.json
 - test/data/3.11/foreman_api.json
 - test/data/3.12/foreman_api.json
+- test/data/3.13/foreman_api.json
 - test/data/3.2/foreman_api.json
 - test/data/3.4/foreman_api.json
 - test/data/3.5/foreman_api.json
@@ -327,6 +329,8 @@ files:
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
 - test/functional/activation_key/create_test.rb
+- test/functional/activation_key/data/activation_key.json
+- test/functional/activation_key/info_test.rb
 - test/functional/activation_key/list_test.rb
 - test/functional/activation_key/product_content_test.rb
 - test/functional/activation_key/remove_host_collection_test.rb
@@ -369,6 +373,7 @@ files:
 - test/functional/content_view/remove_content_view_version_test.rb
 - test/functional/content_view/remove_test.rb
 - test/functional/content_view/update_test.rb
+- test/functional/content_view/version/default_export_test.rb
 - test/functional/content_view/version/export_test.rb
 - test/functional/content_view/version/import_test.rb
 - test/functional/content_view/version/incremental_update_test.rb
@@ -500,6 +505,7 @@ test_files:
 - test/data/3.10/foreman_api.json
 - test/data/3.11/foreman_api.json
 - test/data/3.12/foreman_api.json
+- test/data/3.13/foreman_api.json
 - test/data/3.2/foreman_api.json
 - test/data/3.4/foreman_api.json
 - test/data/3.5/foreman_api.json
@@ -511,6 +517,8 @@ test_files:
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
 - test/functional/activation_key/create_test.rb
+- test/functional/activation_key/data/activation_key.json
+- test/functional/activation_key/info_test.rb
 - test/functional/activation_key/list_test.rb
 - test/functional/activation_key/product_content_test.rb
 - test/functional/activation_key/remove_host_collection_test.rb
@@ -553,6 +561,7 @@ test_files:
 - test/functional/content_view/remove_content_view_version_test.rb
 - test/functional/content_view/remove_test.rb
 - test/functional/content_view/update_test.rb
+- test/functional/content_view/version/default_export_test.rb
 - test/functional/content_view/version/export_test.rb
 - test/functional/content_view/version/import_test.rb
 - test/functional/content_view/version/incremental_update_test.rb