hammer_cli_foreman 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12d3353f9d530459e2a7f58e8f5603b1f52af4b2ee28aa51c6252bda84f5a5b3
-  data.tar.gz: cb323fd78217f8d5b5b1e7b69dd691ea85b3d332dcbbc2e375a668fc7043c298
+  metadata.gz: 87407ba2c43be96a076220e9500050007447596f6d14024932fa85a7c9046f20
+  data.tar.gz: 2987c54ab5fef04cc45629754a55c62d16a252b6cd950e7de461a989712a79ca
 SHA512:
-  metadata.gz: 04b1444a37f464ab35afdfd3832cf0549448484e9932972603ca5d29d7660a4bd599ab0cae461730a7fca5735712451553983724cbe5a23d8f6ffb0135e5510e
-  data.tar.gz: b625099ac29545814e7c73a1d74f0b20559b117bfabac2e2074c448557386c40e81a280ae2fb31271e3e5bd60b1c29c4a60881acfe4d5cbcad3f91cda05ca21c
+  metadata.gz: 030d7c3ff4d19fb767e771c123b8cb0de2a6166cec3ec2012b689f7d920d3049a234f7900ee43141c2af97ce0d5aaf403ea9a9f3962072bdffc181126de57e70
+  data.tar.gz: 6acaf9a9b06c59b4c7db28b73bdc7dfe31170ac3b621adb2b85a5a501090e310a4fcfc703e2b6dc48170a693ff675507b8b9c478a8c344ff7793bfe778a8f3f3

data/doc/release_notes.md

@@ -1,5 +1,13 @@
 Release notes
 =============
+### 3.2.0 (2022-02-10)
+* Domain update doesn't reset dns implicitly ([PR #591](https://github.com/theforeman/hammer-cli-foreman/pull/591)), [#34177](http://projects.theforeman.org/issues/34177)
+* Send filter's tax params only when required ([PR #592](https://github.com/theforeman/hammer-cli-foreman/pull/592)), [#34199](http://projects.theforeman.org/issues/34199)
+* Add boot_order to compute-attribute ([PR #588](https://github.com/theforeman/hammer-cli-foreman/pull/588)), [#33910](http://projects.theforeman.org/issues/33910)
+* Add mail_enabled to user list/info command ([PR #589](https://github.com/theforeman/hammer-cli-foreman/pull/589)), [#34180](http://projects.theforeman.org/issues/34180)
+* Add token to host info command ([PR #586](https://github.com/theforeman/hammer-cli-foreman/pull/586)), [#34120](http://projects.theforeman.org/issues/34120)
+* Bump to 3.2.0-develop
+
 ### 3.1.0 (2021-11-10)
 * Update test data for 3.1
 * Make sure provided options override defaults, [#33711](http://projects.theforeman.org/issues/33711)

data/lib/hammer_cli_foreman/command_extensions/domain.rb

@@ -0,0 +1,20 @@
+module HammerCLIForeman
+  module CommandExtensions
+    class Domain < HammerCLI::CommandExtensions
+      option_sources do |sources, command|
+        sources.find_by_name('IdResolution').insert_relative(
+          :after,
+          'IdParams',
+          HammerCLIForeman::OptionSources::ReferencedResourceIdParams.new(command)
+        )
+        sources
+      end
+
+      option_family associate: 'dns' do
+        child '--dns', 'DNS_NAME', _('Name of DNS proxy to use within this domain'),
+              attribute_name: :option_dns_name,
+              referenced_resource: :smart_proxy
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/command_extensions.rb

@@ -6,3 +6,4 @@ require 'hammer_cli_foreman/command_extensions/ping'
 require 'hammer_cli_foreman/command_extensions/status'
 require 'hammer_cli_foreman/command_extensions/user'
 require 'hammer_cli_foreman/command_extensions/subnet'
+require 'hammer_cli_foreman/command_extensions/domain'

data/lib/hammer_cli_foreman/compute_resource/libvirt.rb

@@ -9,7 +9,8 @@ module HammerCLIForeman
         [
           ['cpus',   _('Number of CPUs'), { bold: true }],
           ['memory', _('String, amount of memory, value in bytes'), { bold: true }],
-          ['cpu_mode', _('Possible values: %{modes}') % { modes: 'default, host-model, host-passthrough' }]
+          ['cpu_mode', _('Possible values: %{modes}') % { modes: 'default, host-model, host-passthrough' }],
+          ['boot_order', _('Device names to specify the boot order')]
         ]
       end
 
@@ -48,7 +49,8 @@ module HammerCLIForeman
             Fields::Field.new(:label => _('Status'), :path => [:state]),
             Fields::Field.new(:label => _('OS Type'), :path => [:os_type]),
             Fields::Field.new(:label => _('Domain Type'), :path => [:domain_type]),
-            Fields::Field.new(:label => _('Persistent'), :path => [:persistent])
+            Fields::Field.new(:label => _('Persistent'), :path => [:persistent]),
+            Fields::List.new(:label => _('Boot order'), :path => [:boot_order])
         ]
       end
 

data/lib/hammer_cli_foreman/compute_resource/vmware.rb

@@ -25,7 +25,8 @@ module HammerCLIForeman
           ['scsi_controllers',     [_('List with SCSI controllers definitions'),
                                     '  type - ' + _('ID of the controller from VMware'),
                                     '  key  - ' + _('Key of the controller (e.g. 1000)')
-                                    ].flatten(1).join("\n")]
+                                    ].flatten(1).join("\n")],
+          ['boot_order',            _('Device names to specify the boot order')]
         ]
       end
 
@@ -76,7 +77,8 @@ module HammerCLIForeman
             Fields::Field.new(:label => _('Connection Status'), :path => [:connection_status]),
             Fields::Field.new(:label => _('Hardware Version'), :path => [:hardware_version]),
             Fields::Field.new(:label => _('Path'), :path => [:path]),
-            Fields::Field.new(:label => _('Operating System'), :path => [:operatingsystem])
+            Fields::Field.new(:label => _('Operating System'), :path => [:operatingsystem]),
+            Fields::List.new(:label => _('Boot order'), :path => [:boot_order])
         ]
       end
 

data/lib/hammer_cli_foreman/domain.rb

@@ -1,28 +1,5 @@
 module HammerCLIForeman
-
-  module DomainUpdateCreateCommons
-
-    def self.included(base)
-      base.option "--dns-id", "DNS_ID",  _("ID of DNS proxy to use within this domain")
-      base.option "--dns", "DNS_NAME", _("Name of DNS proxy to use within this domain")
-    end
-
-    def request_params
-      params = super
-      params['domain']["dns_id"] = option_dns_id || dns_id(option_dns)
-      params
-    end
-
-    private
-
-    def dns_id(name)
-      resolver.smart_proxy_id('option_name' => name) if name
-    end
-
-  end
-
   class Domain < HammerCLIForeman::Command
-
     resource :domains
 
     class ListCommand < HammerCLIForeman::ListCommand
@@ -52,24 +29,24 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      include DomainUpdateCreateCommons
-
       success_message _("Domain [%{name}] created.")
       failure_message _("Could not create the domain")
 
       option "--description", "DESC", _("Full name describing the domain"), :attribute_name => :option_fullname
-      build_options :without => [:domain_parameters_attributes, :fullname, :dns_id]
+      build_options :without => [:domain_parameters_attributes, :fullname]
+
+      extend_with(HammerCLIForeman::CommandExtensions::Domain.new)
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      include DomainUpdateCreateCommons
-
       success_message _("Domain [%{name}] updated.")
       failure_message _("Could not update the domain")
 
       option "--description", "DESC", _("Full name describing the domain"), :attribute_name => :option_fullname
       build_options :without => [:domain_parameters_attributes, :fullname]
+
+      extend_with(HammerCLIForeman::CommandExtensions::Domain.new)
     end
 
 

data/lib/hammer_cli_foreman/filter.rb

@@ -97,10 +97,10 @@ module HammerCLIForeman
 
       def request_params
         params = super
-        if !override?
+        unless override?
           # Clear taxonomies in case the filter is switching override from true to false
-          params['filter']['location_ids'] = []
-          params['filter']['organization_ids'] = []
+          params['filter']['location_ids'] = [] if !@filter || !@filter['locations'].empty?
+          params['filter']['organization_ids'] = [] if !@filter || !@filter['organizations'].empty?
         end
         params
       end

data/lib/hammer_cli_foreman/host.rb

@@ -55,6 +55,7 @@ module HammerCLIForeman
         field nil, _("Compute Resource"), Fields::SingleReference, :key => :compute_resource
         field nil, _("Compute Profile"), Fields::SingleReference, :key => :compute_profile, :hide_blank => true
         field :certname, _("Cert name")
+        field :token, _("Token")
         field :managed, _("Managed"), Fields::Boolean
 
         field :installed_at, _("Installed at"), Fields::Date

data/lib/hammer_cli_foreman/user.rb

@@ -29,6 +29,7 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
 
       output ListCommand.output_definition do
+        field :mail_enabled, _("Email enabled"), Fields::Boolean
         field :effective_admin, _("Effective admin"), Fields::Boolean
         field :locale, _("Locale")
         field :timezone, _("Timezone")

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new "3.1.0"
+    @version ||= Gem::Version.new "3.2.0"
   end
 end

data/test/functional/domain/create_test.rb

@@ -0,0 +1,91 @@
+require_relative '../test_helper'
+
+describe 'Domain' do
+  describe 'CreateCommand' do
+    let(:cmd) { %w[domain create] }
+    let(:minimal_params) { %w[--name=dom1.com] }
+
+    def domain_params(additional_params = {})
+      params = {
+        domain: {
+          name: 'dom1.com'
+        }
+      }
+      params[:domain].merge!(additional_params)
+      params
+    end
+
+    it 'should print error on missing --name' do
+      expected_result = missing_args_error_result(cmd, '--name')
+
+      api_expects_no_call
+
+      result = run_cmd(cmd)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'allows minimal options' do
+      api_expects(:domains, :create).with_params(domain_params)
+
+      run_cmd(cmd + minimal_params)
+    end
+
+    it 'allows description' do
+      params = %w[--description=shortdesc]
+      api_expects(:domains, :create).with_params(domain_params(fullname: 'shortdesc'))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows dns id' do
+      params = %w[--dns-id=1]
+      api_expects(:domains, :create).with_params(domain_params(dns_id: 1))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows dns name' do
+      params = %w[--dns=sp1]
+      api_expects_search(:smart_proxies, { name: 'sp1' }).returns(
+        index_response([{ 'id' => 1 }])
+      )
+      api_expects(:domains, :create).with_params(domain_params(dns_id: 1))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows location ids' do
+      params = %w[--location-ids=1,4]
+      api_expects(:domains, :create).with_params(domain_params(location_ids: %w[1 4]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows location names' do
+      params = %w[--locations=loc1,loc2]
+      api_expects(:locations, :index) do |p|
+        p[:search] == 'name = "loc1" or name = "loc2"'
+      end.returns(index_response([{ 'id' => 1 }, { 'id' => 2 }]))
+      api_expects(:domains, :create).with_params(domain_params(location_ids: [1, 2]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows organization ids' do
+      params = %w[--organization-ids=1,4]
+      api_expects(:domains, :create).with_params(domain_params(organization_ids: %w[1 4]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows organization names' do
+      params = %w[--organizations=org1,org2]
+      api_expects(:organizations, :index) do |p|
+        p[:search] == 'name = "org1" or name = "org2"'
+      end.returns(index_response([{ 'id' => 1 }, { 'id' => 2 }]))
+      api_expects(:domains, :create).with_params(domain_params(organization_ids: [1, 2]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+  end
+end

data/test/functional/domain/update_test.rb

@@ -0,0 +1,90 @@
+require_relative '../test_helper'
+
+describe 'Domain' do
+  describe 'UpdateCommand' do
+    let(:cmd) { %w[domain update] }
+    let(:minimal_params) { %w[--id=1] }
+
+    def domain_params(additional_params = {})
+      params = {
+        id: '1',
+        domain: {}
+      }
+      params[:domain].merge!(additional_params)
+      params
+    end
+
+    it 'should print error on missing --id' do
+      expected_result = missing_args_error_result(cmd, '--id')
+
+      api_expects_no_call
+
+      result = run_cmd(cmd)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'allows minimal options' do
+      api_expects(:domains, :update).with_params(domain_params)
+
+      run_cmd(cmd + minimal_params)
+    end
+
+    it 'allows description' do
+      params = %w[--description=shortdesc]
+      api_expects(:domains, :update).with_params(domain_params(fullname: 'shortdesc'))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows dns id' do
+      params = %w[--dns-id=1]
+      api_expects(:domains, :update).with_params(domain_params(dns_id: 1))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows dns name' do
+      params = %w[--dns=sp1]
+      api_expects_search(:smart_proxies, { name: 'sp1' }).returns(
+        index_response([{ 'id' => 1 }])
+      )
+      api_expects(:domains, :update).with_params(domain_params(dns_id: 1))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows location ids' do
+      params = %w[--location-ids=1,4]
+      api_expects(:domains, :update).with_params(domain_params(location_ids: %w[1 4]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows location names' do
+      params = %w[--locations=loc1,loc2]
+      api_expects(:locations, :index) do |p|
+        p[:search] == 'name = "loc1" or name = "loc2"'
+      end.returns(index_response([{ 'id' => 1 }, { 'id' => 2 }]))
+      api_expects(:domains, :update).with_params(domain_params(location_ids: [1, 2]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows organization ids' do
+      params = %w[--organization-ids=1,4]
+      api_expects(:domains, :update).with_params(domain_params(organization_ids: %w[1 4]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows organization names' do
+      params = %w[--organizations=org1,org2]
+      api_expects(:organizations, :index) do |p|
+        p[:search] == 'name = "org1" or name = "org2"'
+      end.returns(index_response([{ 'id' => 1 }, { 'id' => 2 }]))
+      api_expects(:domains, :update).with_params(domain_params(organization_ids: [1, 2]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -123,6 +123,7 @@ files:
 - lib/hammer_cli_foreman/bookmark.rb
 - lib/hammer_cli_foreman/combination.rb
 - lib/hammer_cli_foreman/command_extensions.rb
+- lib/hammer_cli_foreman/command_extensions/domain.rb
 - lib/hammer_cli_foreman/command_extensions/fields.rb
 - lib/hammer_cli_foreman/command_extensions/hosts.rb
 - lib/hammer_cli_foreman/command_extensions/hosts/help.rb
@@ -253,6 +254,8 @@ files:
 - test/functional/compute_attribute_test.rb
 - test/functional/compute_profile_test.rb
 - test/functional/compute_resource_test.rb
+- test/functional/domain/create_test.rb
+- test/functional/domain/update_test.rb
 - test/functional/filter_test.rb
 - test/functional/host_test.rb
 - test/functional/hostgroup/create_test.rb
@@ -382,14 +385,13 @@ test_files:
 - test/data/3.1/foreman_api.json
 - test/functional/auth_source_test.rb
 - test/functional/commands/list_test.rb
+- test/functional/usergroup_test.rb
 - test/functional/hostgroup/create_test.rb
 - test/functional/hostgroup/update_test.rb
-- test/functional/compute_profile_test.rb
-- test/functional/model_test.rb
-- test/functional/operating_system_test.rb
 - test/functional/personal_access_token_test.rb
-- test/functional/user_mail_notification_test.rb
 - test/functional/template_test.rb
+- test/functional/compute_attribute_test.rb
+- test/functional/model_test.rb
 - test/functional/ssh_keys_test.rb
 - test/functional/subnet/update_test.rb
 - test/functional/subnet/create_test.rb
@@ -398,32 +400,35 @@ test_files:
 - test/functional/http_proxy_test.rb
 - test/functional/media_test.rb
 - test/functional/registration_test.rb
-- test/functional/usergroup_test.rb
-- test/functional/architecture_test.rb
-- test/functional/bookmark_test.rb
+- test/functional/user_mail_notification_test.rb
+- test/functional/domain/create_test.rb
+- test/functional/domain/update_test.rb
+- test/functional/operating_system_test.rb
 - test/functional/compute_resource_test.rb
 - test/functional/organization_test.rb
 - test/functional/report_template_test.rb
 - test/functional/user_test.rb
 - test/functional/virtual_machine_test.rb
+- test/functional/host_test.rb
 - test/functional/mail_notification_test.rb
-- test/functional/settings_test.rb
-- test/functional/compute_attribute_test.rb
+- test/functional/bookmark_test.rb
+- test/functional/location_test.rb
 - test/functional/associating_commands_test.rb
 - test/functional/audit_test.rb
 - test/functional/ping_test.rb
 - test/functional/realm_test.rb
 - test/functional/role_test.rb
 - test/functional/status_test.rb
-- test/functional/host_test.rb
-- test/functional/location_test.rb
+- test/functional/architecture_test.rb
+- test/functional/compute_profile_test.rb
+- test/functional/settings_test.rb
 - test/unit/api/void_auth_test.rb
 - test/unit/api/interactive_basic_auth_test.rb
 - test/unit/api/oauth/oauth_authentication_code_grant_test.rb
 - test/unit/api/oauth/oauth_password_grant_test.rb
 - test/unit/api/session_authenticator_wrapper_test.rb
 - test/unit/test_output_adapter.rb
-- test/unit/smart_proxy_test.rb
+- test/unit/settings_test.rb
 - test/unit/auth_source_ldap_test.rb
 - test/unit/config_report_test.rb
 - test/unit/compute_resource_test.rb
@@ -443,18 +448,20 @@ test_files:
 - test/unit/output/formatters_test.rb
 - test/unit/common_parameter_test.rb
 - test/unit/realm_test.rb
-- test/unit/mail_notification_test.rb
-- test/unit/option_builders_test.rb
+- test/unit/compute_profile_test.rb
+- test/unit/host_test.rb
 - test/unit/subnet_test.rb
 - test/unit/test_helper.rb
 - test/unit/user_test.rb
 - test/unit/param_filters_test.rb
 - test/unit/partition_table_test.rb
 - test/unit/role_test.rb
+- test/unit/hostgroup_test.rb
+- test/unit/id_resolver_test.rb
+- test/unit/mail_notification_test.rb
+- test/unit/model_test.rb
 - test/unit/operating_system_test.rb
-- test/unit/apipie_resource_mock.rb
-- test/unit/architecture_test.rb
-- test/unit/settings_test.rb
+- test/unit/option_builders_test.rb
 - test/unit/audit_test.rb
 - test/unit/auth_source_external.rb
 - test/unit/dependency_resolver_test.rb
@@ -462,15 +469,13 @@ test_files:
 - test/unit/filter_test.rb
 - test/unit/media_test.rb
 - test/unit/sessions_test.rb
-- test/unit/bookmark_test.rb
+- test/unit/apipie_resource_mock.rb
 - test/unit/commands_test.rb
 - test/unit/api_test.rb
-- test/unit/compute_profile_test.rb
-- test/unit/host_test.rb
-- test/unit/hostgroup_test.rb
-- test/unit/id_resolver_test.rb
-- test/unit/model_test.rb
-- test/unit/template_test.rb
+- test/unit/architecture_test.rb
+- test/unit/smart_proxy_test.rb
 - test/unit/usergroup_test.rb
+- test/unit/template_test.rb
+- test/unit/bookmark_test.rb
 - test/unit/domain_test.rb
 - test/test_helper.rb