hammer_cli_katello 1.0.1 → 1.1.0

data/test/functional/activation_key/subscriptions_test.rb

@@ -54,11 +54,14 @@ module HammerCLIKatello
       run_cmd(%w(activation-key add-subscription --id 1 --subscription-id 3))
     end
 
-    it 'allows a subscription to be added by name to an activation key' do
+    it 'allows a subscription to be added by name to an activation key with org label' do
+      api_expects(:organizations, :index) { |par| par[:search] == "label = \"org1\"" }
+        .returns(index_response([{'id' => 1}]))
       api_expects(:subscriptions, :index) { |p| p['name'] == 'sub' }
         .returns(index_response([{'name' => 'sub'}]))
       api_expects(:activation_keys, :add_subscriptions) { |p| p['id'] == 1 }
-      run_cmd(%w(activation-key add-subscription --id 1 --subscription sub))
+      run_cmd(%w(activation-key add-subscription --id 1 --subscription sub
+                 --organization-label org1))
     end
 
     it 'allows multiple subscriptions to be added to an activation key' do

data/test/functional/content_import/list_test.rb

@@ -0,0 +1,65 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+require 'hammer_cli_katello/content_import'
+
+describe 'content-import list' do
+  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 minimal options' do
+    ex = api_expects(:content_imports, :index)
+
+    ex.returns(empty_response)
+
+    # rubocop:disable LineLength
+    expected_result = success_result('---|------|------|----------------------|-------------------------|------------|-----------
+ID | PATH | TYPE | CONTENT VIEW VERSION | CONTENT VIEW VERSION ID | CREATED AT | UPDATED AT
+---|------|------|----------------------|-------------------------|------------|-----------
+')
+    # rubocop:enable LineLength
+    result = run_cmd(%w(content-import list))
+    assert_cmd(expected_result, result)
+  end
+
+  it 'works with content-view-id only' do
+    api_expects(:content_view_versions, :index).returns(empty_response)
+
+    ex = api_expects(:content_imports, :index)
+
+    ex.returns(empty_response)
+    # rubocop:disable LineLength
+    expected_result = success_result('---|------|------|----------------------|-------------------------|------------|-----------
+ID | PATH | TYPE | CONTENT VIEW VERSION | CONTENT VIEW VERSION ID | CREATED AT | UPDATED AT
+---|------|------|----------------------|-------------------------|------------|-----------
+')
+    # rubocop:enable LineLength
+    result = run_cmd(%w(content-import list --content-view-id=1))
+    assert_cmd(expected_result, result)
+  end
+
+  it 'works with content-view-version-id only' do
+    ex = api_expects(:content_imports, :index)
+
+    ex.returns(empty_response)
+    # rubocop:disable LineLength
+    expected_result = success_result('---|------|------|----------------------|-------------------------|------------|-----------
+ID | PATH | TYPE | CONTENT VIEW VERSION | CONTENT VIEW VERSION ID | CREATED AT | UPDATED AT
+---|------|------|----------------------|-------------------------|------------|-----------
+')
+    # rubocop:enable LineLength
+    result = run_cmd(%w(content-import list --content-view-version-id=1))
+    assert_cmd(expected_result, result)
+  end
+end

data/test/functional/content_import/version_test.rb

@@ -25,16 +25,16 @@ describe 'content-import version' do
     JSON.parse(File.read("#{path}/metadata.json"))
   end
 
-  let(:content_view_id) { 3 }
+  let(:organization_id) { 3 }
 
   it "performs import with required options and async" do
     params = [
-      "--content-view-id=#{content_view_id}",
+      "--organization-id=#{organization_id}",
       "--path=#{path}",
       '--async'
     ]
     api_expects(:content_imports, :version)
-      .with_params('content_view_id' => content_view_id, 'path' => path, 'metadata' => metadata)
+      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
       .returns(response)
 
     result = run_cmd(@cmd + params)
@@ -45,12 +45,12 @@ describe 'content-import version' do
 
   it "performs import with required options" do
     params = [
-      "--content-view-id=#{content_view_id}",
+      "--organization-id=#{organization_id}",
       "--path=#{path}"
     ]
 
     api_expects(:content_imports, :version)
-      .with_params('content_view_id' => content_view_id, 'path' => path, 'metadata' => metadata)
+      .with_params('organization_id' => organization_id, 'path' => path, 'metadata' => metadata)
       .returns(response)
 
     expect_foreman_task(task_id)
@@ -74,7 +74,7 @@ describe 'content-import version' do
   it 'fails on missing metadata.json' do
     bad_path = "/nosuchdir"
     params = [
-      "--content-view-id=#{content_view_id}",
+      "--organization-id=#{organization_id}",
       "--path=#{bad_path}"
     ]
     result = run_cmd(@cmd + params)

data/test/functional/organization/info_test.rb

@@ -0,0 +1,22 @@
+require_relative '../test_helper'
+require 'hammer_cli_katello/organization'
+require 'hammer_cli_katello/associating_commands'
+
+describe HammerCLIKatello::Organization::InfoCommand do
+  before do
+    @cmd = %w(organization info)
+  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)
+    result = run_cmd(@cmd + params)
+    expected = success_result(FieldMatcher.new('Simple Content Access', 'Enabled'))
+    assert_cmd(expected, result)
+  end
+end

data/test/functional/ping_test.rb

@@ -1,20 +1,59 @@
 require_relative 'test_helper'
 
 describe 'ping' do
+  let(:standard_response_services) do
+    {
+      'katello_agent' =>
+        {'status' => 'ok', 'message' => '0 Processed, 0 Failed', 'duration_ms' => '34'},
+      'foreman_tasks' =>
+        {'status' => 'ok', 'duration_ms' => '34'},
+      'candlepin' => {'status' => 'ok', 'duration_ms' => '34'},
+      'candlepin_events' =>
+        {'status' => 'ok', 'message' => '0 Processed, 0 Failed', 'duration_ms' => '34'},
+      'candlepin_auth' =>
+        {'status' => 'ok', 'duration_ms' => '34'},
+      'katello_events' =>
+        {'status' => 'ok', 'message' => '0 Processed, 0 Failed', 'duration_ms' => '34'},
+      'pulp3' =>
+        {'status' => 'ok', 'duration_ms' => '34'}
+    }
+  end
+  let(:standard_response) do
+    {
+      'status' => 'ok',
+      'services' => standard_response_services
+    }
+  end
+  let(:standard_response_keys) do
+    %w(katello_agent foreman_tasks candlepin candlepin_events
+       candlepin_auth katello_events pulp3).sort
+  end
+  let(:hammer_ping) { %w(ping katello) }
+
   it 'does not require authentication' do
-    api_expects(:ping, :index).returns(
+    api_expects(:ping, :index).returns(standard_response)
+
+    run_cmd(hammer_ping)
+  end
+
+  it "includes all keys" do
+    api_expects(:ping, :index).returns(standard_response)
+
+    result = JSON.parse(run_cmd(%w(--output=json ping katello))&.out)&.first&.keys&.sort
+    expected = standard_response_keys
+
+    assert_equal result, expected
+  end
+
+  it "skips katello_agent if not included in API response" do
+    response_without_katello_agent = {
       'status' => 'ok',
-      'services' => {
-        'foreman_tasks' => {'status' => 'ok', 'duration_ms' => '34'},
-        'foreman_auth' => {'status' => 'ok', 'duration_ms' => '34'},
-        'candlepin' => {'status' => 'ok', 'duration_ms' => '34'},
-        'candlepin_events' => {'status' => 'ok', 'message' => '0 messages', 'duration_ms' => '34'},
-        'candlepin_auth' => {'status' => 'ok', 'duration_ms' => '34'},
-        'katello_events' => {'status' => 'ok', 'message' => '0 messages', 'duration_ms' => '34'},
-        'pulp3' => {'status' => 'ok', 'duration_ms' => '34'}
-      }
-    )
-
-    run_cmd(%w(ping katello))
+      'services' => standard_response_services.select { |k, _v| k != 'katello_agent' }
+    }
+    api_expects(:ping, :index).returns(response_without_katello_agent)
+    result = JSON.parse(run_cmd(%w(--output=json ping katello))&.out)&.first&.keys&.sort
+    expected = standard_response_keys.select { |k| k != 'katello_agent' }
+
+    assert_equal result, expected
   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.0')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.1')
 
 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.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -65,34 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hammer_cli_foreman_bootdisk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hammer_cli_foreman_docker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -251,8 +223,10 @@ files:
 - lib/hammer_cli_katello/content_view_name_resolvable.rb
 - lib/hammer_cli_katello/content_view_purge.rb
 - lib/hammer_cli_katello/content_view_version.rb
-- lib/hammer_cli_katello/cv_import_export_helper.rb
 - lib/hammer_cli_katello/deb_package.rb
+- lib/hammer_cli_katello/docker.rb
+- lib/hammer_cli_katello/docker_manifest.rb
+- lib/hammer_cli_katello/docker_tag.rb
 - lib/hammer_cli_katello/erratum.rb
 - lib/hammer_cli_katello/erratum_info_command.rb
 - lib/hammer_cli_katello/exception_handler.rb
@@ -342,6 +316,7 @@ files:
 - test/data/3.8/foreman_api.json
 - test/data/3.9/foreman_api.json
 - test/data/4.0/foreman_api.json
+- test/data/4.1/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -379,6 +354,7 @@ files:
 - test/functional/content_export/incremental/version_test.rb
 - test/functional/content_export/list_test.rb
 - test/functional/content_import/library_test.rb
+- test/functional/content_import/list_test.rb
 - test/functional/content_import/metadata.json
 - test/functional/content_import/version_test.rb
 - test/functional/content_view/add_content_view_version_test.rb
@@ -402,10 +378,6 @@ files:
 - test/functional/content_view/remove_content_view_version_test.rb
 - test/functional/content_view/remove_test.rb
 - test/functional/content_view/update_test.rb
-- test/functional/content_view/version/cv_import_export_helper_test.rb
-- test/functional/content_view/version/default_export_test.rb
-- test/functional/content_view/version/export_test.rb
-- test/functional/content_view/version/import_test.rb
 - test/functional/content_view/version/incremental_update_test.rb
 - test/functional/content_view/version/list_test.rb
 - test/functional/content_view/version/promote_test.rb
@@ -468,6 +440,7 @@ files:
 - test/functional/module_stream/info_test.rb
 - test/functional/module_stream/list_test.rb
 - test/functional/organization/delete_test.rb
+- test/functional/organization/info_test.rb
 - test/functional/organization/organization_helpers.rb
 - test/functional/package/list_test.rb
 - test/functional/package_group/list_test.rb
@@ -559,6 +532,7 @@ test_files:
 - test/data/3.8/foreman_api.json
 - test/data/3.9/foreman_api.json
 - test/data/4.0/foreman_api.json
+- test/data/4.1/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -596,6 +570,7 @@ test_files:
 - test/functional/content_export/incremental/version_test.rb
 - test/functional/content_export/list_test.rb
 - test/functional/content_import/library_test.rb
+- test/functional/content_import/list_test.rb
 - test/functional/content_import/metadata.json
 - test/functional/content_import/version_test.rb
 - test/functional/content_view/add_content_view_version_test.rb
@@ -619,10 +594,6 @@ test_files:
 - test/functional/content_view/remove_content_view_version_test.rb
 - test/functional/content_view/remove_test.rb
 - test/functional/content_view/update_test.rb
-- test/functional/content_view/version/cv_import_export_helper_test.rb
-- test/functional/content_view/version/default_export_test.rb
-- test/functional/content_view/version/export_test.rb
-- test/functional/content_view/version/import_test.rb
 - test/functional/content_view/version/incremental_update_test.rb
 - test/functional/content_view/version/list_test.rb
 - test/functional/content_view/version/promote_test.rb
@@ -685,6 +656,7 @@ test_files:
 - test/functional/module_stream/info_test.rb
 - test/functional/module_stream/list_test.rb
 - test/functional/organization/delete_test.rb
+- test/functional/organization/info_test.rb
 - test/functional/organization/organization_helpers.rb
 - test/functional/package/list_test.rb
 - test/functional/package_group/list_test.rb

data/lib/hammer_cli_katello/cv_import_export_helper.rb

@@ -1,187 +0,0 @@
-# rubocop:disable Metrics/ModuleLength
-module HammerCLIKatello
-  module CVImportExportHelper
-    PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
-
-    def fetch_exportable_cvv_repositories(cvv)
-      immediate = []
-      non_immediate_names = []
-
-      cvv['repositories'].each do |repo|
-        next unless repo['content_type'] == 'yum'
-
-        api_repo = show(:repositories, 'id' => repo['id'], :full_result => true)
-
-        download_policy = if api_repo['library_instance_id']
-                            library = show(:repositories, 'id' => api_repo['library_instance_id'])
-                            library['download_policy']
-                          else
-                            api_repo['download_policy']
-                          end
-
-        if download_policy == 'immediate'
-          immediate << api_repo
-        else
-          non_immediate_names << api_repo['name']
-        end
-      end
-
-      warn_repo_download_policy(non_immediate_names)
-
-      return immediate
-    end
-
-    def find_local_component_id(component_from_export)
-      *name, version = component_from_export.split(' ')
-      name = name.join(' ')
-      existing_component_cv = content_view(name, options['option_organization_id'])
-      found_composite_version = existing_component_cv['versions'].select do |v|
-        v['version'] == version
-      end
-      if found_composite_version.empty?
-        raise _("Unable to find CV version %{cvv} on system. Please ensure it " \
-                "is already imported." % {'cvv' => component_from_export})
-      end
-      found_composite_version.first['id']
-    end
-
-    def warn_repo_download_policy(repository_names)
-      return if repository_names.empty?
-
-      msg = <<~MSG
-        The following repositories could not be exported due to the download policy
-        not being set to 'immediate':
-          #{repository_names.join(', ')}
-      MSG
-      print_message msg
-    end
-
-    def collect_packages(repositories)
-      repositories.each do |repo|
-        per_page = 50
-        repo['packages'] = []
-        repo['errata'] = []
-        repo_packages = repo['content_counts']['rpm']
-        errata_count = repo['content_counts']['erratum']
-        pkg_pages = (repo_packages / per_page.to_f).ceil
-        errata_pages = (errata_count / per_page.to_f).ceil
-        (1..pkg_pages).each do |page|
-          repo['packages'] += index(:packages, 'repository_id' => repo['id'],
-                                               :page => page, :per_page => 50)
-        end
-        (1..errata_pages).each do |page|
-          repo['errata'] += index(:errata, 'repository_id' => repo['id'],
-                                           :page => page, :per_page => 50)
-        end
-      end
-    end
-
-    def import_checks(cv, import_cv, major, minor)
-      version = "#{major}.#{minor}".to_f
-
-      if import_cv.nil?
-        raise _("The Content View #{cv['name']} is not present on this server,"\
-        " please create the Content View and try the import again.")
-      end
-
-      unless import_cv['default']
-        if import_cv['latest_version'].to_f >= version
-          raise _("The latest version (#{import_cv['latest_version']}) of"\
-          " the Content View '#{cv['name']}'"\
-          " is greater or equal to the version you are trying to import (#{version})")
-        end
-      end
-
-      unless import_cv['repository_ids'].nil?
-        repositories = import_cv['repository_ids'].collect do |repo_id|
-          show(:repositories, 'id' => repo_id)
-        end
-        repositories.each do |repo|
-          if repo['mirror_on_sync'] == true
-            raise _("The Repository '#{repo['name']}' is set with Mirror-on-Sync to YES."\
-            " Please change Mirror-on-Sync to NO and try the import again.")
-          end
-        end
-      end
-    end
-
-    def untar_export(options)
-      export_tar_file = options[:filename]
-      export_tar_dir =  options[:dirname]
-      export_tar_prefix = options[:prefix]
-
-      Dir.chdir(export_tar_dir) do
-        `tar -xf #{export_tar_file}`
-      end
-
-      Dir.chdir("#{export_tar_dir}/#{export_tar_prefix}") do
-        if File.exist?(export_tar_file.gsub('.tar', '-repos.tar'))
-          `tar -xf #{export_tar_file.gsub('.tar', '-repos.tar')}`
-        end
-      end
-    end
-
-    def obtain_export_params(option_export_tar)
-      export_tar_file = File.basename(option_export_tar)
-      {:filename => export_tar_file,
-       :dirname => File.dirname(option_export_tar),
-       :prefix => export_tar_file.gsub('.tar', '')}
-    end
-
-    def read_json(options)
-      export_tar_file = options[:filename]
-      export_tar_dir =  options[:dirname]
-      export_tar_prefix = options[:prefix]
-
-      json_file = export_tar_file.gsub('tar', 'json')
-      json_file = "#{export_tar_dir}/#{export_tar_prefix}/#{json_file}"
-      json_file = File.read(json_file)
-      JSON.parse(json_file)
-    end
-
-    def export_json(export_json_options)
-      content_view_version = export_json_options[:cvv]
-      repositories = export_json_options[:repositories]
-      json = {
-        "name" => content_view_version['content_view']['name'],
-        "major" => content_view_version['major'],
-        "minor" => content_view_version['minor']
-      }
-      json["composite_components"] = export_json_options[:component_cvvs]
-      json["repositories"] = repositories.collect do |repo|
-        {
-          "id" => repo['id'],
-          "label" => repo['label'],
-          "content_type" => repo['content_type'],
-          "backend_identifier" => repo['backend_identifier'],
-          "relative_path" => repo['relative_path'],
-          "on_disk_path" => "#{PUBLISHED_REPOS_DIR}/#{repo['relative_path']}",
-          "rpm_filenames" => repo['packages'].collect { |package| package['filename'] },
-          "errata_ids" => repo['errata'].collect { |errata| errata['errata_id'] }
-        }
-      end
-      json
-    end
-
-    def fail_msg_import
-      _("This command is not supported with Pulp 3. Use `hammer content-import` instead.")
-    end
-
-    def fail_msg_export
-      _("This command is not supported with Pulp 3. Use `hammer content-export` instead.")
-    end
-
-    def validate_pulp3_not_enabled(failure_message)
-      pulp3_enabled = HammerCLIForeman
-                      .foreman_api_connection
-                      .resource(:content_exports)
-                      .call(:api_status)['api_usable']
-      if pulp3_enabled
-        raise failure_message
-      end
-    rescue NoMethodError
-      # if the api endpoint isn't there, the validation passes
-      true
-    end
-  end
-end

data/test/functional/content_view/version/cv_import_export_helper_test.rb

@@ -1,20 +0,0 @@
-require_relative '../../test_helper'
-describe 'CVImportExportHelper' do
-  describe 'validate_pulp3_not_enabled' do
-    include HammerCLIKatello::CVImportExportHelper
-    it 'returns true when the api endpoint does not return a value' do
-      api_expects(:content_exports, :api_status)
-      assert_equal true, validate_pulp3_not_enabled('fail_msg')
-    end
-
-    it 'raises error when the api reports Pulp 3 is enabled' do
-      api_expects(:content_exports, :api_status).returns('api_usable' => true)
-      assert_raises(RuntimeError, 'fail msg') { validate_pulp3_not_enabled('fail msg') }
-    end
-
-    it 'returns nil when the api reports Pulp 3 is not enabled' do
-      api_expects(:content_exports, :api_status).returns('api_usable' => false)
-      assert_equal nil, validate_pulp3_not_enabled('fail_msg')
-    end
-  end
-end

data/test/functional/content_view/version/default_export_test.rb

@@ -1,40 +0,0 @@
-require File.join(File.dirname(__FILE__), '../../test_helper')
-
-describe 'content-view version export' do
-  include ForemanTaskHelpers
-
-  before do
-    @cmd = %w(content-view version export-default)
-  end
-
-  it "performs export with bad SELinux" do
-    params = [
-      '--export-dir=/tmp/default'
-    ]
-
-    File.expects(:exist?).with('/usr/share/foreman').returns(true)
-    File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
-
-    Dir.expects(:mkdir).with('/tmp/default').returns(0)
-    Kernel.expects(:system).with("rsync -aL /var/lib/pulp/published/yum/https/repos/ /tmp/default")
-
-    result = run_cmd(@cmd + params)
-    assert_equal(HammerCLI::EX_CANTCREAT, result.exit_code)
-  end
-
-  it "performs export" do
-    params = [
-      '--export-dir=/tmp/default'
-    ]
-
-    File.expects(:exist?).with('/usr/share/foreman').returns(true)
-    File.stubs(:exist?).with('/var/log/hammer/hammer.log._copy_').returns(false)
-
-    Dir.expects(:exist?).with('/tmp/default').returns(0)
-    Kernel.expects(:system).with("rsync -aL /var/lib/pulp/published/yum/https/repos/ /tmp/default")
-          .returns(true)
-
-    result = run_cmd(@cmd + params)
-    assert_equal(HammerCLI::EX_OK, result.exit_code)
-  end
-end