hammer_cli_katello 1.12.0 → 1.13.0

data/test/functional/content_import/version_test.rb

@@ -21,7 +21,7 @@ describe 'content-import version' do
     File.dirname(__FILE__)
   end
 
-  let(:metadata) do
+  let(:metadata_json) do
     JSON.parse(File.read("#{path}/metadata.json"))
   end
 
@@ -34,7 +34,8 @@ describe 'content-import version' do
       '--async'
     ]
     api_expects(:content_imports, :version)
-      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
+      .with_params('organization_id' => organization_id, 'path' => path,
+                   'metadata' => metadata_json)
       .returns(response)
 
     result = run_cmd(@cmd + params)
@@ -50,7 +51,8 @@ describe 'content-import version' do
     ]
 
     api_expects(:content_imports, :version)
-      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
+      .with_params('organization_id' => organization_id, 'path' => path,
+                   'metadata' => metadata_json)
       .returns(response)
 
     expect_foreman_task(task_id)

data/test/functional/content_view/component/add_test.rb

@@ -5,11 +5,11 @@ module HammerCLIKatello
   describe ContentViewComponent::AddComponents do
     before do
       @cmd = %w(content-view component add)
-      @composite = OpenStruct.new(:id => 2, :name => "composite")
-      @component_version = OpenStruct.new(:id => 666, :version => "1.0")
-      @component = OpenStruct.new(:id => 6, :name => "component",
+      @composite = ::OpenStruct.new(:id => 2, :name => "composite")
+      @component_version = ::OpenStruct.new(:id => 666, :version => "1.0")
+      @component = ::OpenStruct.new(:id => 6, :name => "component",
                                   :content_view_version => @component_version)
-      @organization = OpenStruct.new(:id => 1, :name => "great", :label => "label")
+      @organization = ::OpenStruct.new(:id => 1, :name => "great", :label => "label")
     end
 
     def setup_org_expectations

data/test/functional/content_view/component/remove_test.rb

@@ -5,18 +5,18 @@ module HammerCLIKatello
     before do
       @cmd = %w(content-view component remove)
 
-      @component = OpenStruct.new(:id => 6, :name => "component")
-      @component2 = OpenStruct.new(:id => 7, :name => "component2")
+      @component = ::OpenStruct.new(:id => 6, :name => "component")
+      @component2 = ::OpenStruct.new(:id => 7, :name => "component2")
 
-      @content_view_component = OpenStruct.new(:id => 1444,
+      @content_view_component = ::OpenStruct.new(:id => 1444,
                                                :content_view => @component)
 
-      @content_view_component2 = OpenStruct.new(:id => 1445,
+      @content_view_component2 = ::OpenStruct.new(:id => 1445,
                                                 :content_view => @component2)
 
-      @composite = OpenStruct.new(:id => 2, :name => "composite",
+      @composite = ::OpenStruct.new(:id => 2, :name => "composite",
                                   :content_view_components => [@content_view_component])
-      @organization = OpenStruct.new(:id => 1, :name => "great", :label => "label")
+      @organization = ::OpenStruct.new(:id => 1, :name => "great", :label => "label")
       @content_view_components = [@content_view_component, @content_view_component2]
     end
 

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

@@ -5,16 +5,16 @@ module HammerCLIKatello
   describe ContentViewComponent::UpdateCommand do
     before do
       @cmd = %w(content-view component update)
-      @component_version = OpenStruct.new(:id => 666, :version => "1.0")
-      @component = OpenStruct.new(:id => 6, :name => "component",
+      @component_version = ::OpenStruct.new(:id => 666, :version => "1.0")
+      @component = ::OpenStruct.new(:id => 6, :name => "component",
                                   :content_view_version => @component_version)
-      @content_view_component = OpenStruct.new(:id => 1444,
+      @content_view_component = ::OpenStruct.new(:id => 1444,
                                                :content_view => @component,
                                                :content_view_version => @component_version)
 
-      @composite = OpenStruct.new(:id => 2, :name => "composite",
+      @composite = ::OpenStruct.new(:id => 2, :name => "composite",
                                   :content_view_components => [@content_view_component])
-      @organization = OpenStruct.new(:id => 1, :name => "great", :label => "label")
+      @organization = ::OpenStruct.new(:id => 1, :name => "great", :label => "label")
     end
 
     def setup_org_expectations

data/test/functional/content_view/create_test.rb

@@ -3,10 +3,10 @@ require_relative '../test_helper'
 describe 'content-view create' do
   before do
     @cmd = %w(content-view create)
-    @base_params = ["--organization-id=#{org_id}", "--name=#{name}"]
+    @base_params = ["--organization-id=#{org_id}", "--name=#{cv_name}"]
   end
   let(:error_heading) { "Could not create the content view" }
-  let(:name) { 'test-cv' }
+  let(:cv_name) { 'test-cv' }
   let(:org_id) { 1 }
   let(:repositories) do
     [
@@ -22,7 +22,7 @@ describe 'content-view create' do
     params = %W(--repository-ids=#{ids.join(',')})
 
     api_expects(:content_views, :create, 'Create content view') do |par|
-      par['name'] == name &&
+      par['name'] == cv_name &&
         par['repository_ids'] == ids &&
         par['organization_id'] == org_id
     end

data/test/functional/organization/info_test.rb

@@ -11,20 +11,6 @@ describe HammerCLIKatello::Organization::InfoCommand do
     { "type" => 'network_sync' }
   end
 
-  it "includes simple content access attributes" do
-    org_id = 2
-    params = ["--id=#{org_id}"]
-    api_expects(:organizations, :index).returns(index_response([{'id' => org_id}]))
-
-    api_expects(:organizations, :show)
-      .with_params('id' => org_id.to_s)
-      .returns("simple_content_access" => true, "id" => org_id,
-               "cdn_configuration" => cdn_configuration)
-    result = run_cmd(@cmd + params)
-    expected = success_result(FieldMatcher.new('Simple Content Access', 'Enabled'))
-    assert_cmd(expected, result)
-  end
-
   it "includes cdn configuration attributes" do
     org_id = 2
     params = ["--id=#{org_id}"]

data/test/functional/product/{update_proxy.rb → update_proxy_test.rb}

@@ -9,9 +9,8 @@ describe 'update an http proxy on a product' do
 
   let(:sync_response) do
     {
-      'id' => 1,
-      'state' => 'planned',
-      'action' => 'Update http proxy'
+      'id' => '1',
+      'state' => 'planned'
     }
   end
 
@@ -23,8 +22,8 @@ describe 'update an http proxy on a product' do
     ]
 
     ex = api_expects(:products_bulk_actions, :update_http_proxy, 'update an http-proxy')
-         .with_params('ids' => '1', 'http_proxy_policy' => 'use_selected_http_proxy',
-                      'http_proxy_id' => '1')
+         .with_params("ids" => [1], "http_proxy_policy" => "use_selected_http_proxy",
+                      "http_proxy_id" => 1)
     ex.returns(sync_response)
 
     expect_foreman_task('3')
@@ -34,15 +33,10 @@ describe 'update an http proxy on a product' do
   end
 
   it 'fails with missing required params' do
-    params = ['--proxy-id=1']
-
-    ex = api_expects(:products_bulk_actions, :update_http_proxy, 'update an http-proxy')
-         .with_params('proxy_id' => '1')
-    ex.returns(
-      'proxy_id' => '1'
-    )
-
+    params = ['--http-proxy-id=1']
+    api_expects_no_call
     result = run_cmd(@cmd + params)
-    assert_equal(result.exit_code, 70)
+    assert(result.err[/--ids is required/],
+       "ids requirements must be validated")
   end
 end

data/test/functional/product/verify_checksum_test.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__), '../test_helper')
+
+describe 'verify checksum on a product' do
+  include ForemanTaskHelpers
+
+  before do
+    @cmd = %w(product verify-checksum)
+  end
+
+  let(:sync_response) do
+    {
+      'id' => '1',
+      'state' => 'planned'
+    }
+  end
+
+  it 'verifies products ' do
+    params = [
+      '--ids=1'
+    ]
+
+    ex = api_expects(:products_bulk_actions, :verify_checksum_products, 'verify checksum')
+         .with_params('ids' => [1])
+    ex.returns(sync_response)
+
+    expect_foreman_task('3')
+
+    result = run_cmd(@cmd + params)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
+end

data/test/functional/repository/create_test.rb

@@ -3,18 +3,18 @@ require_relative '../test_helper'
 describe "create repository" do
   let(:org_id) { 1 }
   let(:product_id) { 2 }
-  let(:name) { "repo1" }
+  let(:repo_name) { "repo1" }
   let(:content_type) { "yum" }
 
   it 'with basic options' do
     api_expects(:repositories, :create)
       .with_params(
-        name: name,
+        name: repo_name,
         product_id: product_id,
         content_type: content_type)
 
     command = %W(repository create --organization-id #{org_id} --product-id #{product_id}
-                 --content-type #{content_type} --name #{name})
+                 --content-type #{content_type} --name #{repo_name})
 
     assert_equal(0, run_cmd(command).exit_code)
   end

data/test/functional/repository/verify_checksum_test.rb

@@ -0,0 +1,105 @@
+require_relative '../test_helper'
+require_relative '../organization/organization_helpers'
+require 'hammer_cli_katello/repository'
+module HammerCLIKatello
+  describe Repository::VerifyChecksum do
+    include OrganizationHelpers
+    it 'allows minimal options' do
+      api_expects(:repositories, :verify_checksum) do |p|
+        p['id'] == 1
+      end
+      run_cmd(%w(repository verify-checksum --id 1))
+    end
+
+    describe 'resolves repository ID' do
+      it 'by requiring product' do
+        api_expects_no_call
+        result = run_cmd(%w(repository verify-checksum --name repo1))
+        assert(result.err[/--product, --product-id is required/], 'Incorrect error message')
+      end
+
+      it 'by product ID' do
+        ex = api_expects(:repositories, :index) do |p|
+          p['name'] == 'repo1' && p['product_id'] == 3
+        end
+        ex.returns(index_response([{'id' => 1}]))
+
+        api_expects(:repositories, :verify_checksum) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository verify-checksum --name repo1 --product-id 3))
+      end
+    end
+
+    describe 'resolves product ID' do
+      it 'by requiring organization options' do
+        api_expects_no_call
+        result = run_cmd(%w(repository verify-checksum --name repo1 --product prod1))
+        assert(result.err[/--organization-id, --organization, --organization-label is required/],
+               "Organization option requirements must be validated")
+      end
+
+      it 'by organization ID' do
+        ex = api_expects(:products, :index) do |p|
+          p['name'] == 'prod3' && p['organization_id'] == '5'
+        end
+        ex.returns(index_response([{'id' => 3}]))
+
+        ex = api_expects(:repositories, :index) do |p|
+          p['name'] == 'repo1' && p['product_id'] == 3
+        end
+        ex.returns(index_response([{'id' => 1}]))
+
+        api_expects(:repositories, :verify_checksum) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository verify-checksum --name repo1 --product prod3 --organization-id 5
+                  ))
+      end
+
+      it 'by organization name' do
+        expect_organization_search('org5', 5)
+
+        ex = api_expects(:products, :index) do |p|
+          p['name'] == 'prod3' && p['organization_id'] == 5
+        end
+        ex.returns(index_response([{'id' => 3}]))
+
+        ex = api_expects(:repositories, :index) do |p|
+          p['name'] == 'repo1' && p['product_id'] == 3
+        end
+        ex.returns(index_response([{'id' => 1}]))
+
+        api_expects(:repositories, :verify_checksum) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository verify-checksum --name repo1 --product prod3 --organization org5
+                  ))
+      end
+
+      it 'by organization label' do
+        expect_organization_search('org5', 5, field: 'label')
+
+        ex = api_expects(:products, :index) do |p|
+          p['name'] == 'prod3' && p['organization_id'] == 5
+        end
+        ex.returns(index_response([{'id' => 3}]))
+
+        ex = api_expects(:repositories, :index) do |p|
+          p['name'] == 'repo1' && p['product_id'] == 3
+        end
+        ex.returns(index_response([{'id' => 1}]))
+
+        api_expects(:repositories, :verify_checksum) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository verify-checksum --name repo1 --product prod3 --organization-label org5
+                  ))
+      end
+    end
+  end
+end

data/test/functional/sync_plan/create_test.rb

@@ -2,7 +2,7 @@ require_relative '../test_helper'
 
 describe "create sync plan" do
   let(:org_id) { 1 }
-  let(:name) { "sync_plan1" }
+  let(:sync_plan_name) { "sync_plan1" }
   let(:hourly) { "hourly" }
   let(:custom) { "custom cron" }
   let(:cron) { "10 * * * *" }
@@ -11,11 +11,11 @@ describe "create sync plan" do
   it 'with organization ID,name,interval,date and enabled' do
     api_expects(:sync_plans, :create, 'create a sync plan').
       with_params('organization_id' => org_id,
-                  'name' => name,
+                  'name' => sync_plan_name,
                   'interval' => hourly,
                   'sync_date' => date,
                   'enabled' => true)
-    command = %W(sync-plan create --organization-id #{org_id} --name #{name}
+    command = %W(sync-plan create --organization-id #{org_id} --name #{sync_plan_name}
                  --interval #{hourly} --enabled 1 --sync-date #{date})
     assert_equal(0, run_cmd(command).exit_code)
   end
@@ -23,19 +23,19 @@ describe "create sync plan" do
   it 'with custom cron' do
     api_expects(:sync_plans, :create, 'create a sync plan').
       with_params('organization_id' => org_id,
-                  'name' => name,
+                  'name' => sync_plan_name,
                   'interval' => custom,
                   'cron_expression' => cron,
                   'sync_date' => date,
                   'enabled' => true)
     # end
-    command = %W(sync-plan create --organization-id #{org_id} --name #{name} --interval #{custom}
-                 --cron-expression #{cron} --enabled 1 --sync-date #{date})
+    command = %W(sync-plan create --organization-id #{org_id} --name #{sync_plan_name}
+                 --interval #{custom} --cron-expression #{cron} --enabled 1 --sync-date #{date})
     assert_equal(0, run_cmd(command).exit_code)
   end
 
   it 'fails without organization-id' do
-    command = %w(sync-plan create --name #{name}
+    command = %w(sync-plan create --name #{sync_plan_name}
                  --interval #{hourly} --enabled 1 --sync-date #{date})
     refute_equal(0, run_cmd(command).exit_code)
   end
@@ -47,13 +47,13 @@ describe "create sync plan" do
   end
 
   it 'fails without interval' do
-    command = %w(sync-plan create --organization-id #{org_id} --name #{name}
+    command = %w(sync-plan create --organization-id #{org_id} --name #{sync_plan_name}
                  --enabled 1 --sync-date #{date})
     refute_equal(0, run_cmd(command).exit_code)
   end
 
   it 'fails without enabled' do
-    command = %w(sync-plan create --organization-id #{org_id} --name #{name}
+    command = %w(sync-plan create --organization-id #{org_id} --name #{sync_plan_name}
                  --interval #{hourly} --sync-date #{date})
     refute_equal(0, run_cmd(command).exit_code)
   end

data/test/functional/sync_plan/delete_test.rb

@@ -8,7 +8,7 @@ describe 'delete a sync plan' do
 
   let(:org_id) { 1 }
   let(:id) { 1 }
-  let(:name) { "sync_plan1" }
+  let(:sync_plan_name) { "sync_plan1" }
   let(:org_name) { "org1" }
 
   it 'by organization ID and sync plan id' do
@@ -23,7 +23,7 @@ describe 'delete a sync plan' do
     expect_sync_plan_search(1, 'sync_plan1', 1)
     api_expects(:sync_plans, :destroy, 'delete a sync plan').
       with_params('id' => id)
-    command = %W(sync-plan delete --organization-id #{org_id} --name #{name})
+    command = %W(sync-plan delete --organization-id #{org_id} --name #{sync_plan_name})
     assert_equal(0, run_cmd(command).exit_code)
   end
 
@@ -32,7 +32,7 @@ describe 'delete a sync plan' do
     expect_sync_plan_search(1, 'sync_plan1', 1)
     api_expects(:sync_plans, :destroy, 'delete a sync plan').
       with_params('id' => id)
-    command = %W(sync-plan delete --organization #{org_name} --name #{name})
+    command = %W(sync-plan delete --organization #{org_name} --name #{sync_plan_name})
     assert_equal(0, run_cmd(command).exit_code)
   end
 

data/test/functional/sync_plan/update_test.rb

@@ -8,7 +8,7 @@ describe 'update a sync plan' do
 
   let(:org_id) { 1 }
   let(:id) { 1 }
-  let(:name) { "sync_plan1" }
+  let(:sync_plan_name) { "sync_plan1" }
   let(:org_name) { "org1" }
   let(:desc) { "New Description" }
 
@@ -22,22 +22,22 @@ describe 'update a sync plan' do
   end
 
   it 'with organization ID and sync plan name' do
-    expect_sync_plan_search(org_id, name, id)
+    expect_sync_plan_search(org_id, sync_plan_name, id)
     api_expects(:sync_plans, :update, 'update a sync plan').
       with_params('description' => desc,
                   'id' => id)
-    command = %W(sync-plan update --organization-id #{org_id} --name #{name}
+    command = %W(sync-plan update --organization-id #{org_id} --name #{sync_plan_name}
                  --description #{desc})
     assert_equal(0, run_cmd(command).exit_code)
   end
 
   it 'with organization name and sync plan name' do
     expect_organization_search(org_name, org_id)
-    expect_sync_plan_search(org_id, name, id)
+    expect_sync_plan_search(org_id, sync_plan_name, id)
     api_expects(:sync_plans, :update, 'update a sync plan').
       with_params('description' => desc,
                   'id' => id)
-    command = %W(sync-plan update --organization #{org_name} --name #{name}
+    command = %W(sync-plan update --organization #{org_name} --name #{sync_plan_name}
                  --description #{desc})
     assert_equal(0, run_cmd(command).exit_code)
   end

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require 'minitest/autorun'
 require 'minitest/spec'
 require 'mocha/minitest'
 require 'hammer_cli'
+require 'ostruct'
 
 KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.10')