hammer_cli_foreman 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 299ecfde2e76d65fc4c7f1d5bdac72f5d51143b0
-  data.tar.gz: 9b103faecf764289ef13d92c5eed3b2d2080cca6
+  metadata.gz: d9e0a20cb5bb0c548422b81c51845d180f0248a5
+  data.tar.gz: dd3d176d20d93db8fc965b34d3c3aff90e83a575
 SHA512:
-  metadata.gz: 0e1c8af02919b59b4650ab43a2435af314b9c52371eb4c258015e2e06a61a0e3786d30a49fc54ca7e9b0738160c8a3f94d05b43d7077c84b76dd3d129bf57c49
-  data.tar.gz: 942d83cbaf1b5d836ac3fc1cdfb8f6a37b52ea8695d8dbc49dfacbf86725c148e3c4b48b308f98bc1940901cd7dc7c68414091bc0141f857bd977d36fd7d78a4
+  metadata.gz: 0d7109efe44db2a67b8795a6914a9d518040eb8d8bb7f9c068c72382e3a3447fe43e82d1a1a154c585414378dfb56e988618c2895fe1b471d36614242ddbf2e2
+  data.tar.gz: 8eed5877f859165ee08e64275401c217f085ceb1d9794c32cc5f6eb5229818479f76c223efed758bc00e86c69ad19989432808091d8d6f274b4cdce03a68014e

data/doc/release_notes.md

@@ -1,11 +1,20 @@
 Release notes
 =============
-### 0.13.2 (2018-08-15)
-* Stop overriding apipie help for host flags ([#24490](http://projects.theforeman.org/issues/24490))
+### 0.14.0 (2018-08-27)
+* Add template combinations commands ([#3969](http://projects.theforeman.org/issues/3969))
+* Fix and extend tests for user update ([#23996](http://projects.theforeman.org/issues/23996))
 * Hammer asks for user password though -p option provided ([#23996](http://projects.theforeman.org/issues/23996))
-
-### 0.13.1 (2018-07-18)
-* removed redundant info about OS from hostgroup ([#23722](http://projects.theforeman.org/issues/23722))
+* Stop overriding apipie help for host flags ([PR #380](https://github.com/theforeman/hammer-cli-foreman/pull/380)) ([#24490](http://projects.theforeman.org/issues/24490))
+* Hammer report info doesn't show logs resources and messages ([PR #375](https://github.com/theforeman/hammer-cli-foreman/pull/375)) ([#12189](http://projects.theforeman.org/issues/12189))
+* Remove legacy code for Ruby < 2.0 ([#21360](http://projects.theforeman.org/issues/21360))
+* Add disassociate command to host ([#15674](http://projects.theforeman.org/issues/15674))
+* Align subnet translations in hammer with UI ([#9906](http://projects.theforeman.org/issues/9906))
+* Propagate the error message from core ([#24285](http://projects.theforeman.org/issues/24285))
+* Hammer uses /config_reports rather than /reports ([PR #374](https://github.com/theforeman/hammer-cli-foreman/pull/374)) ([#14510](http://projects.theforeman.org/issues/14510))
+* Setting list should show full names ([#20360](http://projects.theforeman.org/issues/20360))
+* Show cidr notation ([#22988](http://projects.theforeman.org/issues/22988))
+* Removed redundant info about OS from hostgroup ([#23722](http://projects.theforeman.org/issues/23722))
+* Add MTU to subnet info ([#23401](http://projects.theforeman.org/issues/23401))
 
 ### 0.13.0 (2018-05-09)
 * Listing all auth sources ([#19651](http://projects.theforeman.org/issues/19651))

data/lib/hammer_cli_foreman.rb

@@ -102,7 +102,12 @@ module HammerCLIForeman
     )
 
     HammerCLI::MainCommand.lazy_subcommand('report', _("Browse and read reports"),
-      'HammerCLIForeman::Report', 'hammer_cli_foreman/report'
+      'HammerCLIForeman::ConfigReport', 'hammer_cli_foreman/config_report',
+      :warning => _('%{report} command is deprecated and will be removed in one of the future versions. Please use %{config_report} command instead.') % {:report => 'report', :config_report => 'config-report'}
+    )
+
+    HammerCLI::MainCommand.lazy_subcommand('config-report', _("Browse and read reports"),
+      'HammerCLIForeman::ConfigReport', 'hammer_cli_foreman/config_report'
     )
 
     HammerCLI::MainCommand.lazy_subcommand('role', _("Manage user roles"),
@@ -156,4 +161,3 @@ module HammerCLIForeman
   end
 
 end
-

data/lib/hammer_cli_foreman/api/interactive_basic_auth.rb

@@ -14,7 +14,12 @@ module HammerCLIForeman
       def error(ex)
         if ex.is_a?(RestClient::Unauthorized)
           self.clear
-          return UnauthorizedError.new(_("Invalid username or password."))
+          message = _("Invalid username or password.")
+          begin
+            message = JSON.parse(ex.response.body)['error']['message'] 
+          rescue
+          end
+          return UnauthorizedError.new(message)
         end
       end
 

data/lib/hammer_cli_foreman/combination.rb

@@ -0,0 +1,85 @@
+module HammerCLIForeman
+  class Combination < HammerCLIForeman::Command
+    resource :template_combinations
+    command_name 'combination'
+    desc _("Manage template combinations")
+
+    module RequestParams
+      def request_params
+        combination_params = { 'hostgroup_id' => params['hostgroup_id'].to_s,
+                               'environment_id' => params['environment_id'].to_s }
+        super.merge('template_combination' => combination_params)
+      end
+    end
+
+
+    class InfoCombination < HammerCLIForeman::InfoCommand
+
+      output ListCommand.output_definition do
+        field :id, _('ID')
+        field :provisioning_template_id, _('Provisioning template ID')
+        field :provisioning_template_name, _('Provisioning template name')
+        field :hostgroup_id, _('Hostgroup ID')
+        field :hostgroup_name, _('Hostgroup name')
+        field :environment_id, _('Environment ID')
+        field :environment_name, _('Environment name')
+
+        HammerCLIForeman::References.taxonomies(self)
+        HammerCLIForeman::References.timestamps(self)
+
+      end
+      build_options do |o|
+        o.expand(:all).except(:config_templates,)
+        o.without(:config_template_id)
+      end
+    end
+
+    class ListCombination < HammerCLIForeman::ListCommand
+      output do
+        field :id, _('ID')
+        field nil, _('Provisioning Template'), Fields::SingleReference, :key => :provisioning_template
+        field nil, _('Hostgroup'), Fields::SingleReference, :key => :hostgroup
+        field nil, _('Environment'), Fields::SingleReference, :key => :environment
+      end
+
+      build_options do |o|
+        o.expand(:all).except(:config_templates, :hostgroups, :environments)
+        o.without(:config_template_id, :hostgroup_id, :environment_id)
+      end
+    end
+
+    class UpdateCombination < HammerCLIForeman::UpdateCommand
+      extend RequestParams
+
+      success_message _("Template combination updated.")
+      failure_message _("Could not update the template combination")
+
+      build_options do |o|
+        o.expand(:all).except(:config_templates,)
+        o.without(:config_template_id)
+      end
+    end
+
+    class CreateCombination < HammerCLIForeman::CreateCommand
+      extend RequestParams
+
+      success_message _("Template combination created.")
+      failure_message _("Could not create the template combination")
+
+      build_options do |o|
+        o.expand(:all).except(:config_templates,)
+        o.without(:config_template_id)
+      end
+    end
+
+    class DeleteCombination < HammerCLIForeman::DeleteCommand
+
+      success_message _("Template combination Deleted.")
+      failure_message _("Could not delete the template combination")
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_foreman/{report.rb → config_report.rb}

@@ -1,8 +1,8 @@
 module HammerCLIForeman
 
-  class Report < HammerCLIForeman::Command
+  class ConfigReport < HammerCLIForeman::Command
 
-    resource :reports
+    resource :config_reports
 
     class ListCommand < HammerCLIForeman::ListCommand
 
@@ -57,13 +57,11 @@ module HammerCLIForeman
           end
         end
         field :logs, _("Logs"), Fields::Collection do
-          from :log do
-            from :source do
-              field :source, _("Resource")
-            end
-            from :message do
-              field :message, _("Message")
-            end
+          from "source" do
+            field :source, _("Resource")
+          end
+          from "message" do
+            field :message, _("Message")
           end
         end
       end

data/lib/hammer_cli_foreman/host.rb

@@ -1,5 +1,5 @@
 require 'hammer_cli_foreman/fact'
-require 'hammer_cli_foreman/report'
+require 'hammer_cli_foreman/config_report'
 require 'hammer_cli_foreman/puppet_class'
 require 'hammer_cli_foreman/smart_class_parameter'
 require 'hammer_cli_foreman/smart_variable'
@@ -213,15 +213,50 @@ module HammerCLIForeman
       end
     end
 
+    class ConfigReportsCommand < HammerCLIForeman::ListCommand
+      command_name 'config-reports'
+      resource :config_reports, :index
+
+      option('--id', 'ID', _('Host id'), :referenced_resource => 'host')
+      option('--name', 'NAME', _('Host name'))
+
+      output HammerCLIForeman::ConfigReport::ListCommand.output_definition
+
+      def validate_options
+        validator.any(:option_name, :option_id).required
+      end
+
+      def request_params
+        params = super
+        search = []
+        search << params['search'] if params['search']
+
+        hostname = get_option_value('name')
+        search << %Q(host="#{hostname}") if hostname
+
+        host_id = get_option_value('id')
+        search << "host_id=#{host_id}" if host_id
+
+        params['search'] = search.join(' and ') unless search.empty?
+        params
+      end
+
+      build_options
+    end
 
     class ReportsCommand < HammerCLIForeman::ListCommand
       command_name "reports"
-      resource :reports, :index
+      resource :config_reports, :index
 
       option('--id', "ID", _('Host id'), :referenced_resource => 'host')
       option('--name', "NAME", _('Host name'))
 
-      output HammerCLIForeman::Report::ListCommand.output_definition
+      output HammerCLIForeman::ConfigReport::ListCommand.output_definition
+
+      def execute
+        warn _('%{reports} command is deprecated and will be removed in one of the future versions. Please use %{config_reports} command instead.') % {:reports => 'reports', :config_reports => 'config-reports'}
+        super
+      end
 
       def validate_options
         validator.any(:option_name, :option_id).required
@@ -428,6 +463,17 @@ module HammerCLIForeman
       build_options
     end
 
+    class DisassociateCommand < HammerCLIForeman::SingleResourceCommand
+      action :disassociate
+
+      command_name "disassociate"
+      desc _("Disassociate a host")
+      success_message _("The host has been disassociated from VM")
+      failure_message _("Failed to disassociated host from VM")
+
+      build_options
+    end
+
     autoload_subcommands
 
     subcommand 'interface', HammerCLIForeman::Interface.desc, HammerCLIForeman::Interface

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -53,7 +53,7 @@ module HammerCLIForeman
       :ptable =>           [ s_name(_("Partition table name")) ],
       :proxy =>            [ s_name(_("Proxy name")) ],
       :puppetclass =>      [ s_name(_("Puppet class name")) ],
-      :report =>           [],
+      :config_report =>    [],
       :role =>             [ s_name(_("User role name")) ],
       :setting =>          [ s_name(_("Setting name"), :editable => false) ],
       :subnet =>           [ s_name(_("Subnet name")) ],
@@ -61,7 +61,8 @@ module HammerCLIForeman
       :user =>             [ s("login", _("User's login to search by")) ],
       :common_parameter =>      [ s_name(_("Common parameter name")) ],
       :smart_class_parameter => [ s_name(_("Smart class parameter name"), :editable => false) ],
-      :smart_variable => [ s("variable", _("Smart variable name")) ]
+      :smart_variable => [ s("variable", _("Smart variable name")) ],
+      :template_combination => []
     }
     DEFAULT_SEARCHABLES = [ s_name(_("Name to search by")) ]
 

data/lib/hammer_cli_foreman/option_builders.rb

@@ -77,7 +77,7 @@ module HammerCLIForeman
       dependent_resources += @dependency_resolver.action_dependencies(action, :only_required => false, :recursive => false)
       dependent_resources += @dependency_resolver.action_dependencies(action, :only_required => true, :recursive => true)
 
-      unique(dependent_resources).each do |dep_resource|
+      dependent_resources.uniq(&:name).each do |dep_resource|
         builders << DependentSearchablesOptionBuilder.new(dep_resource, @searchables)
       end
 
@@ -88,16 +88,6 @@ module HammerCLIForeman
 
       builders
     end
-
-    protected
-
-    def unique(resources)
-      # ruby 1.8 hack - it does not support passing blocks to Array#uniq
-      resources.inject({}) do |h, r|
-        h.update(r.name => r)
-      end.values
-    end
-
   end
 
   class ForemanOptionBuilder < HammerCLI::OptionBuilderContainer

data/lib/hammer_cli_foreman/settings.rb

@@ -10,6 +10,7 @@ module HammerCLIForeman
       output do
         field :id, _('Id'), Fields::Id
         field :name, _('Name')
+        field :full_name, _('Full name')
         field :value, _('Value')
         field :description, _('Description')
       end

data/lib/hammer_cli_foreman/subnet.rb

@@ -9,9 +9,11 @@ module HammerCLIForeman
       output do
         field :id, _("Id")
         field :name, _("Name")
-        field :network, _("Network")
-        field :mask, _("Mask")
+        field :network, _("Network Addr")
+        field :cidr, _("Network Prefix")
+        field :mask, _("Network Mask")
         field :vlanid, _("VLAN ID")
+        field :boot_mode, _("Boot Mode")
       end
 
       build_options
@@ -20,18 +22,29 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      output ListCommand.output_definition do
+      output do
+        field :id, _("Id")
+        field :name, _("Name")
         field :description, _("Description"), Fields::LongText, :hide_blank => true
+        field :network_type, _("Protocol")
         field :priority, _("Priority")
-        field :dns, _("DNS"), Fields::Reference, :details => :url
+        field :network, _("Network Addr")
+        field :cidr, _("Network Prefix")
+        field :mask, _("Network Mask")
+        field :gateway, _("Gateway Addr")
         field :dns_primary, _("Primary DNS")
         field :dns_secondary, _("Secondary DNS")
-        field :tftp, _("TFTP"), Fields::Reference, :details => :url
-        field :dhcp, _("DHCP"), Fields::Reference, :details => :url
+        label _("Smart Proxies") do
+          field :dns, _("DNS"), Fields::Reference, :details => :url
+          field :tftp, _("TFTP"), Fields::Reference, :details => :url
+          field :dhcp, _("DHCP"), Fields::Reference, :details => :url
+        end
         field :ipam, _("IPAM")
-        field :gateway, _("Gateway")
-        field :from, _("From")
-        field :to, _("To")
+        field :from, _("Start of IP Range")
+        field :to, _("End of IP Range")
+        field :vlanid, _("VLAN ID")
+        field :mtu, _("MTU")
+        field :boot_mode, _("Boot Mode")
         HammerCLIForeman::References.domains(self)
         HammerCLIForeman::References.taxonomies(self)
         HammerCLIForeman::References.parameters(self)

data/lib/hammer_cli_foreman/template.rb

@@ -55,6 +55,10 @@ module HammerCLIForeman
         field :locked, _("Locked"), Fields::Boolean
         HammerCLIForeman::References.operating_systems(self)
         HammerCLIForeman::References.taxonomies(self)
+        collection :template_combinations, 'Template Combinations' do
+          field :hostgroup_name, _('Hostgroup name')
+          field :environment_name, _('Environment name')
+        end
       end
 
       def extend_data(tpl)
@@ -194,6 +198,10 @@ module HammerCLIForeman
       build_options
     end
 
+    lazy_subcommand('combination', _("Manage template combinations"),
+                    'HammerCLIForeman::Combination', 'hammer_cli_foreman/combination'
+    )
+
     HammerCLIForeman::AssociatingCommands::OperatingSystem.extend_command(self)
 
     autoload_subcommands

data/lib/hammer_cli_foreman/testing/api_expectations.rb

@@ -63,6 +63,9 @@ module HammerCLIForeman
           if @api_call_matcher && !@api_call_matcher.expected_params.empty?
             signature += "\n  expected params to include: " + params_signature(@api_call_matcher.expected_params)
           end
+          if @api_call_matcher && !@api_call_matcher.block.nil?
+            signature += "\n  expected params to match block at: " + block_signature(@api_call_matcher.block)
+          end
           signature
         end
 
@@ -70,6 +73,10 @@ module HammerCLIForeman
           JSON.pretty_generate(hash).split("\n").join("\n  ")
         end
 
+        def block_signature(block)
+          block.source_location.join(':')
+        end
+
         def set_note(note)
           @note = note
         end
@@ -128,6 +135,10 @@ module HammerCLIForeman
         def user(ask=nil)
           @user
         end
+
+        def password(ask=nil)
+          @password
+        end
       end
 
       class FakeApiConnection < HammerCLI::Apipie::ApiConnection

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new '0.13.2'
+    @version ||= Gem::Version.new '0.14.0'
   end
 end

data/test/functional/host_test.rb

@@ -169,7 +169,7 @@ describe "host create" do
   end
 end
 
-describe 'host reports' do
+describe 'host config reports' do
   let(:report15) do
     {
         "id" => 15,
@@ -180,42 +180,71 @@ describe 'host reports' do
   end
 
   it 'filters reports by --id' do
-    api_expects(:reports, :index, 'Filter the reports') do |params|
+    api_expects(:config_reports, :index, 'Filter the reports') do |params|
       params['search'] == 'host_id=1'
     end.returns(index_response([report15]))
 
-    result = run_cmd(['host', 'reports', '--id=1'])
+    result = run_cmd(['host', 'config-reports', '--id=1'])
     result.exit_code.must_equal HammerCLI::EX_OK
   end
 
   it 'filters reports by --name' do
-    api_expects(:reports, :index, 'Filter the reports') do |params|
+    api_expects(:config_reports, :index, 'Filter the reports') do |params|
       params['search'] == 'host="host.example.com"'
     end.returns(index_response([report15]))
 
-    result = run_cmd(['host', 'reports', '--name=host.example.com'])
+    result = run_cmd(['host', 'config-reports', '--name=host.example.com'])
     result.exit_code.must_equal HammerCLI::EX_OK
   end
 
   it 'prints error or missing --id and --name' do
-      expected_result = CommandExpectation.new
-      expected_result.expected_err =
-          ['Error: At least one of options --name, --id is required.', '',
-              "See: 'hammer host reports --help'.", ''].join("\n")
-      expected_result.expected_exit_code = HammerCLI::EX_USAGE
+    expected_result = CommandExpectation.new
+    expected_result.expected_err = [
+      'Error: At least one of options --name, --id is required.',
+      '',
+      "See: 'hammer host config-reports --help'.",
+      ''
+    ].join("\n")
+    expected_result.expected_exit_code = HammerCLI::EX_USAGE
 
-      api_expects_no_call
+    api_expects_no_call
 
-      result = run_cmd(['host', 'reports'])
-      assert_cmd(expected_result, result)
+    result = run_cmd(['host', 'config-reports'])
+    assert_cmd(expected_result, result)
   end
 
   it 'filters reports by --name together with search' do
-    api_expects(:reports, :index, 'Filter the reports') do |params|
+    api_expects(:config_reports, :index, 'Filter the reports') do |params|
       params['search'] == 'reported > "2 hour ago" and host="host.example.com"'
     end.returns(index_response([report15]))
 
-    result = run_cmd(['host', 'reports', '--name=host.example.com', %Q(--search=reported > "2 hour ago")])
+    result = run_cmd(['host', 'config-reports', '--name=host.example.com', '--search=reported > "2 hour ago"'])
     result.exit_code.must_equal HammerCLI::EX_OK
   end
 end
+describe 'disassociate host from vm' do
+  let(:cmd) { ["host", "disassociate"] }
+
+  it 'successful disassociate host' do
+    params = ['--id=1']
+    expected_result = success_result("The host has been disassociated from VM\n")
+    api_expects(:hosts, :disassociate, 'disassociate hosts') do |params|
+      params['id'] == "1"
+    end.returns({})
+
+    result = run_cmd(cmd + params)
+    assert_cmd(expected_result, result)
+  end
+
+  it 'prints error on missing host id' do
+    expected_result = CommandExpectation.new
+    expected_result.expected_err = [
+      "Failed to disassociated host from VM:",
+      "  Missing arguments for 'id'",
+      ''].join("\n")
+    expected_result.expected_exit_code = HammerCLI::EX_USAGE
+
+    result = run_cmd(cmd)
+    assert_cmd(expected_result, result)
+  end
+end

data/test/functional/settings_test.rb

@@ -0,0 +1,37 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+describe 'Settings' do
+  let(:setting) do
+  {
+    :name => 'content_action_accept_timeout',
+    :full_name => 'Accept action timeout',
+    :value => 20,
+    :description => 'Time in seconds to wait for a Host to pickup a remote action'
+  }
+  end
+
+  describe 'list command' do
+    before do
+      @cmd = %w(settings list)
+    end
+
+    it 'lists all settings' do
+      api_expects(:settings, :index, 'List').with_params(
+        'page' => 1, 'per_page' => 1000
+    ).returns(index_response([setting]))
+
+
+      output = IndexMatcher.new([
+        ['NAME', 'FULL NAME', 'VALUE', 'DESCRIPTION'],
+        ['content_action_accept_timeout', 'Accept action timeout', '20', 'Time in seconds to wait for a Host to pickup a remote action']
+      ])
+      expected_result = success_result(output)
+
+      result = run_cmd(@cmd)
+      assert_cmd(expected_result, result)
+    end
+
+  end
+
+end
+

data/test/functional/template_test.rb

@@ -123,4 +123,39 @@ describe 'template' do
       assert_cmd(expected_result, result)
     end
   end
+
+  describe 'combinations' do
+    before do
+      @cmd = %w(template combination)
+    end
+
+    it 'should create new combination' do
+      params = ['create','--provisioning-template-id=10', '--hostgroup-id=1', '--environment-id=1']
+      expected_result = success_result("Template combination created.\n")
+      api_expects(:template_combinations, :create, 'Create template combination') do |params|
+        params["provisioning_template_id"] == 10 &&
+          params["hostgroup_id"] == 1 &&
+            params["environment_id"] == 1 &&
+              params["template_combination"] == {"environment_id" => 1, "hostgroup_id" => 1}
+      end
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'should update combination' do
+      params = ['update','--id=3','--provisioning-template-id=10', '--hostgroup-id=1', '--environment-id=1']
+      expected_result = success_result("Template combination updated.\n")
+      api_expects(:template_combinations, :update, 'Update template combination') do |params|
+        params["provisioning_template_id"] == 10 &&
+          params["hostgroup_id"] == 1 &&
+          params["environment_id"] == 1 &&
+          params["template_combination"] == {"environment_id" => 1, "hostgroup_id" => 1}
+      end
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+  end
 end

data/test/functional/user_test.rb

@@ -7,12 +7,12 @@ describe "user" do
 
   def expect_with_minimal_params(action, message, &block)
     api_expects(:users, action, message).with_params({
-      'user' => {'login' => 'jane', 'mail' => 'jane@test.org', 'password' => 'secret', 'auth_source_id' => 1}})
+      'user' => {'login' => 'jane', 'mail' => 'jane@test.org', 'password' => 'secret', 'auth_source_id' => 1}}, &block)
   end
 
   def expect_with_update_params(action, message, &block)
     api_expects(:users, action, message).with_params({
-      'user' => {'login' => 'jane'}})
+      'user' => {'login' => 'jane'}}, &block)
   end
 
   describe "create" do
@@ -81,5 +81,85 @@ describe "user" do
       result = run_cmd(cmd + update_params + params)
       assert_cmd(expected_result, result)
     end
+
+    describe "update password" do
+      def replace_foreman_connection(connection)
+        HammerCLI.context[:api_connection].drop('foreman')
+        HammerCLI.context[:api_connection].create('foreman') { connection }
+      end
+
+      def connection(user, password)
+        authenticator = TestAuthenticator.new(user, password)
+        api_connection({:authenticator => authenticator}, FOREMAN_VERSION)
+      end
+
+      before do
+        @original_api_connection = HammerCLI.context[:api_connection].get('foreman')
+      end
+
+      after do
+        replace_foreman_connection(@original_api_connection)
+      end
+
+      it 'asks for missing current user password when updating own password' do
+        replace_foreman_connection(connection('jane', nil))
+
+        params = ['--password', 'changeme']
+
+        api_expects_search(:users, { :login => 'jane' }).returns(index_response([user]))
+        api_expects(:users, :show, { :id => 'jane' }).returns(user)
+        HammerCLIForeman::OptionSources::UserParams.any_instance
+          .expects(:ask_password).with(:current).returns('currentpwd')
+        expect_with_update_params(:update, 'Update user password') do |par|
+          par['id'] == '32' &&
+            par['user']['password'] == 'changeme' &&
+            par['user']['current_password'] == 'currentpwd'
+        end.returns(user)
+
+        expected_result = success_result("User [jane] updated.\n")
+        result = run_cmd(cmd + update_params + params)
+        assert_cmd(expected_result, result)
+      end
+
+      it 'does not ask for missing current password when updating own password and password was already given' do
+        replace_foreman_connection(connection('jane', 'currentpwd'))
+
+        params = ['--password', 'changeme']
+
+        api_expects_search(:users, { :login => 'jane' }).returns(index_response([user]))
+        api_expects(:users, :show, { :id => 'jane' }).returns(user)
+        HammerCLIForeman::OptionSources::UserParams.any_instance
+          .expects(:ask_password).with(:current).never
+        expect_with_update_params(:update, 'Update user password') do |par|
+          par['id'] == '32' &&
+            par['user']['password'] == 'changeme' &&
+            par['user']['current_password'] == 'currentpwd'
+        end.returns(user)
+
+        expected_result = success_result("User [jane] updated.\n")
+        result = run_cmd(cmd + update_params + params)
+        assert_cmd(expected_result, result)
+      end
+
+      it 'does not ask for current user password when updating password of another user' do
+        user_john = { 'id' => '1', 'login' => 'john' }
+        replace_foreman_connection(connection('john', nil))
+
+        params = ['--password', 'changeme']
+
+        api_expects_search(:users, { :login => 'jane' }).returns(index_response([user]))
+        api_expects(:users, :show, { :id => 'john' }).returns(user_john)
+        HammerCLIForeman::OptionSources::UserParams.any_instance
+          .expects(:ask_password).with(:current).never
+        expect_with_update_params(:update, 'Update user password') do |par|
+          par['id'] == '32' &&
+            par['user']['password'] == 'changeme'
+        end.returns(user)
+
+        expected_result = success_result("User [jane] updated.\n")
+        result = run_cmd(cmd + update_params + params)
+        assert_cmd(expected_result, result)
+      end
+    end
   end
 end

data/test/unit/api/interactive_basic_auth_test.rb

@@ -96,6 +96,16 @@ describe HammerCLIForeman::Api::InteractiveBasicAuth do
 
       assert_nil new_ex
     end
+
+    it 'respect server error' do
+      ex = RestClient::Unauthorized.new
+      response = mock()
+      response.stubs(:body).returns('{"error": {"message": "Unable to authenticate user admin"}}')
+      ex.response = response
+      new_ex = auth.error(ex)
+
+      assert_equal 'Unable to authenticate user admin', new_ex.message
+    end
   end
 
   describe '#set_credentials' do

data/test/unit/{report_test.rb → config_report_test.rb}

@@ -1,18 +1,18 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
-require 'hammer_cli_foreman/report'
+require 'hammer_cli_foreman/config_report'
 
-describe HammerCLIForeman::Report do
+describe HammerCLIForeman::ConfigReport do
 
   include CommandTestHelper
 
   context "ListCommand" do
     before do
-      ResourceMocks.mock_action_call(:reports, :index, [])
+      ResourceMocks.mock_action_call(:config_reports, :index, [])
     end
 
-    let(:cmd) { HammerCLIForeman::Report::ListCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::ConfigReport::ListCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "no arguments"
@@ -39,7 +39,7 @@ describe HammerCLIForeman::Report do
 
   context "InfoCommand" do
 
-    let(:cmd) { HammerCLIForeman::Report::InfoCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::ConfigReport::InfoCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
@@ -51,7 +51,7 @@ describe HammerCLIForeman::Report do
 
   context "DeleteCommand" do
 
-    let(:cmd) { HammerCLIForeman::Report::DeleteCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::ConfigReport::DeleteCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]

data/test/unit/host_test.rb

@@ -155,12 +155,12 @@ describe HammerCLIForeman::Host do
   end
 
 
-  context "ReportsCommand" do
+  context "ConfigReportsCommand" do
     before do
-      ResourceMocks.mock_action_call(:reports, :index, [])
+      ResourceMocks.mock_action_call(:config_reports, :index, [])
     end
 
-    let(:cmd) { HammerCLIForeman::Host::ReportsCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::Host::ConfigReportsCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
@@ -416,4 +416,13 @@ describe HammerCLIForeman::Host do
 
     end
   end
+
+
+  context "DisassociateCommand" do
+    let(:cmd) { HammerCLIForeman::Host::DisassociateCommand.new("", ctx) }
+    context "parameters" do
+      it_should_accept "name", ["--name=host"]
+      it_should_accept "id", ["--id=1"]
+    end
+  end
 end

data/test/unit/settings_test.rb

@@ -0,0 +1,45 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
+
+require 'hammer_cli_foreman/settings'
+
+describe HammerCLIForeman::Settings do
+
+  include CommandTestHelper
+
+  context "ListCommand" do
+
+    before do
+      ResourceMocks.mock_action_call(:settings, :index, [])
+    end
+
+    let(:cmd) { HammerCLIForeman::Settings::ListCommand.new("", ctx) }
+
+    context "parameters" do
+      it_should_accept "no arguments"
+      it_should_accept_search_params
+    end
+
+    context "output" do
+      let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
+
+      it_should_print_n_records
+      it_should_print_column "Name"
+      it_should_print_column "Full name"
+      it_should_print_column "Value"
+      it_should_print_column "Description"
+    end
+
+  end
+
+  context "UpdateCommand" do
+    let(:cmd) { HammerCLIForeman::Settings::UpdateCommand.new("", ctx) }
+
+    context "parameters" do
+      it_should_accept "name", ["--name=setting1", "--value=setting2"]
+      it_should_accept "id", ["--id=1", "--value=setting2"]
+    end
+
+  end
+end
+

data/test/unit/subnet_test.rb

@@ -23,7 +23,8 @@ describe HammerCLIForeman::Subnet do
       let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
 
       it_should_print_n_records
-      it_should_print_columns  ["Id", "Name", "Network", "Mask"]
+      it_should_print_columns  ["Id", "Name", "Network Addr", "Network Prefix", "Network Mask"]
+      it_should_print_columns  ["VLAN ID", "Boot Mode"]
     end
 
   end
@@ -43,12 +44,14 @@ describe HammerCLIForeman::Subnet do
 
       with_params ["--name=subnet"] do
         it_should_print_n_records 1
-        it_should_print_columns ["Id", "Name", "Network", "Mask"]
+        it_should_print_columns ["Id", "Name", "Network Addr", "Network Prefix", "Network Mask"]
         it_should_print_columns ["Description"]
         it_should_print_columns ["Priority"]
-        it_should_print_columns ["DNS", "Primary DNS", "Secondary DNS"]
-        it_should_print_columns ["Domains", "TFTP", "DHCP"]
-        it_should_print_columns ["VLAN ID", "Gateway", "From", "To"]
+        it_should_print_columns ["Protocol"]
+        it_should_print_columns ["Primary DNS", "Secondary DNS", "Smart Proxies", "IPAM"]
+        it_should_print_columns ["Domains"]
+        it_should_print_columns ["VLAN ID", "MTU", "Boot Mode", "Gateway Addr", "Start of IP Range", "End of IP Range"]
+        it_should_print_columns ["Locations", "Organizations", "Parameters"]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: apipie-bindings
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,7 @@ files:
 - lib/hammer_cli_foreman/auth.rb
 - lib/hammer_cli_foreman/auth_source.rb
 - lib/hammer_cli_foreman/auth_source_ldap.rb
+- lib/hammer_cli_foreman/combination.rb
 - lib/hammer_cli_foreman/commands.rb
 - lib/hammer_cli_foreman/common_parameter.rb
 - lib/hammer_cli_foreman/compute_resource.rb
@@ -118,6 +119,7 @@ files:
 - lib/hammer_cli_foreman/compute_resources/vmware.rb
 - lib/hammer_cli_foreman/compute_resources/vmware/host_help_extenstion.rb
 - lib/hammer_cli_foreman/config_group.rb
+- lib/hammer_cli_foreman/config_report.rb
 - lib/hammer_cli_foreman/defaults.rb
 - lib/hammer_cli_foreman/dependency_resolver.rb
 - lib/hammer_cli_foreman/domain.rb
@@ -157,7 +159,6 @@ files:
 - lib/hammer_cli_foreman/puppet_class.rb
 - lib/hammer_cli_foreman/realm.rb
 - lib/hammer_cli_foreman/references.rb
-- lib/hammer_cli_foreman/report.rb
 - lib/hammer_cli_foreman/resource_supported_test.rb
 - lib/hammer_cli_foreman/role.rb
 - lib/hammer_cli_foreman/settings.rb
@@ -206,6 +207,7 @@ files:
 - test/functional/personal_access_token_test.rb
 - test/functional/proxy_test.rb
 - test/functional/role_test.rb
+- test/functional/settings_test.rb
 - test/functional/smart_class_parameter_test.rb
 - test/functional/smart_variable_test.rb
 - test/functional/ssh_keys_test.rb
@@ -466,6 +468,7 @@ files:
 - test/unit/common_parameter_test.rb
 - test/unit/compute_resource_test.rb
 - test/unit/config_group_test.rb
+- test/unit/config_report_test.rb
 - test/unit/data/test_api.json
 - test/unit/defaults_test.rb
 - test/unit/dependency_resolver_test.rb
@@ -495,8 +498,8 @@ files:
 - test/unit/partition_table_test.rb
 - test/unit/puppet_class_test.rb
 - test/unit/realm_test.rb
-- test/unit/report_test.rb
 - test/unit/role_test.rb
+- test/unit/settings_test.rb
 - test/unit/smart_class_parameter_test.rb
 - test/unit/smart_proxy_test.rb
 - test/unit/smart_variable_test.rb
@@ -776,6 +779,7 @@ test_files:
 - test/unit/location_test.rb
 - test/unit/environment_test.rb
 - test/unit/common_parameter_test.rb
+- test/unit/settings_test.rb
 - test/unit/image_test.rb
 - test/unit/api/void_auth_test.rb
 - test/unit/api/interactive_basic_auth_test.rb
@@ -798,7 +802,7 @@ test_files:
 - test/unit/compute_resource_test.rb
 - test/unit/data/test_api.json
 - test/unit/apipie_resource_mock.rb
-- test/unit/report_test.rb
+- test/unit/config_report_test.rb
 - test/unit/user_test.rb
 - test/unit/filter_test.rb
 - test/unit/output/formatters_test.rb
@@ -826,6 +830,7 @@ test_files:
 - test/unit/media_test.rb
 - test/functional/location_test.rb
 - test/functional/ssh_keys_test.rb
+- test/functional/settings_test.rb
 - test/functional/smart_variable_test.rb
 - test/functional/smart_class_parameter_test.rb
 - test/functional/commands/list_test.rb