hammer_cli_katello 1.4.0 → 1.4.1

data/test/functional/organization/cdn_configuration_test.rb

@@ -16,12 +16,14 @@ describe HammerCLIKatello::Organization::ConfigureCdnCommand do
     username = "foo"
     url = "https://goo.com"
     upstream_label = "GreatOrg"
+    type = 'upstream_server'
     params = ["--label=#{org_label}",
               "--url=#{url}",
               "--username=#{username}",
               "--upstream-organization-label=#{upstream_label}",
               "--password=#{password}",
-              "--ssl-ca-credential-id=#{ssl_cred_id}"
+              "--ssl-ca-credential-id=#{ssl_cred_id}",
+              "--type=#{type}"
             ]
     expect_organization_search(org_label, org_id, field: 'label')
 
@@ -31,7 +33,8 @@ describe HammerCLIKatello::Organization::ConfigureCdnCommand do
         par['url'] == url &&
         par['password'] == password &&
         par['ssl_ca_credential_id'].to_s == ssl_cred_id &&
-        par['upstream_organization_label'] == upstream_label
+        par['upstream_organization_label'] == upstream_label &&
+        par['type'] == type
     end
 
     assert_equal(

data/test/functional/repository/info_test.rb

@@ -42,6 +42,10 @@ describe "get repository info" do
         'package_group' => 0,
         'erratum' => 1,
         'module_stream' => 0
+      },
+      'content_credential' => {
+        'id' => 1,
+        'name' => 'pizza'
       }
     )
     result = run_cmd(@cmd + params)
@@ -62,6 +66,8 @@ describe "get repository info" do
                        ['Id', '79'],
                        ['Name', 'test'],
                        ['GPG Key', ''],
+                       ['Id', '1'],
+                       ['Name', 'pizza'],
                        ['Sync', ''],
                        ['Status', 'Not Synced'],
                        ['Last Sync Date', '3 minutes'],

data/test/functional/repository/reclaim_space_test.rb

@@ -0,0 +1,105 @@
+require_relative '../test_helper'
+require_relative '../organization/organization_helpers'
+require 'hammer_cli_katello/repository'
+module HammerCLIKatello
+  describe Repository::ReclaimSpaceCommand do
+    include OrganizationHelpers
+    it 'allows minimal options' do
+      api_expects(:repositories, :reclaim_space) do |p|
+        p['id'] == 1
+      end
+      run_cmd(%w(repository reclaim-space --id 1))
+    end
+
+    describe 'resolves repository ID' do
+      it 'by requiring product' do
+        api_expects_no_call
+        result = run_cmd(%w(repository reclaim-space --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, :reclaim_space) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository reclaim-space --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 reclaim-space --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, :reclaim_space) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository reclaim-space --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, :reclaim_space) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository reclaim-space --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, :reclaim_space) do |p|
+          p['id'] == 1
+        end
+
+        run_cmd(%w(repository reclaim-space --name repo1 --product prod3 --organization-label org5
+                  ))
+      end
+    end
+  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.3')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.4')
 
 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.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -318,6 +318,7 @@ files:
 - test/data/4.0/foreman_api.json
 - test/data/4.1/foreman_api.json
 - test/data/4.3/foreman_api.json
+- test/data/4.4/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -462,6 +463,7 @@ files:
 - test/functional/repository/delete_test.rb
 - test/functional/repository/info_test.rb
 - test/functional/repository/list_test.rb
+- test/functional/repository/reclaim_space_test.rb
 - test/functional/repository/remove_content_test.rb
 - test/functional/repository/repository_helpers.rb
 - test/functional/repository/synchronize_test.rb
@@ -537,6 +539,7 @@ test_files:
 - test/data/4.0/foreman_api.json
 - test/data/4.1/foreman_api.json
 - test/data/4.3/foreman_api.json
+- test/data/4.4/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -681,6 +684,7 @@ test_files:
 - test/functional/repository/delete_test.rb
 - test/functional/repository/info_test.rb
 - test/functional/repository/list_test.rb
+- test/functional/repository/reclaim_space_test.rb
 - test/functional/repository/remove_content_test.rb
 - test/functional/repository/repository_helpers.rb
 - test/functional/repository/synchronize_test.rb