hammer_cli_katello 1.6.0 → 1.7.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/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/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.6')
+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.6.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Adam Price
@@ -32,10 +32,10 @@ authors:
 - Tom McKay
 - Walden Raines
 - Zach Huntington-Meath
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -322,6 +322,7 @@ files:
 - 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
@@ -480,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
@@ -511,7 +513,7 @@ homepage: https://github.com/Katello/hammer-cli-katello
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -526,8 +528,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Katello commands for Hammer
 test_files:
@@ -556,6 +558,7 @@ test_files:
 - 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
@@ -714,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