hammer_cli_katello 0.11.5.1 → 0.12.0

data/test/functional/content_view/filter/info_test.rb

@@ -26,7 +26,6 @@ module HammerCLIKatello
 
       expect_organization_search('pkd', 1)
       expect_content_view_search(1, 'darkly', 1)
-      expect_content_view_search(1, 'darkly', 1) # redmine #15930
 
       ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
         par['content_view_id'] == 1 && par['name'] == 'scanner'
@@ -45,7 +44,6 @@ module HammerCLIKatello
 
       expect_organization_search('pkd', 1, field: 'label')
       expect_content_view_search(1, 'darkly', 1)
-      expect_content_view_search(1, 'darkly', 1) # redmine #15930
 
       ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
         par['content_view_id'] == 1 && par['name'] == 'scanner'
@@ -63,7 +61,6 @@ module HammerCLIKatello
       params = ['--name=scanner', '--content-view=darkly', '--organization-id=1']
 
       expect_content_view_search('1', 'darkly', 1)
-      expect_content_view_search('1', 'darkly', 1) # redmine #15930
 
       ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
         par['content_view_id'] == 1 && par['name'] == 'scanner'
@@ -82,7 +79,7 @@ module HammerCLIKatello
       expected_result = usage_error_result(
         @cmd,
         'At least one of options --organization-id, --organization, --organization-label ' \
-        'is required'
+        'is required.'
       )
       api_expects_no_call
       result = run_cmd(@cmd + params)

data/test/functional/content_view/filter/list_test.rb

@@ -89,7 +89,7 @@ FILTER ID | NAME | TYPE | INCLUSION
     params = ["--content-view=#{cv_name}"]
     expected_result = usage_error_result(
       @cmd,
-      'At least one of options --organization-id, --organization, --organization-label is required'
+      'At least one of options --organization-id, --organization, --organization-label is required.'
     )
     api_expects_no_call
     result = run_cmd(@cmd + params)

data/test/functional/content_view/filter/update_test.rb

@@ -26,7 +26,6 @@ module HammerCLIKatello
 
       expect_organization_search('pkd', 1)
       expect_content_view_search(1, 'darkly', 1)
-      expect_content_view_search(1, 'darkly', 1) # redmine #15930
 
       ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
         par['content_view_id'] == 1 && par['name'] == 'scanner'
@@ -46,7 +45,6 @@ module HammerCLIKatello
 
       expect_organization_search('pkd', 1, field: 'label')
       expect_content_view_search(1, 'darkly', 1)
-      expect_content_view_search(1, 'darkly', 1) # redmine #15930
 
       ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
         par['content_view_id'] == 1 && par['name'] == 'scanner'
@@ -64,7 +62,6 @@ module HammerCLIKatello
       params = ['--name=scanner', '--content-view=darkly', '--organization-id=1', '--new-name=ubik']
 
       expect_content_view_search('1', 'darkly', 1)
-      expect_content_view_search('1', 'darkly', 1) # redmine #15930
 
       ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
         par['content_view_id'] == 1 && par['name'] == 'scanner'
@@ -82,7 +79,7 @@ module HammerCLIKatello
       params = ["--name=high-castle"]
       expected_result = usage_error_result(
         @cmd,
-        'At least one of options --content-view-id, --content-view is required',
+        'At least one of options --content-view-id, --content-view is required.',
         'Could not update the filter'
       )
       api_expects_no_call

data/test/functional/erratum/list_test.rb

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

data/test/functional/file/file_helpers.rb

@@ -0,0 +1,13 @@
+require_relative '../search_helpers'
+
+module FileHelpers
+  include SearchHelpers
+
+  def expect_file_search(params, returns)
+    expect_generic_search(:file_units, params: params, returns: returns)
+  end
+
+  def expect_file_show(params)
+    api_expects(:file_units, :show).with_params(params)
+  end
+end

data/test/functional/file/info_test.rb

@@ -0,0 +1,162 @@
+require_relative '../test_helper.rb'
+require_relative '../organization/organization_helpers'
+require_relative '../content_view/content_view_helpers'
+require_relative '../repository/repository_helpers'
+require_relative '../product/product_helpers'
+require_relative 'file_helpers'
+require 'hammer_cli_katello/file'
+
+# rubocop:disable ModuleLength
+module HammerCLIKatello
+  describe FileCommand::InfoCommand do
+    include FileHelpers
+    include ContentViewHelpers
+    include RepositoryHelpers
+    include ProductHelpers
+    include OrganizationHelpers
+
+    it 'allows minimal options' do
+      expect_file_show('id' => '1')
+      run_cmd(%w(file info --id 1))
+    end
+
+    describe 'requires' do
+      describe 'organization options' do
+        it 'to resolve product ID' do
+          api_expects_no_call
+          result = run_cmd(%w(file list --product product1))
+          assert_match(/--organization-id/, result.err)
+        end
+
+        it 'to resolve content view ID' do
+          api_expects_no_call
+          result = run_cmd(%w(file list --content-view cv1))
+          assert_match(/--organization-id/, result.err)
+        end
+      end
+
+      describe 'product options' do
+        it 'to resolve repository ID' do
+          api_expects_no_call
+          result = run_cmd(%w(file list --repository repo1))
+          assert_match(/--product-id/, result.err)
+        end
+      end
+    end
+
+    describe 'allows filtering by' do
+      it 'repository ID' do
+        expect_file_search({'repository_id' => 2}, {})
+        run_cmd(%w(file list --repository-id 2))
+      end
+
+      it 'content view version ID' do
+        expect_file_search({'content_view_version_id' => 2}, {})
+        run_cmd(%w(file list --content-view-version-id 2))
+      end
+    end
+
+    describe 'resolves ID from file name' do
+      it 'and repository ID' do
+        expect_file_search({'repository_id' => '2', search: "name = \"foo\""}, 'id' => 1)
+        expect_file_show('id' => 1)
+        run_cmd(%w(file info --name foo --repository-id 2))
+      end
+
+      describe 'repository name' do
+        it 'and product ID' do
+          expect_generic_repositories_search({'name' => 'repo2', 'product_id' => 1}, 'id' => 2)
+          expect_file_search({'repository_id' => '2', search: "name = \"foo\""}, 'id' => 1)
+          expect_file_show('id' => 1)
+          run_cmd(%w(file info --name foo --repository repo2 --product-id 1))
+        end
+
+        describe 'product name, and organization' do
+          it 'ID' do
+            expect_generic_product_search({'name' => 'product1', 'organization_id' => 3}, 'id' => 1)
+            expect_generic_repositories_search({'name' => 'repo2', 'product_id' => 1}, 'id' => 2)
+            expect_file_search({'repository_id' => '2', search: "name = \"foo\""}, 'id' => 1)
+            expect_file_show('id' => 1)
+            run_cmd(%w(file info --name foo --repository repo2 --product product1
+                       --organization-id 3))
+          end
+
+          it 'name' do
+            expect_organization_search('org3', 3)
+            expect_generic_product_search({'name' => 'product1', 'organization_id' => 3}, 'id' => 1)
+            expect_generic_repositories_search({'name' => 'repo2', 'product_id' => 1}, 'id' => 2)
+            expect_file_search({'repository_id' => '2', search: "name = \"foo\""}, 'id' => 1)
+            expect_file_show('id' => 1)
+            run_cmd(%w(file info --name foo --repository repo2 --product product1
+                       --organization org3))
+          end
+
+          it 'label' do
+            expect_organization_search('org3', 3, field: 'label')
+            expect_generic_product_search({'name' => 'product1', 'organization_id' => 3}, 'id' => 1)
+            expect_generic_repositories_search({'name' => 'repo2', 'product_id' => 1}, 'id' => 2)
+            expect_file_search({'repository_id' => '2', search: "name = \"foo\""}, 'id' => 1)
+            expect_file_show('id' => 1)
+            run_cmd(%w(file info --name foo --repository repo2 --product product1
+                       --organization-label org3))
+          end
+        end
+      end
+
+      it 'and content view version ID' do
+        expect_file_search({'content_view_version_id' => '2', 'name' => 'foo'}, 'id' => 1)
+        expect_file_show('id' => 1)
+        run_cmd(%w(file info --name foo --content-view-version-id 2))
+      end
+
+      describe 'content view version' do
+        it 'and content view ID' do
+          expect_content_view_version_search({'version' => '2.0',
+                                              'content_view_id' => 3}, 'id' => 2)
+          expect_file_search({'content_view_version_id' => '2',
+                              search: "name = \"foo\""}, 'id' => 1)
+          expect_file_show('id' => 1)
+          run_cmd(%w(file info --name foo --content-view-version 2.0 --content-view-id 3))
+        end
+
+        describe 'content view name, and organization' do
+          it 'ID' do
+            expect_content_view_search(4, 'cv3', 3)
+            expect_content_view_version_search({'version' => '2.0',
+                                                'content_view_id' => 3}, 'id' => 2)
+            expect_file_search({'content_view_version_id' => '2',
+                                search: "name = \"foo\""}, 'id' => 1)
+            expect_file_show('id' => 1)
+            run_cmd(%w(file info --name foo --content-view-version 2.0 --content-view cv3
+                       --organization-id 4))
+          end
+
+          it 'name' do
+            expect_organization_search('org4', 4)
+            expect_content_view_search(4, 'cv3', 3)
+            expect_content_view_version_search({'version' => '2.0',
+                                                'content_view_id' => 3}, 'id' => 2)
+            expect_file_search({'content_view_version_id' => '2',
+                                search: "name = \"foo\""}, 'id' => 1)
+            expect_file_show('id' => 1)
+            run_cmd(%w(file info --name foo --content-view-version 2.0 --content-view cv3
+                       --organization org4))
+          end
+
+          it 'label' do
+            expect_organization_search('org4', 4, field: 'label')
+            expect_content_view_search(4, 'cv3', 3)
+            expect_content_view_version_search({'version' => '2.0',
+                                                'content_view_id' => 3}, 'id' => 2)
+            expect_file_search({'content_view_version_id' => '2',
+                                search: "name = \"foo\""}, 'id' => 1)
+            expect_file_show('id' => 1)
+            run_cmd(%w(file info --name foo --content-view-version 2.0 --content-view cv3
+                       --organization-label org4))
+          end
+        end
+      end
+    end
+  end
+end
+# rubocop:enable ModuleLength

data/test/functional/file/list_test.rb

@@ -0,0 +1,112 @@
+require_relative '../test_helper.rb'
+require_relative '../organization/organization_helpers'
+require_relative '../content_view/content_view_helpers'
+require_relative '../repository/repository_helpers'
+require_relative '../product/product_helpers'
+require_relative 'file_helpers'
+require 'hammer_cli_katello/file'
+
+module HammerCLIKatello
+  describe FileCommand::ListCommand do
+    include FileHelpers
+    include ContentViewHelpers
+    include RepositoryHelpers
+    include ProductHelpers
+    include OrganizationHelpers
+
+    it 'allows minimal options' do
+      expect_file_search({}, {})
+      run_cmd(%w(file list))
+    end
+
+    describe 'requires' do
+      describe 'organization options' do
+        it 'to resolve product ID' do
+          api_expects_no_call
+          result = run_cmd(%w(file list --product product1))
+          assert_match(/--organization-id/, result.err)
+        end
+
+        it 'to resolve content view ID' do
+          api_expects_no_call
+          result = run_cmd(%w(file list --content-view cv1))
+          assert_match(/--organization-id/, result.err)
+        end
+      end
+
+      describe 'product options' do
+        it 'to resolve repository ID' do
+          api_expects_no_call
+          result = run_cmd(%w(file list --repository repo1))
+          assert_match(/--product-id/, result.err)
+        end
+      end
+    end
+
+    describe 'allows filtering by' do
+      it 'repository ID' do
+        expect_file_search({'repository_id' => 2}, {})
+        run_cmd(%w(file list --repository-id 2))
+      end
+
+      it 'content view version ID' do
+        expect_file_search({'content_view_version_id' => 2}, {})
+        run_cmd(%w(file list --content-view-version-id 2))
+      end
+    end
+
+    describe 'resolves' do
+      describe 'repository ID' do
+        it 'from name and product ID' do
+          expect_generic_repositories_search(
+            {'name' => 'repo2', 'product_id' => 1}, 'id' => 2)
+          expect_file_search({'repository_id' => 2}, {})
+          run_cmd(%w(file list --repository repo2 --product-id 1))
+        end
+
+        it 'from name, product, and organization ID' do
+          expect_generic_product_search({'name' => 'product1', 'organization_id' => 3}, 'id' => 1)
+          expect_generic_repositories_search({'name' => 'repo2', 'product_id' => 1}, 'id' => 2)
+          expect_file_search({'repository_id' => 2}, {})
+          run_cmd(%w(file list --repository repo2 --product product1 --organization-id 3))
+        end
+
+        it 'from name, product, and organization name' do
+          expect_organization_search('org3', 3)
+          expect_generic_product_search({'name' => 'product1', 'organization_id' => 3}, 'id' => 1)
+          expect_generic_repositories_search({'name' => 'repo2', 'product_id' => 1}, 'id' => 2)
+          expect_file_search({'repository_id' => 2}, {})
+          run_cmd(%w(file list --repository repo2 --product product1 --organization org3))
+        end
+      end
+
+      describe 'content view version ID' do
+        it 'from version and content view ID' do
+          expect_content_view_version_search(
+            {'version' => '1.0', 'content_view_id' => 1}, 'id' => 2)
+          expect_file_search({'content_view_version_id' => 2}, {})
+          run_cmd(%w(file list --content-view-version 1.0 --content-view-id 1))
+        end
+
+        it 'from version, content view name, and organization ID' do
+          expect_generic_content_view_search(params: {'name' => 'cv1', 'organization_id' => 3},
+                                             returns: {'id' => 1})
+          expect_content_view_version_search(
+            {'version' => '1.0', 'content_view_id' => 1}, 'id' => 2)
+          expect_file_search({'content_view_version_id' => 2}, {})
+          run_cmd(%w(file list --content-view-version 1.0 --content-view cv1 --organization-id 3))
+        end
+
+        it 'from version, content view name, and organization name' do
+          expect_organization_search('org3', 3)
+          expect_generic_content_view_search(params: {'name' => 'cv1', 'organization_id' => 3},
+                                             returns: {'id' => 1})
+          expect_content_view_version_search(
+            {'version' => '1.0', 'content_view_id' => 1}, 'id' => 2)
+          expect_file_search({'content_view_version_id' => 2}, {})
+          run_cmd(%w(file list --content-view-version 1.0 --content-view cv1 --organization org3))
+        end
+      end
+    end
+  end
+end

data/test/functional/filter_rule/info_test.rb

@@ -1,5 +1,5 @@
 require_relative '../test_helper'
-require 'hammer_cli_katello/filter_rule'
+require_relative 'filter_rule_helpers'
 require 'hammer_cli_katello/filter_rule'
 
 module HammerCLIKatello

data/test/functional/filter_rule/update_test.rb

@@ -1,5 +1,5 @@
 require_relative '../test_helper'
-require 'hammer_cli_katello/filter_rule'
+require_relative 'filter_rule_helpers'
 require 'hammer_cli_katello/filter_rule'
 
 module HammerCLIKatello

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

@@ -0,0 +1,95 @@
+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 host command
+    # See hammer-cli-foreman for the core host tests
+    describe CreateCommand do
+      let(:env_name) { "world" }
+      let(:env_id) { 100 }
+      let(:cv_id) { 220 }
+      let(:repo_name) { "life_of_kickstart" }
+      let(:repo_id) { 12 }
+      let(:content_source_name) { "life_of_cs" }
+      let(:content_source_id) { 82 }
+      let(:host_name) { "mercury" }
+      let(:domain_id) { 134 }
+      let(:operatingsystem_id) { 103 }
+      let(:architecture_id) { 28 }
+      let(:partition_table_id) { 243 }
+      let(:location_id) { 213 }
+      let(:organization_id) { 324 }
+
+      it 'allows kickstart repository name' do
+        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, :create).
+          with_params('host' => {
+                        'name' => host_name,
+                        'location_id' => location_id,
+                        'organization_id' => organization_id,
+                        'operatingsystem_id' => operatingsystem_id,
+                        'architecture_id' => architecture_id,
+                        'ptable_id' => partition_table_id,
+                        'domain_id' => domain_id,
+                        'content_facet_attributes' => {
+                          'lifecycle_environment_id' => env_id,
+                          'content_view_id' => cv_id,
+                          'kickstart_repository_id' => repo_id
+                        }
+                      })
+
+        cmd = "host create --name=#{host_name} --content-view-id=#{cv_id}"\
+              " --lifecycle-environment=#{env_name}"\
+              " --kickstart-repository=#{repo_name}"\
+              " --operatingsystem-id=#{operatingsystem_id}"\
+              " --architecture-id=#{architecture_id}"\
+              " --organization-id=#{organization_id}"\
+              " --partition-table-id=#{partition_table_id}"\
+              " --location-id=#{location_id}"\
+              " --domain-id=#{domain_id}"
+        run_cmd(cmd.split)
+      end
+
+      it 'allows content source name' do
+        api_expects(:smart_proxies, :index).
+          with_params(:search => "name = \"#{content_source_name}\"").
+          returns(index_response([{'id' => content_source_id}]))
+
+        api_expects(:hosts, :create).
+          with_params('host' => {
+                        'name' => host_name,
+                        'location_id' => location_id,
+                        'organization_id' => organization_id,
+                        'operatingsystem_id' => operatingsystem_id,
+                        'architecture_id' => architecture_id,
+                        'ptable_id' => partition_table_id,
+                        'domain_id' => domain_id,
+                        'content_facet_attributes' => {
+                          'content_source_id' => content_source_id
+                        }
+                      })
+
+        cmd = "host create --name=#{host_name}"\
+              " --content-source=#{content_source_name}"\
+              " --operatingsystem-id=#{operatingsystem_id}"\
+              " --architecture-id=#{architecture_id}"\
+              " --organization-id=#{organization_id}"\
+              " --partition-table-id=#{partition_table_id}"\
+              " --location-id=#{location_id}"\
+              " --domain-id=#{domain_id}"
+        run_cmd(cmd.split)
+      end
+    end
+  end
+end