hammer_cli_katello 0.0.26 → 0.1.0

data/test/functional/repository/synchronize_test.rb

@@ -33,7 +33,7 @@ describe 'Synchronize a repository' do
     expect_foreman_task('3')
 
     result = run_cmd(@cmd + params)
-    assert(result.exit_code, 0)
+    assert_equal(result.exit_code, 0)
   end
 
   it "synchronizes a repository with a repository name" do
@@ -41,7 +41,7 @@ describe 'Synchronize a repository' do
 
     expect_product_search(org_id, "test_product", product_id)
 
-    expect_repository_search(org_id, product_id, "test_repo", repo_id)
+    expect_repository_search(product_id, "test_repo", repo_id)
 
     ex = api_expects(:repositories, :sync, 'Repository is synced') do |par|
       par['id'] == repo_id
@@ -52,6 +52,6 @@ describe 'Synchronize a repository' do
     expect_foreman_task('3')
 
     result = run_cmd(@cmd + params)
-    assert(result.exit_code, 0)
+    assert_equal(result.exit_code, 0)
   end
 end

data/test/functional/repository/upload_test.rb

@@ -35,7 +35,13 @@ describe 'upload repository' do
     ex.returns(upload_response)
 
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload') do |par|
-      par[:id] == repo_id.to_s && par[:upload_ids] == ['1234']
+      upload = {
+        :id => '1234',
+        :name => 'test.rpm',
+        :size => 0,
+        :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+      }
+      par[:id] == repo_id.to_s && par[:uploads] == [upload]
     end
 
     ex2.returns("")
@@ -47,7 +53,7 @@ describe 'upload repository' do
     ex3.returns("")
 
     result = run_cmd(@cmd + params)
-    assert(result.exit_code, 0)
+    assert_equal(result.exit_code, 0)
     File.delete("test.rpm")
   end
 
@@ -59,7 +65,7 @@ describe 'upload repository' do
 
     expect_product_search(org_id, 'test_product', product_id)
 
-    expect_repository_search(org_id, product_id, 'test_repo', repo_id)
+    expect_repository_search(product_id, 'test_repo', repo_id)
 
     ex = api_expects(:content_uploads, :create, "Create upload for content") do |par|
       par[:repository_id] == repo_id
@@ -68,7 +74,13 @@ describe 'upload repository' do
     ex.returns(upload_response)
 
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload') do |par|
-      par[:id] == repo_id && par[:upload_ids] == ['1234']
+      upload = {
+        :id => '1234',
+        :name => 'test.rpm',
+        :size => 0,
+        :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+      }
+      par[:id] == repo_id && par[:uploads] == [upload]
     end
 
     ex2.returns("")
@@ -80,7 +92,7 @@ describe 'upload repository' do
     ex3.returns("")
 
     result = run_cmd(@cmd + params)
-    assert(result.exit_code, 0)
+    assert_equal(result.exit_code, 0)
     File.delete("test.rpm")
   end
 end

data/test/functional/subscription/list_test.rb

@@ -0,0 +1,92 @@
+require_relative '../test_helper'
+require 'hammer_cli_katello/subscription'
+
+module HammerCLIKatello
+  describe SubscriptionCommand::ListCommand do
+    before do
+      @cmd = %w(subscription list)
+    end
+
+    let(:org_id) { 1 }
+
+    it "returns the correct subscription type" do
+      cmd = SubscriptionCommand::ListCommand.new({})
+      assert_equal("Physical", cmd.get_subscription_type("virt_only" => false))
+
+      hostname = "boo.com"
+      with_hostname = cmd.get_subscription_type("virt_only" => true, "host" => {"name" => hostname})
+      assert(with_hostname.include?(hostname))
+
+      assert_equal("Temporary",
+                   cmd.get_subscription_type("virt_only" => true, "unmapper_guest" => true))
+
+      assert_equal("Virtual",
+                   cmd.get_subscription_type("virt_only" => true))
+    end
+
+    it "lists an organizations subscriptions" do
+      params = ["--organization-id=#{org_id}"]
+
+      ex = api_expects(:subscriptions, :index, 'Subscription list') do |par|
+        par['organization_id'] == org_id
+      end
+
+      ex.returns(index_response([]))
+
+      result = run_cmd(@cmd + params)
+
+      fields = ['ID', 'UUID', 'NAME', 'TYPE', 'CONTRACT', 'ACCOUNT', 'SUPPORT',
+                'END DATE', 'QUANTITY', 'CONSUMED']
+      expected_result = success_result(IndexMatcher.new([fields, []]))
+      assert_cmd(expected_result, result)
+    end
+
+    it 'requires organization options' do
+      expected_error = "Could not find organization"
+      result = run_cmd(%w(subscription list))
+      assert_equal(expected_error, result.err[/#{expected_error}/])
+    end
+
+    it 'allows organization name' do
+      api_expects(:organizations, :index) { |par| par[:search] == "name = \"org1\"" }
+        .returns(index_response([{'id' => 1}]))
+
+      api_expects(:subscriptions, :index) { |par| par['organization_id'].to_i == 1 }
+
+      run_cmd(%w(subscription list --organization org1))
+    end
+
+    it 'allows organization label' do
+      api_expects(:organizations, :index) { |par| par[:search] == "label = \"org1\"" }
+        .returns(index_response([{'id' => 1}]))
+
+      api_expects(:subscriptions, :index) { |par| par['organization_id'].to_i == 1 }
+
+      run_cmd(%w(subscription list --organization-label org1))
+    end
+
+    it 'allows host id' do
+      api_expects(:subscriptions, :index) { |par| par['host_id'] == 1 }
+      run_cmd(%w(subscription list --organization-id 1 --host-id 1))
+    end
+
+    it 'allows host name' do
+      api_expects(:hosts, :index) { |par| par[:search] == "name = \"host1\"" }
+        .returns(index_response([{'id' => 1}]))
+      api_expects(:subscriptions, :index) { |par| par['host_id'] == 1 }
+      run_cmd(%w(subscription list --organization-id 1 --host host1))
+    end
+
+    it 'allows activation key id' do
+      api_expects(:subscriptions, :index) { |par| par['activation_key_id'] == 1 }
+      run_cmd(%w(subscription list --organization-id 1 --activation-key-id 1))
+    end
+
+    it 'allows activation key name' do
+      api_expects(:activation_keys, :index) { |par| par['name'] == "ak1" }
+        .returns(index_response([{'id' => 1}]))
+      api_expects(:subscriptions, :index) { |par| par['activation_key_id'] == 1 }
+      run_cmd(%w(subscription list --organization-id 1 --activation-key ak1))
+    end
+  end
+end

data/test/functional/sync_plan/sync_plan_helpers.rb

@@ -0,0 +1,8 @@
+module SyncPlanHelpers
+  def expect_sync_plan_search(org_id, name, id)
+    ex = api_expects(:sync_plans, :index, 'find sync plan') do |par|
+      par['name'] == name && par['organization_id'] == org_id
+    end
+    ex.returns(index_response([{'id' => id}]))
+  end
+end

data/test/test_helper.rb

@@ -4,8 +4,8 @@ if RUBY_VERSION > "2.2"
   require 'coveralls'
   SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
   SimpleCov.start do
-    minimum_coverage 46
-    refuse_coverage_drop
+    minimum_coverage 70
+    maximum_coverage_drop 0.1
     track_files "lib/**/*.rb"
     add_filter '/test/'
   end
@@ -18,7 +18,7 @@ require 'mocha/setup'
 require 'hammer_cli'
 require 'hammer_cli_foreman/commands'
 
-KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.0')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.2')
 
 HammerCLIForeman.stubs(:resource_config).returns(
   :apidoc_cache_dir => 'test/data/' + KATELLO_VERSION.to_s,

data/test/unit/id_resolver_test.rb

@@ -6,10 +6,17 @@ module HammerCLIKatello
     let(:api) { mock('api') }
     let(:searchables) { mock('searchables') }
     let(:id_resolver) { IdResolver.new api, searchables }
+
+    before(:each) do
+      api.stubs(:resources).returns([])
+    end
+
     describe '#repository_ids' do
-      before(:each) do
-        api.stubs(:resources).returns([])
+      it 'accepts nil repository_names' do
+        id_resolver.stubs(:find_resources).returns([])
+        id_resolver.repository_ids({}).must_equal(nil)
       end
+
       it 'accepts repository_ids' do
         id_resolver.repository_ids(
           'option_repository_ids' => [1, 2]
@@ -28,5 +35,13 @@ module HammerCLIKatello
         ).must_equal [1, 2]
       end
     end
+
+    describe '#repository_id' do
+      it 'resolves ID from name' do
+        id_resolver.expects(:find_resource).with(:repositories, name: 'repo1').returns('id' => 5)
+        options = {name: 'repo1'}
+        id_resolver.repository_id(options).must_equal 5
+      end
+    end
   end
 end

data/test/unit/search_options_creators_test.rb

@@ -1,9 +1,6 @@
 require_relative '../test_helper'
-require 'hammer_cli_katello/search_options_creators'
-
-class SearchOptionsCreatorsMock
-  include HammerCLIKatello::SearchOptionsCreators
 
+class SearchOptionsCreatorsMock < HammerCLIKatello::IdResolver
   def one
   end
 
@@ -12,11 +9,31 @@ class SearchOptionsCreatorsMock
 end
 
 describe HammerCLIKatello::SearchOptionsCreators do
-
-  let(:search_options_creators) { SearchOptionsCreatorsMock.new }
+  let(:api) { mock('api') }
+  let(:searchables) { HammerCLIKatello::Searchables.new }
+  let(:search_options_creators) { SearchOptionsCreatorsMock.new(api, searchables) }
   let(:options) { Hash.new }
   let(:resource) { mock('ApipieBindings::Resource') }
 
+  before(:each) do
+    api.stubs(:resources).returns([resource])
+    resource.stubs(:singular_name).returns('')
+  end
+
+  describe '#create_repository_search_options' do
+    it 'handles a repository' do
+      search_options_creators.create_repository_search_options(
+        'option_name' => 'repo1'
+      )['name'].must_equal 'repo1'
+    end
+
+    it 'handles an organization_id' do
+      search_options_creators.create_repository_search_options(
+        'option_organization_id' => 2
+      )['organization_id'].must_equal 2
+    end
+  end
+
   describe '#create_repositories_search_options' do
     it 'handles an array of names' do
       search_options_creators.create_repositories_search_options(
@@ -35,6 +52,12 @@ describe HammerCLIKatello::SearchOptionsCreators do
         'option_product_id' => 3
       )['product_id'].must_equal 3
     end
+
+    it 'handles an organization_id' do
+      search_options_creators.create_repositories_search_options(
+        'option_organization_id' => 4
+      )['organization_id'].must_equal 4
+    end
   end
 
   describe '#create_content_view_versions_search_options(options)' do
@@ -58,9 +81,19 @@ describe HammerCLIKatello::SearchOptionsCreators do
     end
   end
 
-  describe 'without the katello api' do
-    let(:api) { mock('api') }
+  describe "#create_host_collections_search_options" do
+    it 'handles organization options' do
+      api.stubs(:resource)
+      search_options_creators.stubs(:scoped_options).returns('option_name' => 'org1')
+      search_options_creators.expects(:organization_id).with('option_name' => 'org1').returns(1)
+      search_options_creators.expects(:create_search_options_with_katello_api)
+      search_options_creators.create_host_collections_search_options(
+        'option_organization_name' => 'org1'
+      )
+    end
+  end
 
+  describe 'without the katello api' do
     before(:each) do
       search_options_creators.expects(:create_search_options_without_katello_api)
       search_options_creators.stubs(:api).returns(api)
@@ -73,15 +106,21 @@ describe HammerCLIKatello::SearchOptionsCreators do
       end
     end
 
+    describe '#create_environments_search_options(options)' do
+      it 'does not use the katello api' do
+        search_options_creators.create_environments_search_options(:environments)
+      end
+    end
+
     describe '#create_smart_proxies_search_options(options)' do
       it 'does not use the katello api' do
-        search_options_creators.create_organizations_search_options(:anything)
+        search_options_creators.create_smart_proxies_search_options(:anything)
       end
     end
 
     describe '#create_capsules_search_options(options)' do
       it 'does not use the katello api' do
-        search_options_creators.create_organizations_search_options(:anything)
+        search_options_creators.create_capsules_search_options(:anything)
       end
     end
 
@@ -90,7 +129,6 @@ describe HammerCLIKatello::SearchOptionsCreators do
         search_options_creators.create_organizations_search_options(:anything)
       end
     end
-
   end # describe 'without the katello api'
 
   describe '#create_search_options_with_katello_api' do
@@ -103,5 +141,4 @@ describe HammerCLIKatello::SearchOptionsCreators do
       ).must_equal('one' => '1', 'two' => '2')
     end
   end # describe '#create_search_options_with_katello_api'
-
 end # describe HammerCLIKatello::SearchOptionsCreators

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.1.0
 platform: ruby
 authors:
 - Adam Price
@@ -34,7 +34,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -196,14 +196,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '0.39'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '0.39'
 - !ruby/object:Gem::Dependency
   name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -232,14 +232,15 @@ files:
 - lib/hammer_cli_katello/associating_commands.rb
 - lib/hammer_cli_katello/capsule.rb
 - lib/hammer_cli_katello/commands.rb
-- lib/hammer_cli_katello/content_host.rb
 - lib/hammer_cli_katello/content_view.rb
+- lib/hammer_cli_katello/content_view_name_resolvable.rb
 - lib/hammer_cli_katello/content_view_puppet_module.rb
 - lib/hammer_cli_katello/content_view_version.rb
 - lib/hammer_cli_katello/erratum.rb
 - lib/hammer_cli_katello/exception_handler.rb
 - lib/hammer_cli_katello/filter.rb
 - lib/hammer_cli_katello/filter_rule.rb
+- lib/hammer_cli_katello/foreman_search_options_creators.rb
 - lib/hammer_cli_katello/gpg_key.rb
 - lib/hammer_cli_katello/host.rb
 - lib/hammer_cli_katello/host_collection.rb
@@ -247,15 +248,19 @@ files:
 - lib/hammer_cli_katello/host_collection_package.rb
 - lib/hammer_cli_katello/host_collection_package_group.rb
 - lib/hammer_cli_katello/host_errata.rb
+- lib/hammer_cli_katello/host_extensions.rb
 - lib/hammer_cli_katello/host_package.rb
 - lib/hammer_cli_katello/host_package_group.rb
 - lib/hammer_cli_katello/host_subscription.rb
+- lib/hammer_cli_katello/hostgroup.rb
+- lib/hammer_cli_katello/hostgroup_extensions.rb
 - lib/hammer_cli_katello/i18n.rb
 - lib/hammer_cli_katello/id_resolver.rb
 - lib/hammer_cli_katello/katello_environment_name_resolvable.rb
 - lib/hammer_cli_katello/lifecycle_environment.rb
 - lib/hammer_cli_katello/lifecycle_environment_name_resolvable.rb
 - lib/hammer_cli_katello/organization.rb
+- lib/hammer_cli_katello/organization_options.rb
 - lib/hammer_cli_katello/ostree_branch.rb
 - lib/hammer_cli_katello/output/fields.rb
 - lib/hammer_cli_katello/output/formatters.rb
@@ -289,7 +294,15 @@ files:
 - locale/zh_TW/hammer-cli-katello.po
 - test/data/2.5/foreman_api.json
 - test/data/3.0/foreman_api.json
+- test/data/3.2/foreman_api.json
+- test/data/Readme.md
+- test/functional/activaton_key/add_host_collection_test.rb
+- test/functional/activaton_key/create_test.rb
 - test/functional/activaton_key/list_test.rb
+- test/functional/activaton_key/product_content_test.rb
+- test/functional/activaton_key/remove_host_collection_test.rb
+- test/functional/activaton_key/subscriptions_test.rb
+- test/functional/activaton_key/update_test.rb
 - test/functional/capsule/content/cancel_synchronization_test.rb
 - test/functional/capsule/content/capsule_content_helpers.rb
 - test/functional/capsule/content/data/library_env.json
@@ -297,23 +310,62 @@ files:
 - test/functional/capsule/content/data/sync_tasks.json
 - test/functional/capsule/content/info_test.rb
 - test/functional/capsule/content/synchronization_status_test.rb
+- test/functional/content_view/add_content_view_version_test.rb
+- test/functional/content_view/add_repository_test.rb
 - test/functional/content_view/content_view_helpers.rb
 - test/functional/content_view/create_test.rb
+- test/functional/content_view/filter/create_test.rb
 - test/functional/content_view/list_test.rb
+- test/functional/content_view/publish_test.rb
+- test/functional/content_view/puppet_module/add_test.rb
+- test/functional/content_view/remove_content_view_version_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
+- test/functional/filter_rule/create_test.rb
 - test/functional/host/errata/apply_test.rb
+- test/functional/host/extensions/data/host.json
+- test/functional/host/extensions/data/host_list.json
+- test/functional/host/extensions/info_test.rb
+- test/functional/host/extensions/list_test.rb
 - test/functional/host/host_helpers.rb
+- test/functional/host/subscription/attach_test.rb
+- test/functional/host/subscription/auto_attach_test.rb
 - test/functional/host/subscription/register_test.rb
+- test/functional/host/subscription/remove_test.rb
 - test/functional/host/subscription/unregister_test.rb
+- test/functional/host_collection/add_host_test.rb
+- test/functional/host_collection/copy_test.rb
+- test/functional/host_collection/create_test.rb
+- test/functional/host_collection/delete_test.rb
+- test/functional/host_collection/hosts_test.rb
+- test/functional/host_collection/info_test.rb
+- test/functional/host_collection/list_test.rb
+- test/functional/host_collection/remove_host_test.rb
+- test/functional/host_collection/update_test.rb
+- test/functional/hostgroup/create_test.rb
+- test/functional/hostgroup/data/hostgroup.json
+- test/functional/hostgroup/info_test.rb
+- test/functional/hostgroup/update_test.rb
 - test/functional/lifecycle_environment/lifecycle_environment_helpers.rb
 - test/functional/organization/organization_helpers.rb
 - test/functional/ping_test.rb
+- test/functional/product/create_test.rb
+- test/functional/product/delete_test.rb
+- test/functional/product/info_test.rb
+- test/functional/product/list_test.rb
 - test/functional/product/product_helpers.rb
+- test/functional/product/remove_sync_plan_test.rb
+- test/functional/product/set_sync_plan_test.rb
+- test/functional/product/update_test.rb
 - test/functional/repository/info_test.rb
 - test/functional/repository/list_test.rb
+- test/functional/repository/remove_content_test.rb
 - test/functional/repository/repository_helpers.rb
 - test/functional/repository/synchronize_test.rb
 - test/functional/repository/upload_test.rb
+- test/functional/subscription/list_test.rb
+- test/functional/sync_plan/sync_plan_helpers.rb
 - test/functional/test_helper.rb
 - test/task_helper.rb
 - test/test_helper.rb
@@ -339,14 +391,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer
 test_files:
 - test/data/2.5/foreman_api.json
 - test/data/3.0/foreman_api.json
+- test/data/3.2/foreman_api.json
+- test/data/Readme.md
+- test/functional/activaton_key/add_host_collection_test.rb
+- test/functional/activaton_key/create_test.rb
 - test/functional/activaton_key/list_test.rb
+- test/functional/activaton_key/product_content_test.rb
+- test/functional/activaton_key/remove_host_collection_test.rb
+- test/functional/activaton_key/subscriptions_test.rb
+- test/functional/activaton_key/update_test.rb
 - test/functional/capsule/content/cancel_synchronization_test.rb
 - test/functional/capsule/content/capsule_content_helpers.rb
 - test/functional/capsule/content/data/library_env.json
@@ -354,26 +414,64 @@ test_files:
 - test/functional/capsule/content/data/sync_tasks.json
 - test/functional/capsule/content/info_test.rb
 - test/functional/capsule/content/synchronization_status_test.rb
+- test/functional/content_view/add_content_view_version_test.rb
+- test/functional/content_view/add_repository_test.rb
 - test/functional/content_view/content_view_helpers.rb
 - test/functional/content_view/create_test.rb
+- test/functional/content_view/filter/create_test.rb
 - test/functional/content_view/list_test.rb
+- test/functional/content_view/publish_test.rb
+- test/functional/content_view/puppet_module/add_test.rb
+- test/functional/content_view/remove_content_view_version_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
+- test/functional/filter_rule/create_test.rb
 - test/functional/host/errata/apply_test.rb
+- test/functional/host/extensions/data/host.json
+- test/functional/host/extensions/data/host_list.json
+- test/functional/host/extensions/info_test.rb
+- test/functional/host/extensions/list_test.rb
 - test/functional/host/host_helpers.rb
+- test/functional/host/subscription/attach_test.rb
+- test/functional/host/subscription/auto_attach_test.rb
 - test/functional/host/subscription/register_test.rb
+- test/functional/host/subscription/remove_test.rb
 - test/functional/host/subscription/unregister_test.rb
+- test/functional/host_collection/add_host_test.rb
+- test/functional/host_collection/copy_test.rb
+- test/functional/host_collection/create_test.rb
+- test/functional/host_collection/delete_test.rb
+- test/functional/host_collection/hosts_test.rb
+- test/functional/host_collection/info_test.rb
+- test/functional/host_collection/list_test.rb
+- test/functional/host_collection/remove_host_test.rb
+- test/functional/host_collection/update_test.rb
+- test/functional/hostgroup/create_test.rb
+- test/functional/hostgroup/data/hostgroup.json
+- test/functional/hostgroup/info_test.rb
+- test/functional/hostgroup/update_test.rb
 - test/functional/lifecycle_environment/lifecycle_environment_helpers.rb
 - test/functional/organization/organization_helpers.rb
 - test/functional/ping_test.rb
+- test/functional/product/create_test.rb
+- test/functional/product/delete_test.rb
+- test/functional/product/info_test.rb
+- test/functional/product/list_test.rb
 - test/functional/product/product_helpers.rb
+- test/functional/product/remove_sync_plan_test.rb
+- test/functional/product/set_sync_plan_test.rb
+- test/functional/product/update_test.rb
 - test/functional/repository/info_test.rb
 - test/functional/repository/list_test.rb
+- test/functional/repository/remove_content_test.rb
 - test/functional/repository/repository_helpers.rb
 - test/functional/repository/synchronize_test.rb
 - test/functional/repository/upload_test.rb
+- test/functional/subscription/list_test.rb
+- test/functional/sync_plan/sync_plan_helpers.rb
 - test/functional/test_helper.rb
 - test/task_helper.rb
 - test/test_helper.rb
 - test/unit/id_resolver_test.rb
 - test/unit/search_options_creators_test.rb
-has_rdoc: