hammer_cli_foreman 3.0.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8287acd52ceb1bea84f8d518c3793d521d084ae771622ea7fc4dcccccd794a1b
-  data.tar.gz: b557d8fbbc7a451cd09084211c6e8a46a46ef3c198744cbb9c8dc7e861090e93
+  metadata.gz: 70a45953e142e7d3a67ee81e99bb5cc6fccaf179d2a61e44922f3b809196a178
+  data.tar.gz: 6c958ff14e311eef47ac379a41ceb45cbabe7f7ed34b3d28c64c40fe963f2ca5
 SHA512:
-  metadata.gz: 283fd640422b5749f6dc9094907bb1c68e72cef15696704f4493f548dd23ca13bd1066fca15616996d4ff6ba48648d904f5633e3cc3305c30464fa9e22c8bf44
-  data.tar.gz: 94b81f8171c914bdd1435ad00a17c1b1606402bac1ab9b21ca3014056ed285029bc79fe2b0646630d964d3b4715bd94b42a67a35f5399cace731ec44c87e4ee8
+  metadata.gz: 6d436e24f99cc80f70aff4ad2c0436a92d63e8b60b5f1aa1ebb787e0fe202404c686fe78397ae16ae9bb3f2261834f8a02db39417a2511fd562c316344933d7a
+  data.tar.gz: 828772047e91923c3b6ac365fa942d381483988ed4c7303a1021d560e73d4f591d1656613ef45916cdc565fa3b7989a6b0f577c655c5624f5a5f8e9bdc82f24b

data/config/foreman.yml

@@ -29,6 +29,10 @@
   #:oidc_client_id: example-client-id
   #:oidc_redirect_uri: urn:ietf:wg:oauth:2.0:oob
 
+  # Negotiate (Kerberos) Auth:
+  # User needs to run kinit before using hammer (or initiate kerberos keyring in another way).
+  #:default_auth_type: 'Negotiate_Auth'
+
   # Enable using sessions
   # When sessions are enabled, hammer ignores credentials stored in the config file
   # and asks for them interactively at the begining of each session.

data/doc/configuration.md

@@ -49,3 +49,33 @@ Please note that when you turn sessions on, the credentials stored in your confi
 
 The default session timeout is 1 hour. This can be changed in the Foreman: `Settings > Authentication > Idle timeout`
 When the session expires hammer will prompt for username and password again.
+
+### Negotiate (Kerberos) auth
+
+This implements Kerberos authentication, usually implemented in FreeIPA or Microsoft Active Directory.
+For this to work, the host that we are trying to use hammer on, needs to have realm already configured on this host.
+This can be achieved through `realm join`, please refer to that command for more info.
+
+**Sessions needs to be enabled**
+
+`~/.hammer/cli.modules.d/foreman.yml`
+```yaml
+:foreman:
+  :default_auth_type: 'Negotiate_Auth'
+  :use_sessions: true
+```
+
+```bash
+# To initiate the kerberos keyring (this might be already done on login)
+$ kinit <kerb_user>
+# Enter your password
+$ klist
+Ticket cache: KEYRING:persistent:1000:1000
+Default principal: kerb_user@REALM.EXAMPLE.COM
+
+# use hammer as usuall, it will negotiate your auth on the first request
+hammer ...
+
+# or if you do not have negotiate as default auth, initiate the auth manually
+hammer auth login negotiate
+```

data/doc/release_notes.md

@@ -1,5 +1,36 @@
 Release notes
 =============
+### 3.3.0 (2022-05-10)
+* Add kerberos negotiate auth support ([PR #555](https://github.com/theforeman/hammer-cli-foreman/pull/555)), [#8923](http://projects.theforeman.org/issues/8923)
+* Pin mocha gem to < 1.14.0
+* Force api docs checksum check, [#28283](http://projects.theforeman.org/issues/28283)
+* Add template report-remplate and partition-table export command ([PR #595](https://github.com/theforeman/hammer-cli-foreman/pull/595)), [#34503](http://projects.theforeman.org/issues/34503)
+* Add template import and partition-table import commands ([PR #596](https://github.com/theforeman/hammer-cli-foreman/pull/596)), [#22692](http://projects.theforeman.org/issues/22692)
+* Add resource information to download command ([PR #598](https://github.com/theforeman/hammer-cli-foreman/pull/598)), [#34621](http://projects.theforeman.org/issues/34621)
+* Add command to import ipv4 subnet from smart proxy ([PR #593](https://github.com/theforeman/hammer-cli-foreman/pull/593)), [#33255](http://projects.theforeman.org/issues/33255)
+* Bump to 3.3.0-develop
+
+### 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)
+* Make template create/update commands use resolver, [#33721](http://projects.theforeman.org/issues/33721)
+* Revert fix rake version
+* Fix rake version
+* Show status once for proxy info ([PR #581](https://github.com/theforeman/hammer-cli-foreman/pull/581)), [#19510](http://projects.theforeman.org/issues/19510)
+* Add proxy status and version to info command ([PR #572](https://github.com/theforeman/hammer-cli-foreman/pull/572))
+* Associate a vm via hammer to a compute resource, [#33047](http://projects.theforeman.org/issues/33047)
+* Fix option builders and tests, [#33226](http://projects.theforeman.org/issues/33226)
+* Bump to 3.1.0-develop
+* Add parent title option for hostgroup, [#32878](http://projects.theforeman.org/issues/32878)
+
 ### 3.0.0 (2021-08-04)
 * Puppet extraction ([PR #571](https://github.com/theforeman/hammer-cli-foreman/pull/571)), [#33174](http://projects.theforeman.org/issues/33174)
 * Update rel-eng notebook ([PR #573](https://github.com/theforeman/hammer-cli-foreman/pull/573))

data/lib/hammer_cli_foreman/api/authenticator.rb

@@ -13,6 +13,8 @@ module HammerCLIForeman
           void_auth
         elsif auth_type == AUTH_TYPES[:basic_auth]
           basic_auth
+        elsif auth_type == AUTH_TYPES[:negotiate]
+          negotiate_auth
         elsif auth_type == AUTH_TYPES[:oauth_password_grant]
           oauth_password_grant
         elsif auth_type == AUTH_TYPES[:oauth_authentication_code_grant]
@@ -43,6 +45,13 @@ module HammerCLIForeman
         end
       end
 
+      def negotiate_auth
+        return unless HammerCLIForeman::Sessions.enabled?
+
+        authenticator = NegotiateAuth.new(uri)
+        SessionAuthenticatorWrapper.new(authenticator, uri, auth_type)
+      end
+
       def oauth_password_grant
         return unless HammerCLIForeman::Sessions.enabled?
 

data/lib/hammer_cli_foreman/api/connection.rb

@@ -1,6 +1,7 @@
 require 'hammer_cli_foreman/api/session_authenticator_wrapper'
 require 'hammer_cli_foreman/api/authenticator'
 require 'hammer_cli_foreman/api/interactive_basic_auth'
+require 'hammer_cli_foreman/api/negotiate_auth'
 require 'hammer_cli_foreman/api/oauth/authentication_code_grant'
 require 'hammer_cli_foreman/api/oauth/password_grant'
 require 'hammer_cli_foreman/api/void_auth'
@@ -10,6 +11,7 @@ module HammerCLIForeman
   CONNECTION_NAME = 'foreman'
   AUTH_TYPES = {
     basic_auth: 'Basic_Auth',
+    negotiate: 'Negotiate_Auth',
     oauth_authentication_code_grant: 'Oauth_Authentication_Code_Grant',
     oauth_password_grant: 'Oauth_Password_Grant'
   }.freeze

data/lib/hammer_cli_foreman/api/negotiate_auth.rb

@@ -0,0 +1,36 @@
+module HammerCLIForeman
+  module Api
+    class NegotiateAuth < ApipieBindings::Authenticators::Negotiate
+      def initialize(foreman_url, **options)
+        super("#{foreman_url}/users/extlogin", HammerCLI::SSLOptions.new.get_options(foreman_url).merge(options))
+      end
+
+      def user
+        _('current Kerberos user')
+      end
+
+      def session_id
+        auth_cookie&.delete_prefix('_session_id=')
+      end
+
+      def status
+        if system('klist')
+          _('No session, but there is an active Kerberos session, that will be used for negotiate login.')
+        else
+          _('There is no active Kerberos session. Have you run %s?') % 'kinit'
+        end
+      end
+
+      def error(ex)
+        super unless ex.is_a?(RestClient::Unauthorized)
+
+        message = _('Invalid username or password.')
+        begin
+          message = JSON.parse(ex.response.body)['error']['message']
+        rescue
+        end
+        UnauthorizedError.new(message)
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/api/session_authenticator_wrapper.rb

@@ -24,6 +24,8 @@ module HammerCLIForeman
       def status
         if session.valid?
           _("Session exists, currently logged in as '%s'.") % session.user_name
+        elsif @authenticator.respond_to?(:status)
+          @authenticator.status
         else
           _('Using sessions, you are currently not logged in.')
         end
@@ -66,8 +68,10 @@ module HammerCLIForeman
       end
 
       def response(r)
-        if (r.cookies['_session_id'] && r.code != 401)
-          session.id = r.cookies['_session_id']
+        session_id = @authenticator.session_id if @authenticator.respond_to?(:session_id)
+        session_id ||= r.cookies['_session_id']
+        if session_id && r.code != 401
+          session.id = session_id
           session.user_name = @authenticator.user
           session.store
         end

data/lib/hammer_cli_foreman/api.rb

@@ -7,4 +7,5 @@ module HammerCLIForeman
   end
 end
 
-HammerCLIForeman.init_api_connection
+api = HammerCLIForeman.init_api_connection.api
+api.update_cache(api.check_cache)

data/lib/hammer_cli_foreman/auth.rb

@@ -28,6 +28,19 @@ module HammerCLIForeman
         end
       end
 
+      class Negotiate < HammerCLI::AbstractCommand
+        extend HammerCLIForeman::Authenticate::Login
+
+        command_name('negotiate')
+        desc('negotiate the login credentials from the auth ticket (Kerberos)')
+
+        def execute
+          Negotiate.execute_with_params(AUTH_TYPES[:negotiate])
+          print_message(_("Successfully authenticated using negotiate auth, using the KEYRING principal."))
+          HammerCLI::EX_OK
+        end
+      end
+
       class Oauth < HammerCLI::AbstractCommand
         extend HammerCLIForeman::Authenticate::Login
 

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/subnet.rb

@@ -1,16 +1,7 @@
 module HammerCLIForeman
   module CommandExtensions
     class Subnet < HammerCLI::CommandExtensions
-      option "--dns", "DNS_NAME", _("DNS Proxy to use within this subnet"),
-             attribute_name: :option_dns_name,
-             referenced_resource: :smart_proxy
-      option "--dhcp", "DHCP_NAME", _("DHCP Proxy to use within this subnet"),
-             attribute_name: :option_dhcp_name,
-             referenced_resource: :smart_proxy
-      option "--tftp", "TFTP_NAME", _("TFTP Proxy to use within this subnet"),
-             attribute_name: :option_tftp_name,
-             referenced_resource: :smart_proxy
-      option "--prefix", "PREFIX", _("Network prefix in CIDR notation (e.g. 64) for this subnet")
+      option '--prefix', 'PREFIX', _('Network prefix in CIDR notation (e.g. 64) for this subnet')
 
       option_sources do |sources, command|
         sources.find_by_name('IdResolution').insert_relative(
@@ -20,6 +11,30 @@ module HammerCLIForeman
         )
         sources
       end
+
+      option_family associate: 'tftp' do
+        child '--tftp', 'TFTP_NAME', _('TFTP Proxy to use within this subnet'),
+              attribute_name: :option_tftp_name,
+              referenced_resource: :smart_proxy
+      end
+
+      option_family associate: 'dns' do
+        child '--dns', 'DNS_NAME', _('DNS Proxy to use within this subnet'),
+              attribute_name: :option_dns_name,
+              referenced_resource: :smart_proxy
+      end
+
+      option_family associate: 'dhcp' do
+        child '--dhcp', 'DHCP_NAME', _('DHCP Proxy to use within this subnet'),
+              attribute_name: :option_dhcp_name,
+              referenced_resource: :smart_proxy
+      end
+
+      option_family associate: 'bmc' do
+        child '--bmc', 'BMC_NAME', _('BMC Proxy to use within this subnet'),
+              attribute_name: :option_bmc_name,
+              referenced_resource: :smart_proxy
+      end
     end
   end
 end

data/lib/hammer_cli_foreman/command_extensions/user.rb

@@ -1,17 +1,21 @@
 module HammerCLIForeman
   module CommandExtensions
     class User < HammerCLI::CommandExtensions
-      option '--default-organization', 'DEFAULT_ORGANIZATION_NAME', _('Default organization name'),
-             aliased_resource: 'default_organization', referenced_resource: 'default_organization'
-      option '--default-location', 'DEFAULT_LOCATION_NAME', _('Default location name'),
-             aliased_resource: 'default_location', referenced_resource: 'default_location'
-
       option '--ask-password', 'ASK_PW', ' ', format: HammerCLI::Options::Normalizers::Bool.new
 
       option_sources do |sources, command|
         sources << HammerCLIForeman::OptionSources::UserParams.new(command)
         sources
       end
+
+      option_family associate: 'default_organization' do
+        child '--default-organization', 'DEFAULT_ORGANIZATION_NAME', _('Default organization name'),
+              aliased_resource: 'default_organization', referenced_resource: 'organization'
+      end
+      option_family associate: 'default_location' do
+        child '--default-location', 'DEFAULT_LOCATION_NAME', _('Default location name'),
+              aliased_resource: 'default_location', referenced_resource: 'location'
+      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/commands.rb

@@ -97,9 +97,8 @@ module HammerCLIForeman
       configurator = BuilderConfigurator.new(searchables, dependency_resolver)
 
       builder = ForemanOptionBuilder.new(searchables)
-      builder.builders = []
+      builder.builders = super.builders
       builder.builders += configurator.builders_for(resource, resource.action(action)) if resource_defined?
-      builder.builders += super.builders
       builder
     end
 
@@ -745,13 +744,17 @@ module HammerCLIForeman
       response = send_request
       if option_path
         filepath = store_response(response)
-        print_message(_('The response has been saved to %{path}s.'), {:path => filepath})
+        print_message(saved_response_message(filepath))
       else
         puts response.body
       end
       return HammerCLI::EX_OK
     end
 
+    def saved_response_message(filepath)
+      _("The response has been saved to %{path}.") % { path: filepath }
+    end
+
     def default_filename
       "Downloaded-#{Time.new.strftime("%Y-%m-%d")}.txt"
     end

data/lib/hammer_cli_foreman/compute_attribute.rb

@@ -12,7 +12,7 @@ module HammerCLIForeman
       profile = HammerCLIForeman.record_to_common_format(
           HammerCLIForeman.foreman_resource(:compute_profiles).call(:show, 'id' => options['option_compute_profile_id'] )
       )
-      params['compute_attribute'] = profile['compute_attributes'].select { |hash| hash['compute_resource_id'] == options['option_compute_resource_id']}[0] || {}
+      params['compute_attribute'] = profile['compute_attributes'].select { |hash| hash['compute_resource_id'].to_s == options['option_compute_resource_id'].to_s}[0] || {}
       params['compute_attribute'].delete('attributes') if params['compute_attribute']['attributes']
       params
     end

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/compute_resource.rb

@@ -107,6 +107,7 @@ module HammerCLIForeman
     class AssociateVmsCommand < HammerCLIForeman::Command
       action :associate
       command_name 'associate-vms'
+      option "--vm-id","VM ID", _("Associate a specific VM")
       success_message _("Virtual machines have been associated.")
       failure_message _("Could not associate the virtual machines")
 

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/exception_handler.rb

@@ -12,6 +12,7 @@ module HammerCLIForeman
         [RestClient::UnprocessableEntity, :handle_unprocessable_entity],
         [RestClient::MovedPermanently, :handle_moved_permanently],
         [RestClient::BadRequest, :handle_bad_request],
+        [ApipieBindings::AuthenticatorError, :handle_authenticator_error],
         [HammerCLIForeman::Api::UnauthorizedError, :handle_foreman_unauthorized],
         [HammerCLIForeman::Api::SessionExpired, :handle_sesion_expired],
         [ArgumentError, :handle_argument_error],
@@ -112,6 +113,12 @@ module HammerCLIForeman
       HammerCLI::EX_DATAERR
     end
 
+    def handle_authenticator_error(e)
+      print_error authenticator_error_message(e)
+      log_full_error e.original_error
+      HammerCLI::EX_USAGE
+    end
+
     def ssl_cert_instructions
       host_url = HammerCLI::Settings.get(:_params, :host) || HammerCLI::Settings.get(:foreman, :host)
       uri = URI.parse(host_url)
@@ -147,6 +154,25 @@ module HammerCLIForeman
 
     private
 
+    def authenticator_error_message(e)
+      case e.type
+      when :negotiate then negotiation_error_message(e)
+      end
+    end
+
+    def negotiation_error_message(e)
+      case e.cause
+      when :configuration
+        _('Server misconfiguration detected') + "\n  - " +
+          _('have you run installer with option %s?') % '--foreman-ipa-authentication=true' + "\n  - " +
+          _('the user might come from a different authentication source') + "\n"
+      else
+        _('Could not authenticate using negotiation protocol') + "\n  - " +
+          _('have you run %s (for Kerberos)?') % 'kinit' + "\n  - " +
+          _('is the server down?') + "\n"
+      end
+    end
+
     def response_message(response)
       message = JSON.parse(response)["error"]["message"]
       "\n  #{message}"

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/hostgroup.rb

@@ -3,13 +3,20 @@ module HammerCLIForeman
   module HostgroupUpdateCreateCommons
 
     def self.included(base)
-      base.option "--parent", "PARENT_NAME",  _("Name of parent hostgroup")
-      base.option ["--root-password"], "ROOT_PASSWORD",  _("Root password")
-      base.option ["--ask-root-password", "--ask-root-pass"], "ASK_ROOT_PW", "",
+      base.option '--root-password', 'ROOT_PASSWORD', _('Root password')
+      base.option '--ask-root-password', 'ASK_ROOT_PW', '',
                   format: HammerCLI::Options::Normalizers::Bool.new
-      base.option "--subnet6", "SUBNET6_NAME", _("Subnet IPv6 name")
 
       base.build_options without: %i[root_pass]
+
+      base.option_family associate: 'subnet6' do
+        child '--subnet6', 'SUBNET6_NAME', _('Subnet IPv6 name')
+      end
+
+      base.option_family associate: 'parent' do
+        child '--parent', 'PARENT_NAME', _('Name of parent hostgroup')
+        child '--parent-title', 'PARENT_TITLE', _('Title of parent hostgroup')
+      end
     end
 
     def self.ask_password
@@ -19,8 +26,8 @@ module HammerCLIForeman
 
     def request_params
       params = super
-      params['hostgroup']["parent_id"] ||= resolver.hostgroup_id('option_name' => option_parent) if option_parent
-
+      params['hostgroup']['parent_id'] ||= resolver.hostgroup_id('option_name' => option_parent) if option_parent
+      params['hostgroup']['parent_id'] ||= resolver.hostgroup_id('option_title' => option_parent_title) if option_parent_title
       params['hostgroup']['root_pass'] = option_root_password if option_root_password
       params['hostgroup']['root_pass'] = HammerCLIForeman::HostgroupUpdateCreateCommons::ask_password if option_ask_root_password
 

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -3,11 +3,12 @@ module HammerCLIForeman
     module CommonUpdateOptions
 
       def self.included(base)
-        base.option "--owner", "OWNER_LOGIN", _("Login of the owner"),
-          :attribute_name => :option_user_login
-        base.option "--owner-id", "OWNER_ID", _("ID of the owner"),
-          :attribute_name => :option_owner_id
-
+        base.option_family do
+          parent '--owner-id', 'OWNER_ID', _('ID of the owner'),
+                 attribute_name: :option_owner_id
+          child '--owner', 'OWNER_LOGIN', _('Login of the owner'),
+                attribute_name: :option_user_login
+        end
         base.option "--root-password", "ROOT_PW",
           _("Required if host is managed and value is not inherited from host group or default password in settings")
 
@@ -112,14 +113,13 @@ module HammerCLIForeman
 
       private
 
-     
       def owner_id(name, type)
         return unless name
         return resolver.usergroup_id('option_name' => name) if type == 'Usergroup'
 
         resolver.user_id('option_login' => name)
       end
-      
+
       def proxy_id(name)
         resolver.smart_proxy_id('option_name' => name) if name
       end