hammer_cli_katello 1.5.3 → 1.7.0

data/test/functional/acs/create_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../test_helper')
 
 describe 'create content-credentials' do
   before do
-    @cmd = %w(alternate-content-sources create)
+    @cmd = %w(alternate-content-source create)
   end
 
   let(:name) { 'pizza' }

data/test/functional/acs/delete_test.rb

@@ -7,7 +7,7 @@ describe 'delete an acs' do
     api_expects(:alternate_content_sources, :destroy, 'delete acs').
       with_params('id' => id)
 
-    command = %W(alternate-content-sources delete --id #{id})
+    command = %W(alternate-content-source delete --id #{id})
     assert_equal(0, run_cmd(command).exit_code)
   end
 end

data/test/functional/acs/info_test.rb

@@ -3,7 +3,7 @@ require 'hammer_cli_katello/associating_commands'
 
 describe 'get acs info' do
   before do
-    @cmd = %w(alternate-content-sources info)
+    @cmd = %w(alternate-content-source info)
   end
 
   it 'shows acs info by id' do
@@ -14,20 +14,17 @@ describe 'get acs info' do
       'name' => 'Pizza ACS',
       'label' => 'Pizza ACS',
       'base_url' => 'https://proxy.example.com',
-      'alternate_content_source_type' => 'custom',
       'content_type' => 'yum',
+      'alternate_content_source_type' => 'custom',
+      'subpaths' => [
+        'test/repo1'
+      ],
       'smart_proxies' => {
         'id' => 1,
         'name' => 'centos7.example.com',
         'url' => 'https://centos7.example.com:9090',
-        'created_at' => '2022-05-09T17:40:21.007Z',
-        'updated_at' => '2022-05-09T17:40:21.007Z',
-        'expired_logs' => 0,
         'download_policy' => 'on_demand'
-      },
-      'subpaths' => [
-        'test/repo1'
-      ]
+      }
     )
     result = run_cmd(@cmd + params)
     # rubocop:disable Style/WordArray
@@ -35,18 +32,60 @@ describe 'get acs info' do
                        ['Name', 'Pizza ACS'],
                        ['Label', 'Pizza ACS'],
                        ['Base URL', 'https://proxy.example.com'],
+                       ['Content type', 'yum'],
                        ['Alternate content source type', 'custom'],
+                       ['Subpaths', ''],
+                       ['', 'test/repo1'],
+                       ['Smart proxies', ''],
+                       ['Id', '1'],
+                       ['Name', 'centos7.example.com'],
+                       ['URL', 'https://centos7.example.com:9090'],
+                       ['Download policy', 'on_demand']]
+
+    # rubocop:enable Style/WordArray
+    expected_results = expected_fields.map { |field| success_result(FieldMatcher.new(*field)) }
+    expected_results.each { |expected|  assert_cmd(expected, result) }
+  end
+
+  it 'shows simplified acs info by id' do
+    params = ['--id=2']
+    ex = api_expects(:alternate_content_sources, :show, 'Get info')
+    ex.returns(
+      'id' => 2,
+      'name' => 'Pizza ACS',
+      'label' => 'Pizza ACS',
+      'content_type' => 'yum',
+      'alternate_content_source_type' => 'simplified',
+      'products' => {
+        'id' => 999,
+        'organization_id' => 9,
+        'name' => 'Buttermilk Biscuits',
+        'label' => 'Buttermilk_Biscuits'
+      },
+      'smart_proxies' => {
+        'id' => 1,
+        'name' => 'centos7.example.com',
+        'url' => 'https://centos7.example.com:9090',
+        'download_policy' => 'on_demand'
+      }
+    )
+    result = run_cmd(@cmd + params)
+    # rubocop:disable Style/WordArray
+    expected_fields = [['ID', '2'],
+                       ['Name', 'Pizza ACS'],
+                       ['Label', 'Pizza ACS'],
                        ['Content type', 'yum'],
+                       ['Alternate content source type', 'simplified'],
+                       ['Products', ''],
+                       ['Id', '999'],
+                       ['Organization ID', '9'],
+                       ['Name', 'Buttermilk Biscuits'],
+                       ['Label', 'Buttermilk_Biscuits'],
                        ['Smart proxies', ''],
                        ['Id', '1'],
                        ['Name', 'centos7.example.com'],
                        ['URL', 'https://centos7.example.com:9090'],
-                       ['Created at', '2022-05-09T17:40:21.007Z'],
-                       ['Updated at', '2022-05-09T17:40:21.007Z'],
-                       ['Expired logs', '0'],
-                       ['Download policy', 'on_demand'],
-                       ['Subpaths', ''],
-                       ['', 'test/repo1']]
+                       ['Download policy', 'on_demand']]
 
     # rubocop:enable Style/WordArray
     expected_results = expected_fields.map { |field| success_result(FieldMatcher.new(*field)) }

data/test/functional/acs/list_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../test_helper')
 
 describe 'listing acs' do
   before do
-    @cmd = %w(alternate-content-sources list)
+    @cmd = %w(alternate-content-source list)
   end
 
   let(:empty_response) do

data/test/functional/acs/update_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../test_helper')
 
 describe 'listing acs' do
   before do
-    @cmd = %w(alternate-content-sources update)
+    @cmd = %w(alternate-content-source update)
   end
 
   let(:id) { 1 }

data/test/functional/content_export/complete/repository_test.rb

@@ -178,7 +178,9 @@ describe 'content-export complete repository' do
 
   it 'Errors out on lazy repositories' do
     params = ["--id=#{repository_id}"]
-    expects_repository(repository_id, "download_policy" => "on_demand", "id" => repository_id)
+    expects_repository(repository_id, "content_type" => 'yum',
+                                      "download_policy" => "on_demand",
+                                      "id" => repository_id)
 
     ex = api_expects(:content_exports, :repository)
     ex.returns(response)

data/test/functional/content_export/incremental/repository_test.rb

@@ -189,7 +189,9 @@ describe 'content-export incremental version' do
 
   it 'Errors out on lazy repositories' do
     params = ["--id=#{repository_id}"]
-    expects_repository(repository_id, "download_policy" => "on_demand", "id" => repository_id)
+    expects_repository(repository_id, "content_type" => 'yum',
+                                      "download_policy" => "on_demand",
+                                      "id" => repository_id)
 
     ex = api_expects(:content_export_incrementals, :repository)
     ex.returns(response)

data/test/functional/host/subscription/enabled_repositories_test.rb

@@ -0,0 +1,39 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+
+describe 'host enabled-repositories listing' do
+  before do
+    @cmd = %w(host subscription enabled-repositories)
+  end
+
+  let(:host_id) { 1 }
+  let(:empty_response) do
+    {
+      "total" => 0,
+      "subtotal" => 0,
+      "page" => "1",
+      "per_page" => "1000",
+      "error" => nil,
+      "search" => nil,
+      "sort" => {
+        "by" => nil,
+        "order" => nil
+      },
+      "results" => []
+    }
+  end
+
+  it 'allows listing by host' do
+    params = ["--host-id=#{host_id}"]
+    ex = api_expects(:host_subscriptions,
+                     :enabled_repositories, 'host subscription enabled-repositories')
+    ex.returns(empty_response)
+    # rubocop:disable Layout/LineLength
+    expected_result = success_result("---|------|-------|--------------|----------|-----------------|-------------------|----------------------|------------------|-------------
+ID | NAME | LABEL | CONTENT TYPE | CHECKSUM | CONTENT VIEW ID | CONTENT VIEW NAME | CONTENT VIEW VERSION | ENVIRONMENT NAME | PRODUCT NAME
+---|------|-------|--------------|----------|-----------------|-------------------|----------------------|------------------|-------------
+")
+    # rubocop:enable Layout/LineLength
+    result = run_cmd(@cmd + params)
+    assert_cmd(expected_result, result)
+  end
+end

data/test/functional/organization/cdn_configuration_test.rb

@@ -1,4 +1,5 @@
 require_relative '../test_helper'
+require_relative './organization_helpers'
 require 'hammer_cli_katello/organization'
 require 'hammer_cli_katello/associating_commands'
 

data/test/functional/repository/list_test.rb

@@ -65,4 +65,42 @@ ID | NAME | PRODUCT | CONTENT TYPE | URL
     result = run_cmd(@cmd + params)
     assert_cmd(expected_result, result)
   end
+
+  it "lists the repositories with a certain repository type" do
+    params = ['--organization-id=1', '--content-type=yum']
+
+    ex = api_expects(:repositories, :index, 'yum repositories list') do |par|
+      par['organization_id'] == org_id && par['page'] == 1 &&
+        par['per_page'] == 1000
+    end
+
+    ex.returns(empty_response)
+
+    expected_result = CommandExpectation.new("---|------|---------|--------------|----
+ID | NAME | PRODUCT | CONTENT TYPE | URL
+---|------|---------|--------------|----
+")
+
+    result = run_cmd(@cmd + params)
+    assert_cmd(expected_result, result)
+  end
+
+  it "lists the repositories with a certain content unit type" do
+    params = ['--organization-id=1', '--with-content=srpm']
+
+    ex = api_expects(:repositories, :index, 'yum repositories list') do |par|
+      par['organization_id'] == org_id && par['page'] == 1 &&
+        par['per_page'] == 1000
+    end
+
+    ex.returns(empty_response)
+
+    expected_result = CommandExpectation.new("---|------|---------|--------------|----
+ID | NAME | PRODUCT | CONTENT TYPE | URL
+---|------|---------|--------------|----
+")
+
+    result = run_cmd(@cmd + params)
+    assert_cmd(expected_result, result)
+  end
 end

data/test/functional/repository/remove_content_test.rb

@@ -31,7 +31,8 @@ module HammerCLIKatello
           p['id'] == 1 && p['ids'] == %w(20 21 22)
         end
 
-        run_cmd(%w(repository remove-content --name repo1 --product-id 3 --ids 20,21,22))
+        run_cmd(%w(repository remove-content --name repo1 --product-id 3 --ids 20,21,22
+                   --content-type rpm))
       end
     end
 

data/test/functional/repository/types_test.rb

@@ -0,0 +1,120 @@
+
+require File.join(File.dirname(__FILE__), '../test_helper')
+
+describe 'repository types' do
+  before do
+    @cmd = %w(repository types)
+  end
+
+  let(:empty_response) do
+    {
+      "total" => 0,
+      "subtotal" => 0,
+      "page" => "1",
+      "per_page" => "1000",
+      "error" => nil,
+      "search" => nil,
+      "sort" => {
+        "by" => nil,
+        "order" => nil
+      },
+      "results" => []
+    }
+  end
+
+  let(:types_response) do
+    {
+      "results" => [
+        {
+          "name": "file",
+          "id": "file",
+          "creatable": true,
+          "pulp3_support": true,
+          "generic_remote_options": [],
+          "import_attributes": [],
+          "url_description": nil,
+          "content_types": [
+            {
+              "label": "file",
+              "generic_browser": nil,
+              "generic": false,
+              "removable": true,
+              "uploadable": true,
+              "indexed": true
+            }
+          ]
+        },
+        {
+          "name": "yum",
+          "id": "yum",
+          "creatable": true,
+          "pulp3_support": true,
+          "generic_remote_options": [],
+          "import_attributes": [],
+          "url_description": nil,
+          "content_types": [
+            {
+              "label": "rpm",
+              "generic_browser": nil,
+              "generic": false,
+              "removable": true,
+              "uploadable": true,
+              "indexed": true
+            },
+            {
+              "label": "modulemd",
+              "generic_browser": nil,
+              "generic": false,
+              "removable": false,
+              "uploadable": false,
+              "indexed": true
+            }
+          ]
+        }
+      ]
+    }
+  end
+
+  it "lists repository types and returns empty response" do
+    ex = api_expects(:repositories, :repository_types, 'repository types')
+
+    ex.returns(empty_response)
+
+    expected_result = success_result("\n\n")
+
+    result = run_cmd(@cmd)
+    assert_cmd(expected_result, result)
+  end
+
+  it "lists repository types and returns response" do
+    ex = api_expects(:repositories, :repository_types, 'repository types')
+
+    ex.returns(types_response)
+    # rubocop:disable Style/TrailingWhitespace
+    expected_result = success_result("Name:          file
+Content types: 
+ 1) Type:        file
+    Generic?:    false
+    Removable?:  true
+    Uploadable?: true
+    Indexed?:    true
+
+Name:          yum
+Content types: 
+ 1) Type:        rpm
+    Generic?:    false
+    Removable?:  true
+    Uploadable?: true
+    Indexed?:    true
+ 2) Type:        modulemd
+    Generic?:    false
+    Removable?:  false
+    Uploadable?: false
+    Indexed?:    true
+
+")
+    # rubocop:enable Style/TrailingWhitespace
+    result = run_cmd(@cmd)
+    assert_cmd(expected_result, result)
+  end
+end

data/test/functional/simple_content_access/status_test.rb

@@ -0,0 +1,29 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+
+describe 'simple-content-access status' do
+  before do
+    @cmd = %w(simple-content-access status)
+  end
+
+  let(:organization_id) { 3 }
+
+  it 'list status with required options' do
+    params = ["--organization-id=#{organization_id}"]
+    api_expects(:simple_content_access, :status).
+      with_params('organization_id' => organization_id).
+      returns('simple_content_access' => true)
+
+    run_cmd(@cmd + params)
+  end
+
+  it 'fails on missing required params' do
+    params = []
+    result = run_cmd(@cmd + params)
+    # rubocop:disable Layout/LineLength
+    expected_error = 'Could not find organization, please set one of options --organization-id, --organization, --organization-title, --organization-label.'
+    # rubocop:enable Layout/LineLength
+
+    assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
+    assert_equal(result.err[/#{expected_error}/], expected_error)
+  end
+end

data/test/test_helper.rb

@@ -17,7 +17,7 @@ require 'minitest/spec'
 require 'mocha/minitest'
 require 'hammer_cli'
 
-KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.5')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.7')
 
 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: 1.5.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -321,6 +321,8 @@ files:
 - test/data/4.3/foreman_api.json
 - test/data/4.4/foreman_api.json
 - test/data/4.5/foreman_api.json
+- test/data/4.6/foreman_api.json
+- test/data/4.7/foreman_api.json
 - test/data/Readme.md
 - test/functional/acs/create_test.rb
 - test/functional/acs/delete_test.rb
@@ -423,6 +425,7 @@ files:
 - test/functional/host/subscription/attach_test.rb
 - test/functional/host/subscription/auto_attach_test.rb
 - test/functional/host/subscription/content_override_test.rb
+- test/functional/host/subscription/enabled_repositories_test.rb
 - test/functional/host/subscription/product_content_test.rb
 - test/functional/host/subscription/register_test.rb
 - test/functional/host/subscription/remove_test.rb
@@ -478,6 +481,7 @@ files:
 - test/functional/repository/repository_helpers.rb
 - test/functional/repository/republish_test.rb
 - test/functional/repository/synchronize_test.rb
+- test/functional/repository/types_test.rb
 - test/functional/repository/update_test.rb
 - test/functional/repository/upload_test.rb
 - test/functional/repository_set/available_repositories_test.rb
@@ -489,6 +493,7 @@ files:
 - test/functional/search_helpers.rb
 - test/functional/simple_content_access/disable_test.rb
 - test/functional/simple_content_access/enable_test.rb
+- test/functional/simple_content_access/status_test.rb
 - test/functional/srpm/list_test.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/create_test.rb
@@ -552,6 +557,8 @@ test_files:
 - test/data/4.3/foreman_api.json
 - test/data/4.4/foreman_api.json
 - test/data/4.5/foreman_api.json
+- test/data/4.6/foreman_api.json
+- test/data/4.7/foreman_api.json
 - test/data/Readme.md
 - test/functional/acs/create_test.rb
 - test/functional/acs/delete_test.rb
@@ -654,6 +661,7 @@ test_files:
 - test/functional/host/subscription/attach_test.rb
 - test/functional/host/subscription/auto_attach_test.rb
 - test/functional/host/subscription/content_override_test.rb
+- test/functional/host/subscription/enabled_repositories_test.rb
 - test/functional/host/subscription/product_content_test.rb
 - test/functional/host/subscription/register_test.rb
 - test/functional/host/subscription/remove_test.rb
@@ -709,6 +717,7 @@ test_files:
 - test/functional/repository/repository_helpers.rb
 - test/functional/repository/republish_test.rb
 - test/functional/repository/synchronize_test.rb
+- test/functional/repository/types_test.rb
 - test/functional/repository/update_test.rb
 - test/functional/repository/upload_test.rb
 - test/functional/repository_set/available_repositories_test.rb
@@ -720,6 +729,7 @@ test_files:
 - test/functional/search_helpers.rb
 - test/functional/simple_content_access/disable_test.rb
 - test/functional/simple_content_access/enable_test.rb
+- test/functional/simple_content_access/status_test.rb
 - test/functional/srpm/list_test.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/create_test.rb