hammer_cli_katello 1.2.0 → 1.3.0

data/test/functional/activation_key/create_test.rb

@@ -4,7 +4,7 @@ require 'hammer_cli_katello/activation_key'
 module HammerCLIKatello
   describe ActivationKeyCommand do
     describe CreateCommand do
-      it 'allows promoting a content view' do
+      it 'allows activation key creation' do
         ex = api_expects(:organizations, :index) do |p|
           p[:search] == "name = \"org1\""
         end

data/test/functional/activation_key/subscriptions_test.rb

@@ -36,7 +36,7 @@ module HammerCLIKatello
     end
 
     it 'lists subscriptions used by the activation key' do
-      api_expects(:subscriptions, :index) { |p| p['activation_key_id'] == 1 }
+      api_expects(:subscriptions, :index) { |p| p['activation_key_id'] == '1' }
       run_cmd(%w(activation-key subscriptions --organization-id 1 --id 1))
     end
 

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

@@ -30,5 +30,46 @@ module HammerCLIKatello
       run_cmd(%w(content-view version promote --organization org1 --content-view cv
                  --to-lifecycle-environment test --version 1 --async))
     end
+
+    it 'allows promoting a content view without version name/id' do
+      ex = api_expects(:organizations, :index) do |p|
+        p[:search] == "name = \"org1\""
+      end
+      ex.at_least_once.returns(index_response([{'id' => 1}]))
+
+      ex = api_expects(:content_views, :index) do |p|
+        p['name'] == 'cv' && p['organization_id'] == 1
+      end
+      ex.returns(index_response([{'id' => 3}]))
+
+      ex = api_expects(:content_view_versions, :index) do |p|
+        p['content_view_id'] == 3
+      end
+      ex.returns(
+        index_response(
+          [
+            {'id' => 6, 'name' => 'cv', 'environments' => [{'id' => 1}]},
+            {'id' => 7, 'name' => 'cv2', 'environments' => [{'id' => 9}]}
+          ]
+        )
+      )
+
+      ex = api_expects(:lifecycle_environments, :index) do |p|
+        p['organization_id'] == 1 && p['name'] == 'Library'
+      end
+      ex.returns(index_response([{'id' => 1}]))
+
+      ex = api_expects(:lifecycle_environments, :index) do |p|
+        p['organization_id'] == 1 && p['name'] == 'test'
+      end
+      ex.returns(index_response([{'id' => 9}]))
+
+      api_expects(:content_view_versions, :promote) do |p|
+        p['id'] == 6 && p['environment_ids'] == [9]
+      end
+
+      run_cmd(%w(content-view version promote --organization org1 --content-view cv
+                 --to-lifecycle-environment test --from-lifecycle-environment Library --async))
+    end
   end
 end

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

@@ -26,7 +26,7 @@ module HammerCLIKatello
       expect_foreman_task('3')
 
       result = run_cmd(%w(content-view version republish-repositories --organization org1
-                          --content-view cv --version 1))
+                          --content-view cv --version 1 --force true))
 
       assert_equal(result.exit_code, 0)
     end

data/test/functional/host/errata/recalculate_test.rb

@@ -8,33 +8,19 @@ describe 'recalculate errata' do
   end
 
   let(:host_id) { 1 }
-  let(:task_id) { '5' }
-  let(:response) do
-    {
-      'id' => task_id,
-      'state' => 'stopped'
-    }
-  end
 
   it "recalculates errata for a host" do
     params = ["--host-id=#{host_id}"]
 
     api_expects(:host_errata, :applicability, 'Host errata recalculate')
       .with_params('host_id' => host_id)
-      .returns(response)
-
-    expect_foreman_task(task_id)
-
-    run_cmd(@cmd + params)
-  end
-
-  it "applies an errata to a host with async flag" do
-    params = ["--host-id=#{host_id}", "--async"]
-
-    api_expects(:host_errata, :applicability, 'Host errata recalculate')
-      .with_params('host_id' => host_id)
-      .returns(response)
-
-    run_cmd(@cmd + params)
+      .returns({})
+
+    expected_result = success_result(
+      'Errata recalculation started.
+'
+    )
+    result = run_cmd(@cmd + params)
+    assert_cmd(expected_result, result)
   end
 end

data/test/functional/module_stream/info_test.rb

@@ -15,7 +15,7 @@ module HammerCLIKatello
         .returns(index_response([{'id' => 1}]))
 
       api_expects(:module_streams, :show)
-        .with_params(repository_id: "1", id: 1)
+        .with_params(repository_id: 1, id: 1)
 
       run_cmd(%w(module-stream info --name duck --repository-id 1))
     end

data/test/functional/organization/cdn_configuration_test.rb

@@ -0,0 +1,42 @@
+require_relative '../test_helper'
+require 'hammer_cli_katello/organization'
+require 'hammer_cli_katello/associating_commands'
+
+describe HammerCLIKatello::Organization::ConfigureCdnCommand do
+  include OrganizationHelpers
+  before do
+    @cmd = %w(organization configure-cdn)
+  end
+
+  it 'by updates with the right params' do
+    org_id = '100'
+    org_label = 'org1'
+    ssl_cred_id = '1'
+    password = "pass"
+    username = "foo"
+    url = "https://goo.com"
+    upstream_label = "GreatOrg"
+    params = ["--label=#{org_label}",
+              "--url=#{url}",
+              "--username=#{username}",
+              "--upstream-organization-label=#{upstream_label}",
+              "--password=#{password}",
+              "--ssl-ca-credential-id=#{ssl_cred_id}"
+            ]
+    expect_organization_search(org_label, org_id, field: 'label')
+
+    api_expects(:organizations, :cdn_configuration) do |par|
+      par['id'].to_s == org_id &&
+        par['username'] == username &&
+        par['url'] == url &&
+        par['password'] == password &&
+        par['ssl_ca_credential_id'].to_s == ssl_cred_id &&
+        par['upstream_organization_label'] == upstream_label
+    end
+
+    assert_equal(
+      0,
+      run_cmd(@cmd + params).exit_code
+    )
+  end
+end

data/test/functional/organization/info_test.rb

@@ -19,4 +19,21 @@ describe HammerCLIKatello::Organization::InfoCommand do
     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}"]
+    api_expects(:organizations, :index).returns(index_response([{'id' => org_id}]))
+
+    cdn_configuration = {
+      "url" => "https://cdn.redhat.com"
+    }
+
+    api_expects(:organizations, :show)
+      .with_params('id' => org_id.to_s)
+      .returns("cdn_configuration" => cdn_configuration, "id" => org_id)
+    result = run_cmd(@cmd + params)
+    expected = success_result(FieldMatcher.new('URL', cdn_configuration["url"]))
+    assert_cmd(expected, result)
+  end
 end

data/test/functional/package/list_test.rb

@@ -24,7 +24,9 @@ module HammerCLIKatello
         api_expects(:content_view_versions, :index)
           .with_params('content_view_id' => 1, 'version' => '2.1')
           .returns(index_response([{'id' => 5}]))
-        api_expects(:packages, :index).with_params('content_view_version_id' => 5)
+        api_expects(:packages, :index)
+          .with_params('content_view_version_id' => 5)
+          .returns(index_response([{'id' => 1}, {'id' => 2}]))
 
         run_cmd(%w(package list --content-view-id 1 --content-view-version 2.1))
       end
@@ -86,7 +88,7 @@ module HammerCLIKatello
       it 'may be specified environment name no org fails' do
         api_expects_no_call
         r = run_cmd(%w(package list --environment Library))
-        expec_err = "--organization, --organization-title, --organization-label, --organization-id"
+        expec_err = "Missing options to search organization"
         puts r.err
         assert(r.err.include?(expec_err), "Invalid error message")
       end

data/test/functional/ping_test.rb

@@ -15,6 +15,8 @@ describe 'ping' do
       'katello_events' =>
         {'status' => 'ok', 'message' => '0 Processed, 0 Failed', 'duration_ms' => '34'},
       'pulp3' =>
+        {'status' => 'ok', 'duration_ms' => '34'},
+      'pulp3_content' =>
         {'status' => 'ok', 'duration_ms' => '34'}
     }
   end
@@ -26,7 +28,7 @@ describe 'ping' do
   end
   let(:standard_response_keys) do
     %w(katello_agent foreman_tasks candlepin candlepin_events
-       candlepin_auth katello_events pulp3).sort
+       candlepin_auth katello_events pulp3 pulp3_content).sort
   end
   let(:hammer_ping) { %w(ping katello) }
 

data/test/functional/srpm/list_test.rb

@@ -6,7 +6,7 @@ require 'hammer_cli_katello/package'
 require 'hammer_cli_katello/srpm'
 
 module HammerCLIKatello
-  describe PackageCommand::ListCommand do
+  describe SrpmCommand::ListCommand do
     include OrganizationHelpers
     include RepositoryHelpers
     include ProductHelpers

data/test/functional/subscription/list_test.rb

@@ -60,7 +60,7 @@ module HammerCLIKatello
     end
 
     it 'allows host id' do
-      api_expects(:subscriptions, :index) { |par| par['host_id'] == 1 }
+      api_expects(:subscriptions, :index) { |par| par['host_id'] == '1' }
       run_cmd(%w(subscription list --organization-id 1 --host-id 1))
     end
 
@@ -72,7 +72,7 @@ module HammerCLIKatello
     end
 
     it 'allows activation key id' do
-      api_expects(:subscriptions, :index) { |par| par['activation_key_id'] == 1 }
+      api_expects(:subscriptions, :index) { |par| par['activation_key_id'] == '1' }
       run_cmd(%w(subscription list --organization-id 1 --activation-key-id 1))
     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.1')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.3')
 
 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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Adam Price
@@ -32,10 +32,10 @@ authors:
 - Tom McKay
 - Walden Raines
 - Zach Huntington-Meath
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -206,6 +206,8 @@ files:
 - lib/hammer_cli_katello/associating_commands.rb
 - lib/hammer_cli_katello/capsule.rb
 - lib/hammer_cli_katello/command_extensions.rb
+- lib/hammer_cli_katello/command_extensions/content_source.rb
+- lib/hammer_cli_katello/command_extensions/kickstart_repository.rb
 - lib/hammer_cli_katello/command_extensions/lifecycle_environment.rb
 - lib/hammer_cli_katello/command_extensions/lifecycle_environments.rb
 - lib/hammer_cli_katello/command_extensions/ping.rb
@@ -239,11 +241,9 @@ files:
 - lib/hammer_cli_katello/host_collection_erratum.rb
 - lib/hammer_cli_katello/host_collection_package.rb
 - lib/hammer_cli_katello/host_collection_package_group.rb
-- lib/hammer_cli_katello/host_content_source_options.rb
 - lib/hammer_cli_katello/host_deb.rb
 - lib/hammer_cli_katello/host_errata.rb
 - lib/hammer_cli_katello/host_extensions.rb
-- lib/hammer_cli_katello/host_kickstart_repository_options.rb
 - lib/hammer_cli_katello/host_package.rb
 - lib/hammer_cli_katello/host_package_group.rb
 - lib/hammer_cli_katello/host_subscription.rb
@@ -317,6 +317,7 @@ files:
 - test/data/3.9/foreman_api.json
 - test/data/4.0/foreman_api.json
 - test/data/4.1/foreman_api.json
+- test/data/4.3/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -439,6 +440,7 @@ files:
 - test/functional/local_helper_test.rb
 - test/functional/module_stream/info_test.rb
 - test/functional/module_stream/list_test.rb
+- test/functional/organization/cdn_configuration_test.rb
 - test/functional/organization/delete_test.rb
 - test/functional/organization/info_test.rb
 - test/functional/organization/organization_helpers.rb
@@ -491,7 +493,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
@@ -507,7 +509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer
 test_files:
@@ -532,6 +534,7 @@ test_files:
 - test/data/3.9/foreman_api.json
 - test/data/4.0/foreman_api.json
 - test/data/4.1/foreman_api.json
+- test/data/4.3/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -654,6 +657,7 @@ test_files:
 - test/functional/local_helper_test.rb
 - test/functional/module_stream/info_test.rb
 - test/functional/module_stream/list_test.rb
+- test/functional/organization/cdn_configuration_test.rb
 - test/functional/organization/delete_test.rb
 - test/functional/organization/info_test.rb
 - test/functional/organization/organization_helpers.rb

data/lib/hammer_cli_katello/host_content_source_options.rb

@@ -1,28 +0,0 @@
-module HammerCLIKatello
-  module HostContentSourceOptions
-    def self.included(base)
-      base.option "--content-source", "CONTENT_SOURCE_NAME",
-             _("Content Source name "),
-             :attribute_name => :option_content_source
-    end
-
-    def request_params
-      super.tap do |mod|
-        resource_name = resource.singular_name
-        if option_content_source && !option_content_source_id
-          resource_hash = if resource_name == "hostgroup"
-                            mod[resource_name]
-                          else
-                            mod[resource_name]["content_facet_attributes"]
-                          end
-
-          proxy_options = { HammerCLI.option_accessor_name('name') => option_content_source}
-          resource_hash["content_source_id"] = resolver.smart_proxy_id(proxy_options)
-        end
-      end
-    rescue HammerCLIForeman::ResolverError => e
-      e.message.gsub!('smart_proxy', _('Content Source'))
-      raise e
-    end
-  end
-end

data/lib/hammer_cli_katello/host_kickstart_repository_options.rb

@@ -1,49 +0,0 @@
-module HammerCLIKatello
-  module HostKickstartRepositoryOptions
-    def self.included(base)
-      base.option "--kickstart-repository", "REPOSITORY_NAME",
-             _("Kickstart repository name "),
-             :attribute_name => :option_kickstart_repository
-    end
-
-    def request_params
-      super.tap do |mod|
-        resource_name = resource.singular_name
-        if option_kickstart_repository && !option_kickstart_repository_id
-          resource_hash = if resource_name == "hostgroup"
-                            mod[resource_name]
-                          else
-                            mod[resource_name]["content_facet_attributes"]
-                          end
-
-          resource_hash ||= {}
-
-          env_id = resource_hash["lifecycle_environment_id"]
-          cv_id = resource_hash["content_view_id"]
-
-          raise _("Please provide --lifecycle-environment-id") unless env_id
-
-          raise _("Please provide --content-view-id") unless cv_id
-
-          resource_hash["kickstart_repository_id"] = fetch_repo_id(cv_id, env_id,
-                                                                   option_kickstart_repository)
-        end
-      end
-    end
-
-    def fetch_repo_id(cv_id, env_id, repo_name)
-      repo_resource = HammerCLIForeman.foreman_resource(:repositories)
-      index_options = {
-        :content_view_id => cv_id,
-        :environment_id => env_id,
-        :name => repo_name
-      }
-      repos = repo_resource.call(:index, index_options)["results"]
-      if repos.empty?
-        raise _("No such repository with name %{name}, in lifecycle environment"\
-                  " %{environment_id} and content view %{content_view_id}" % index_options)
-      end
-      repos.first["id"]
-    end
-  end
-end