hammer_cli_katello 0.11.5.1 → 0.12.0

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

@@ -74,6 +74,10 @@
       "content_view_name":"Default Organization View",
       "lifecycle_environment_id":1,
       "lifecycle_environment_name":"Library",
+      "content_source_id":2,
+      "content_source_name":"capsule",
+      "kickstart_repository_id":10000,
+      "kickstart_repository_name":"Rhel 7",
       "content_view":{
          "id":1,
          "name":"Default Organization View"

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

@@ -15,10 +15,12 @@ describe 'host info' do
     ex.returns(JSON.parse(File.read(json_file)))
 
     result = run_cmd(@cmd + params)
-
-    expected_fields = [['Lifecycle Environment', 'Library'],
-                       ['Content View', 'Default Organization View'],
+    # rubocop:disable Style/WordArray
+    expected_fields = [['Name', 'Library'],
+                       ['Name', 'Default Organization View'],
                        ['Release Version', '7Server'],
+                       ['Name', 'Rhel 7'],
+                       ['Name', 'capsule'],
                        ['Bug Fix', '0'],
                        ['Name', 'my host collection'],
                        ['Applicable Packages', '5'],

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

@@ -0,0 +1,69 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+require 'hammer_cli_foreman/host'
+
+module HammerCLIForeman
+  describe Host do
+    # These tests are only for the extensions Katello adds to the hostgroup command
+    # See hammer-cli-foreman for the core hostgroup tests
+    describe UpdateCommand do
+      it 'allows kickstart repository name' do
+        env_name = "world"
+        env_id = 100
+        cv_id = 200
+        repo_name = "life_of_kickstart"
+        repo_id = 111
+        host_id = 777
+        organization_id = 329
+        api_expects(:lifecycle_environments, :index).
+          with_params('name' => env_name,
+                      'organization_id' => organization_id).
+          returns(index_response([{'id' => env_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(:hosts, :update).
+          with_params('id' => host_id.to_s,
+                      'host' => {
+                        'organization_id' => organization_id,
+                        'content_facet_attributes' => {
+                          'lifecycle_environment_id' => env_id,
+                          'content_view_id' => cv_id,
+                          'kickstart_repository_id' => repo_id
+                        }
+                      })
+
+        cmd = "host update --id=#{host_id}"\
+              " --content-view-id=#{cv_id}"\
+              " --lifecycle-environment=#{env_name}"\
+              " --kickstart-repository=#{repo_name}"\
+              " --organization-id=#{organization_id}"
+        run_cmd(cmd.split)
+      end
+
+      it 'allows content source name' do
+        content_source_name = "life_of_cs"
+        content_source_id = 111
+        host_id = 441
+
+        api_expects(:smart_proxies, :index).
+          with_params(:search => "name = \"#{content_source_name}\"").
+          returns(index_response([{'id' => content_source_id}]))
+
+        api_expects(:hosts, :update).
+          with_params('id' => host_id.to_s,
+                      'host' => {
+                        'content_facet_attributes' => {
+                          'content_source_id' => content_source_id
+                        }
+                      })
+
+        cmd = "host update --id #{host_id} --content-source #{content_source_name}"
+        run_cmd(cmd.split)
+      end
+    end
+  end
+end

data/test/functional/host_collection/add_host_test.rb

@@ -3,6 +3,39 @@ require 'hammer_cli_katello/host_collection'
 
 module HammerCLIKatello
   describe HostCollection::AddHostCommand do
+    describe 'handles individual host errors' do
+      it 'for successful results' do
+        api_expects(:host_collections, :add_hosts)
+          .with_params('id' => 1, 'host_ids' => %w(2 3))
+          .returns("displayMessages" => {"success" => ["Successfully added 2 Host(s)."],
+                                         "error" => []})
+        result = run_cmd(%w(host-collection add-host --id 1 --host-ids 2,3))
+        assert_match("The host(s) has been added", result.out)
+      end
+
+      it 'for mixed results' do
+        api_expects(:host_collections, :add_hosts)
+          .with_params('id' => 1, 'host_ids' => %w(2 3))
+          .returns("displayMessages" => {"success" => ["Successfully added 1 Host(s)."],
+                                         "error" => ["Host with ID 3 not found."]})
+        result = run_cmd(%w(host-collection add-host --id 1 --host-ids 2,3))
+        assert_match("Could not add host(s)", result.out)
+        assert_match("Host with ID 3 not found.", result.out)
+      end
+
+      it 'for errored results' do
+        api_expects(:host_collections, :add_hosts)
+          .with_params('id' => 1, 'host_ids' => %w(2 3))
+          .returns("displayMessages" => {"success" => [], "error" => [
+            "Host with ID 1 already exists in the host collection.",
+            "Host with ID 3 not found."]})
+        result = run_cmd(%w(host-collection add-host --id 1 --host-ids 2,3))
+        assert_match("Could not add host(s)", result.out)
+        assert_match("Host with ID 1 already exists in the host collection.", result.out)
+        assert_match("Host with ID 3 not found.", result.out)
+      end
+    end
+
     it 'does not require organization options if id is specified' do
       api_expects(:host_collections, :add_hosts)
       run_cmd(%w(host-collection add-host --id 1))
@@ -10,9 +43,9 @@ module HammerCLIKatello
 
     it 'requires organization options if name is specified' do
       result = run_cmd(%w(host-collection add-host --name hc1))
-      expected_error = "Could not find organization"
-      assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
-      assert_equal(result.err[/#{expected_error}/], expected_error)
+      expected_error = "Missing options to search organization"
+      assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
+      assert_equal(expected_error, result.err[/#{expected_error}/])
     end
 
     it 'allows organization id' do

data/test/functional/host_collection/copy_test.rb

@@ -5,7 +5,7 @@ module HammerCLIKatello
   describe HostCollection::CopyCommand do
     it 'requires a new name' do
       result = run_cmd(%w(host-collection copy --id 1))
-      expected_error = "option '--new-name' is required"
+      expected_error = "Option '--new-name' is required."
       assert_equal(result.exit_code, HammerCLI::EX_USAGE)
       assert_equal(result.err[/#{expected_error}/], expected_error)
     end
@@ -17,9 +17,9 @@ module HammerCLIKatello
 
     it 'requires organization options if name is specified' do
       result = run_cmd(%w(host-collection copy --name hc1 --new-name foo))
-      expected_error = "Could not find organization"
-      assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
-      assert_equal(result.err[/#{expected_error}/], expected_error)
+      expected_error = "Missing options to search organization"
+      assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
+      assert_equal(expected_error, result.err[/#{expected_error}/])
     end
 
     it 'allows organization id' do

data/test/functional/host_collection/delete_test.rb

@@ -10,9 +10,9 @@ module HammerCLIKatello
 
     it 'requires organization options if name is specified' do
       result = run_cmd(%w(host-collection delete --name hc1))
-      expected_error = "Could not find organization"
-      assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
-      assert_equal(result.err[/#{expected_error}/], expected_error)
+      expected_error = "Missing options to search organization"
+      assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
+      assert_equal(expected_error, result.err[/#{expected_error}/])
     end
 
     it 'allows organization id' do

data/test/functional/host_collection/hosts_test.rb

@@ -24,8 +24,7 @@ module HammerCLIKatello
 
     it 'requires organization with host collection name' do
       result = run_cmd(%w(host-collection hosts --name collection))
-      expected_error = "Error: Could not find organization, please set one of options " \
-                       "--organization, --organization-label, --organization-id."
+      expected_error = "Missing options to search organization"
       assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
       assert_equal(expected_error, result.err[/#{expected_error}/])
     end

data/test/functional/host_collection/info_test.rb

@@ -10,9 +10,9 @@ module HammerCLIKatello
 
     it 'requires organization options if id is not specified' do
       result = run_cmd(%w(host-collection info --name hc1))
-      expected_error = "Could not find organization"
-      assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
-      assert_equal(result.err[/#{expected_error}/], expected_error)
+      expected_error = "Missing options to search organization"
+      assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
+      assert_equal(expected_error, result.err[/#{expected_error}/])
     end
 
     it 'allows organization id' do

data/test/functional/host_collection/remove_host_test.rb

@@ -3,6 +3,39 @@ require 'hammer_cli_katello/host_collection'
 
 module HammerCLIKatello
   describe HostCollection::RemoveHostCommand do
+    describe 'handles individual host errors' do
+      it 'for successful results' do
+        api_expects(:host_collections, :remove_hosts)
+          .with_params('id' => 1, 'host_ids' => %w(2 3))
+          .returns("displayMessages" => {"success" => ["Successfully removed 2 Host(s)."],
+                                         "error" => []})
+        result = run_cmd(%w(host-collection remove-host --id 1 --host-ids 2,3))
+        assert_match("The host(s) has been removed", result.out)
+      end
+
+      it 'for mixed results' do
+        api_expects(:host_collections, :remove_hosts)
+          .with_params('id' => 1, 'host_ids' => %w(2 3))
+          .returns("displayMessages" => {"success" => ["Successfully removed 1 Host(s)."],
+                                         "error" => ["Host with ID 3 not found."]})
+        result = run_cmd(%w(host-collection remove-host --id 1 --host-ids 2,3))
+        assert_match("Could not remove host(s)", result.out)
+        assert_match("Host with ID 3 not found.", result.out)
+      end
+
+      it 'for errored results' do
+        api_expects(:host_collections, :remove_hosts)
+          .with_params('id' => 1, 'host_ids' => %w(2 3))
+          .returns("displayMessages" => {"success" => [], "error" => [
+            "Host with ID 1 does not exist in the host collection.",
+            "Host with ID 3 not found."]})
+        result = run_cmd(%w(host-collection remove-host --id 1 --host-ids 2,3))
+        assert_match("Could not remove host(s)", result.out)
+        assert_match("Host with ID 1 does not exist in the host collection.", result.out)
+        assert_match("Host with ID 3 not found.", result.out)
+      end
+    end
+
     it 'does not require organization options if id is specified' do
       api_expects(:host_collections, :remove_hosts)
       run_cmd(%w(host-collection remove-host --id 1))
@@ -10,9 +43,9 @@ module HammerCLIKatello
 
     it 'requires organization options if name is specified' do
       result = run_cmd(%w(host-collection remove-host --name hc1))
-      expected_error = "Could not find organization"
-      assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
-      assert_equal(result.err[/#{expected_error}/], expected_error)
+      expected_error = "Missing options to search organization"
+      assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
+      assert_equal(expected_error, result.err[/#{expected_error}/])
     end
 
     it 'allows organization id' do

data/test/functional/host_collection/update_test.rb

@@ -10,9 +10,9 @@ module HammerCLIKatello
 
     it 'requires organization options if name is specified' do
       result = run_cmd(%w(host-collection update --name hc1))
-      expected_error = "Could not find organization"
-      assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
-      assert_equal(result.err[/#{expected_error}/], expected_error)
+      expected_error = "Missing options to search organization"
+      assert_equal(HammerCLI::EX_SOFTWARE, result.exit_code)
+      assert_equal(expected_error, result.err[/#{expected_error}/])
     end
 
     it 'allows organization id' do

data/test/functional/hostgroup/create_test.rb

@@ -13,6 +13,24 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup create --name hg1 --content-source-id 1))
       end
 
+      it 'allows content source name' do
+        content_source_name = "life_of_cs"
+        content_source_id = 111
+        hg_name = "mercury"
+
+        api_expects(:smart_proxies, :index).
+          with_params(:search => "name = \"#{content_source_name}\"").
+          returns(index_response([{'id' => content_source_id}]))
+
+        api_expects(:hostgroups, :create).
+          with_params('hostgroup' => {'name' => hg_name,
+                                      'content_source_id' => content_source_id
+                                     })
+
+        cmd = "hostgroup create --name #{hg_name} --content-source #{content_source_name}"
+        run_cmd(cmd.split)
+      end
+
       it 'allows content view id' do
         api_expects(:hostgroups, :create) do |p|
           p['hostgroup']['name'] == 'hg1' && p['hostgroup']['content_view_id'] == 1
@@ -47,7 +65,7 @@ module HammerCLIForeman
 
       it 'allows lifecycle environment name' do
         ex = api_expects(:lifecycle_environments, :index) do |p|
-          p[:name] = 'le1' && p['organization_id'] == '1'
+          p['name'] == 'le1' && p['organization_id'] == '1'
         end
         ex.returns(index_response([{'id' => 1}]))
         api_expects(:hostgroups, :create) do |p|
@@ -62,6 +80,33 @@ module HammerCLIForeman
         result = run_cmd(%w(hostgroup create --name hg1 --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"
+
+        api_expects(:repositories, :index).
+          with_params('name' => repo_name,
+                      'environment_id' => env_id,
+                      'content_view_id' => cv_id).
+          returns(index_response([{'id' => repo_id}]))
+
+        expected_params = {'hostgroup' => {
+          'name' => hg_name,
+          'lifecycle_environment_id' => env_id,
+          'content_view_id' => cv_id,
+          'kickstart_repository_id' => repo_id
+        }
+                          }
+        api_expects(:hostgroups, :create).with_params(expected_params)
+
+        cmd = "hostgroup create --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/hostgroup/data/hostgroup.json

@@ -1,48 +1,50 @@
 {
-	"content_source_id":1,
-	"content_source_name":"foreman.example.com",
-	"content_view_id":1,
-	"content_view_name":"Default Organization View",
-	"lifecycle_environment_id":1,
-	"lifecycle_environment_name":"Library",
-	"subnet_id":null,
-	"subnet_name":null,
-	"operatingsystem_id":null,
-	"operatingsystem_name":null,
-	"domain_id":null,
-	"domain_name":null,
-	"environment_id":1,
-	"environment_name":"Production Env",
-	"compute_profile_id":null,
-	"compute_profile_name":null,
-	"ancestry":null,
-	"parent_id":null,
-	"parent_name":null,
-	"puppet_proxy_id":null,
-	"puppet_ca_proxy_id":null,
-	"ptable_id":null,
-	"ptable_name":null,
-	"medium_id":null,
-	"medium_name":null,
-	"architecture_id":null,
-	"architecture_name":null,
-	"realm_id":null,
-	"realm_name":null,
-	"created_at":"2016-08-09 04:18:32 UTC",
-	"updated_at":"2016-08-09 04:18:32 UTC",
-	"id":1,
-	"parameters":[],
-	"template_combinations":[],
-	"puppetclasses":[],
-	"config_groups":[],
-	"all_puppetclasses":[],
-	"locations":[],
-	"organizations":[
-	{
-		"id":1,
-		"name":"Redhat",
-		"title":"Redhat",
-		"description":null
-	}
-	]
+  "content_source_id":1,
+  "content_source_name":"foreman.example.com",
+  "content_view_id":1,
+  "content_view_name":"Default Organization View",
+  "lifecycle_environment_id":1,
+  "lifecycle_environment_name":"Library",
+  "kickstart_repository_id":10000,
+  "kickstart_repository_name":"Rhel 7",
+  "subnet_id":null,
+  "subnet_name":null,
+  "operatingsystem_id":null,
+  "operatingsystem_name":null,
+  "domain_id":null,
+  "domain_name":null,
+  "environment_id":1,
+  "environment_name":"Production Env",
+  "compute_profile_id":null,
+  "compute_profile_name":null,
+  "ancestry":null,
+  "parent_id":null,
+  "parent_name":null,
+  "puppet_proxy_id":null,
+  "puppet_ca_proxy_id":null,
+  "ptable_id":null,
+  "ptable_name":null,
+  "medium_id":null,
+  "medium_name":null,
+  "architecture_id":null,
+  "architecture_name":null,
+  "realm_id":null,
+  "realm_name":null,
+  "created_at":"2016-08-09 04:18:32 UTC",
+  "updated_at":"2016-08-09 04:18:32 UTC",
+  "id":1,
+  "parameters":[],
+  "template_combinations":[],
+  "puppetclasses":[],
+  "config_groups":[],
+  "all_puppetclasses":[],
+  "locations":[],
+  "organizations":[
+  {
+    "id":1,
+    "name":"Redhat",
+    "title":"Redhat",
+    "description":null
+  }
+  ]
 }

data/test/functional/hostgroup/info_test.rb

@@ -20,9 +20,11 @@ module HammerCLIForeman
         ex.returns(JSON.parse(File.read(json_file)))
 
         result = run_cmd(@cmd + params)
-        expected_fields = [['Lifecycle Environment', 'Library'],
-                           ['Content View', 'Default Organization View'],
-                           ['Content Source', 'foreman.example.com']]
+        # rubocop:disable Style/WordArray
+        expected_fields = [['Name', 'Library'],
+                           ['Name', 'Default Organization View'],
+                           ['Name', 'foreman.example.com'],
+                           ['Name', 'Rhel 7']]
         expected_results = expected_fields.map { |field| success_result(FieldMatcher.new(*field)) }
         expected_results.each { |expected|  assert_cmd(expected, result) }
       end