hammer_cli_katello 0.11.5.1 → 0.12.0

data/test/functional/hostgroup/update_test.rb

@@ -1,6 +1,5 @@
 require_relative '../test_helper'
 require 'hammer_cli_foreman/hostgroup'
-
 module HammerCLIForeman
   describe Hostgroup do
     # These tests are only for the extensions Katello adds to the hostgroup command
@@ -13,6 +12,24 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup update --id 1 --content-source-id 1))
       end
 
+      it 'allows content source name' do
+        content_source_name = "life_of_cs"
+        content_source_id = 111
+        hg_id = 441
+
+        api_expects(:smart_proxies, :index).
+          with_params(:search => "name = \"#{content_source_name}\"").
+          returns(index_response([{'id' => content_source_id}]))
+
+        api_expects(:hostgroups, :update).
+          with_params('id' => hg_id.to_s,
+                      'hostgroup' => {'content_source_id' => content_source_id
+                                     })
+
+        cmd = "hostgroup update --id #{hg_id} --content-source #{content_source_name}"
+        run_cmd(cmd.split)
+      end
+
       it 'allows content view id' do
         api_expects(:hostgroups, :update) do |p|
           p['id'] == '1' && p['hostgroup']['content_view_id'] == 1
@@ -68,6 +85,36 @@ module HammerCLIForeman
         result = run_cmd(%w(hostgroup update --id 1 --lifecycle-environment le1))
         assert_match(/--query-organization/, result.err)
       end
+
+      it 'allows kickstart repository name' do
+        env_id = 100
+        cv_id = 200
+        repo_name = "life_of_kickstart"
+        repo_id = 111
+        hg_name = "mercury"
+        hg_id = 108
+
+        api_expects(:hostgroups, :index).
+          with_params(:search => "name = \"#{hg_name}\"").
+          returns(index_response([{'id' => hg_id}]))
+
+        api_expects(:repositories, :index).
+          with_params('name' => repo_name,
+                      'environment_id' => env_id,
+                      'content_view_id' => cv_id).
+          returns(index_response([{'id' => repo_id}]))
+
+        api_expects(:hostgroups, :update).
+          with_params('id' => hg_id,
+                      'hostgroup' => {'lifecycle_environment_id' => env_id,
+                                      'content_view_id' => cv_id,
+                                      'kickstart_repository_id' => repo_id
+                                     })
+
+        cmd = "hostgroup update --name #{hg_name} --lifecycle-environment-id #{env_id}"\
+              " --content-view-id #{cv_id} --kickstart-repository #{repo_name}"
+        run_cmd(cmd.split)
+      end
     end
   end
 end

data/test/functional/lifecycle_environment/create_test.rb

@@ -5,7 +5,7 @@ module HammerCLIKatello
   describe LifecycleEnvironmentCommand::CreateCommand do
     it 'allows minimal options' do
       api_expects(:lifecycle_environments, :create) do |p|
-        p['name'] == 'le1' && p['prior_id'] == '3' && p['organization_id'] == 1
+        p['name'] == 'le1' && p['prior_id'] == 3 && p['organization_id'] == 1
       end
 
       run_cmd(%w(lifecycle-environment create --name le1 --prior-id 3 --organization-id 1))

data/test/functional/package/list_test.rb

@@ -83,7 +83,7 @@ module HammerCLIKatello
           .returns(index_response([{'id' => 2}, {'id' => 3}]))
 
         r = run_cmd(%w(package list --product-id 1))
-        assert(r.err.include?("found more than one repository"), "Invalid error message")
+        assert(r.err.include?("Found more than one repository"), "Invalid error message: #{r.err}")
       end
 
       it 'requires organization options to resolve ID by name' do

data/test/functional/product/product_helpers.rb

@@ -1,9 +1,11 @@
 module ProductHelpers
+  def expect_generic_product_search(params = {}, returns = {})
+    api_expects(:products, :index, 'Find the Product')
+      .with_params(params).returns(index_response([returns]))
+  end
+
   def expect_product_search(org_id, name, id)
-    ex = api_expects(:products, :index, 'Find the Product') do |par|
-      par['name'] == name && par['organization_id'] == org_id
-    end
-    ex.returns(index_response([{'id' => id}]))
+    expect_generic_product_search({'name' => name, 'organization_id' => org_id}, 'id' => id)
   end
 
   def expect_product_show(options = {})

data/test/functional/repository/upload_test.rb

@@ -149,13 +149,7 @@ describe 'upload repository' do
     ex.returns(upload_response)
 
     ex = api_expects(:repositories, :import_uploads, 'Take in an upload') do |par|
-      upload = {
-        :id => '1234',
-        :name => 'test1.rpm',
-        :size => 0,
-        :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
-      }
-      par[:id] == repo_id && par[:uploads] == [upload] && par[:sync_capsule] == false &&
+      par[:id] == repo_id && par[:uploads].one? && par[:sync_capsule] == false &&
         par[:publish_repository] == false
     end
 
@@ -176,13 +170,7 @@ describe 'upload repository' do
     ex.returns(upload_response)
 
     ex = api_expects(:repositories, :import_uploads, 'Take in an upload') do |par|
-      upload = {
-        :id => '1234',
-        :name => 'test2.rpm',
-        :size => 0,
-        :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
-      }
-      par[:id] == repo_id && par[:uploads] == [upload] && par[:sync_capsule] == true &&
+      par[:id] == repo_id && par[:uploads].one? && par[:sync_capsule] == true &&
         par[:publish_repository] == true
     end
 
@@ -208,4 +196,34 @@ describe 'upload repository' do
     assert_equal "Could not find any files matching PATH\n", result.err
     assert_equal HammerCLI::EX_NOINPUT, result.exit_code
   end
+
+  describe 'requires' do
+    it 'repository options' do
+      api_expects_no_call
+      error = run_cmd(@cmd + %W(--path #{path})).err
+      assert error.include?('--id, --name is required'), "Actual result: #{error}"
+    end
+
+    it 'product options when repository name is specified' do
+      api_expects_no_call
+      error = run_cmd(@cmd + %W(--name repo1 --path #{path})).err
+      assert(error.include?('--product, --product-id is required'), "Actual result: #{error}")
+    end
+
+    it 'organization options when product name is specified' do
+      api_expects_no_call
+      error = run_cmd(@cmd + %W(--name repo1 --product product2 --path #{path})).err
+      assert(error.include?('--organization-id, --organization, --organization-label is required'),
+             "Actual result: #{error}")
+    end
+  end
+
+  describe 'disallows' do
+    it 'product options when repository ID is specified' do
+      api_expects_no_call
+      error = run_cmd(@cmd + %W(--id 1 --product product2 --path #{path})).err
+      assert(error.include?('Cannot specify both product options and repository ID'),
+             "Actual result: #{error}")
+    end
+  end
 end

data/test/functional/sync_plan/info_test.rb

@@ -0,0 +1,37 @@
+require_relative '../test_helper'
+require 'hammer_cli_katello/sync_plan'
+require_relative 'sync_plan_helpers'
+require_relative '../organization/organization_helpers'
+module HammerCLIKatello
+  describe SyncPlan::InfoCommand do
+    include OrganizationHelpers
+    include SyncPlanHelpers
+
+    it 'allows ID' do
+      api_expects(:sync_plans, :show).with_params('id' => 1)
+
+      run_cmd(%w(sync-plan info --id 1))
+    end
+
+    it 'allows organization id and sync plan name' do
+      org_id = 1
+      name = "SyncPlan1"
+      id = 100
+      expect_sync_plan_search(org_id, name, id)
+      api_expects(:sync_plans, :show).with_params('id' => id)
+      run_cmd("sync-plan info --organization-id #{org_id} --name #{name}".split)
+    end
+
+    it 'allows organization name and sync plan name' do
+      org_id = 1
+      org_label = "org"
+      name = "SyncPlan1"
+      id = 100
+
+      expect_organization_search(org_label, org_id, field: 'label')
+      expect_sync_plan_search(org_id, name, id)
+      api_expects(:sync_plans, :show).with_params('id' => id)
+      run_cmd("sync-plan info --organization-label #{org_label} --name #{name}".split)
+    end
+  end
+end

data/test/functional/sync_plan/list_test.rb

@@ -0,0 +1,31 @@
+require_relative '../test_helper'
+require 'hammer_cli_katello/sync_plan'
+require_relative 'sync_plan_helpers'
+require_relative '../organization/organization_helpers'
+
+module HammerCLIKatello
+  describe SyncPlan::ListCommand do
+    include SyncPlanHelpers
+    include OrganizationHelpers
+
+    it 'allows minimal options' do
+      expect_sync_plan_search(1, nil, nil)
+
+      run_cmd(%w(sync-plan list --organization-id 1))
+    end
+
+    it 'allows org name' do
+      expect_organization_search('org1', 1)
+      expect_sync_plan_search(1, nil, nil)
+
+      run_cmd(%w(sync-plan list --organization org1))
+    end
+
+    it 'allows org label' do
+      expect_organization_search('org1', 1, field: 'label')
+      expect_sync_plan_search(1, nil, nil)
+
+      run_cmd(%w(sync-plan list --organization-label org1))
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.11.5.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Adam Price
@@ -34,36 +34,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hammer_cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman_tasks
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +242,7 @@ files:
 - lib/hammer_cli_katello/content_view_version.rb
 - lib/hammer_cli_katello/erratum.rb
 - lib/hammer_cli_katello/exception_handler.rb
+- lib/hammer_cli_katello/file.rb
 - lib/hammer_cli_katello/filter.rb
 - lib/hammer_cli_katello/filter_rule.rb
 - lib/hammer_cli_katello/foreman_search_options_creators.rb
@@ -265,8 +252,10 @@ files:
 - lib/hammer_cli_katello/host_collection_erratum.rb
 - 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_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
@@ -368,6 +357,9 @@ files:
 - test/functional/content_view/version/promote_test.rb
 - test/functional/content_view/version/republish_repositories_test.rb
 - test/functional/erratum/list_test.rb
+- test/functional/file/file_helpers.rb
+- test/functional/file/info_test.rb
+- test/functional/file/list_test.rb
 - test/functional/filter_rule/create_test.rb
 - test/functional/filter_rule/delete_test.rb
 - test/functional/filter_rule/filter_rule_helpers.rb
@@ -375,10 +367,12 @@ files:
 - test/functional/filter_rule/list_test.rb
 - test/functional/filter_rule/update_test.rb
 - test/functional/host/errata/apply_test.rb
+- test/functional/host/extensions/create_test.rb
 - test/functional/host/extensions/data/host.json
 - test/functional/host/extensions/data/host_list.json
 - test/functional/host/extensions/info_test.rb
 - test/functional/host/extensions/list_test.rb
+- test/functional/host/extensions/update_test.rb
 - test/functional/host/host_helpers.rb
 - test/functional/host/subscription/attach_test.rb
 - test/functional/host/subscription/auto_attach_test.rb
@@ -431,6 +425,8 @@ files:
 - test/functional/repository/upload_test.rb
 - test/functional/search_helpers.rb
 - test/functional/subscription/list_test.rb
+- test/functional/sync_plan/info_test.rb
+- test/functional/sync_plan/list_test.rb
 - test/functional/sync_plan/sync_plan_helpers.rb
 - test/functional/test_helper.rb
 - test/task_helper.rb
@@ -519,6 +515,9 @@ test_files:
 - test/functional/content_view/version/promote_test.rb
 - test/functional/content_view/version/republish_repositories_test.rb
 - test/functional/erratum/list_test.rb
+- test/functional/file/file_helpers.rb
+- test/functional/file/info_test.rb
+- test/functional/file/list_test.rb
 - test/functional/filter_rule/create_test.rb
 - test/functional/filter_rule/delete_test.rb
 - test/functional/filter_rule/filter_rule_helpers.rb
@@ -526,10 +525,12 @@ test_files:
 - test/functional/filter_rule/list_test.rb
 - test/functional/filter_rule/update_test.rb
 - test/functional/host/errata/apply_test.rb
+- test/functional/host/extensions/create_test.rb
 - test/functional/host/extensions/data/host.json
 - test/functional/host/extensions/data/host_list.json
 - test/functional/host/extensions/info_test.rb
 - test/functional/host/extensions/list_test.rb
+- test/functional/host/extensions/update_test.rb
 - test/functional/host/host_helpers.rb
 - test/functional/host/subscription/attach_test.rb
 - test/functional/host/subscription/auto_attach_test.rb
@@ -582,6 +583,8 @@ test_files:
 - test/functional/repository/upload_test.rb
 - test/functional/search_helpers.rb
 - test/functional/subscription/list_test.rb
+- test/functional/sync_plan/info_test.rb
+- test/functional/sync_plan/list_test.rb
 - test/functional/sync_plan/sync_plan_helpers.rb
 - test/functional/test_helper.rb
 - test/task_helper.rb