hammer_cli_foreman 2.0.2 → 2.1.0

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -1,4 +1,5 @@
 require 'hammer_cli_foreman/image'
+require 'hammer_cli_foreman/virtual_machine'
 require 'hammer_cli_foreman/compute_resource/register_compute_resources'
 
 module HammerCLIForeman
@@ -223,7 +224,21 @@ module HammerCLIForeman
       build_options
     end
 
+    class AvailableVirtualMachinesCommand < HammerCLIForeman::ListCommand
+      action :available_virtual_machines
+      command_name 'virtual-machines'
+
+      output do
+        field :id, _("Id")
+        field :name, _("Name")
+      end
+
+      build_options
+    end
+
     autoload_subcommands
+    subcommand 'virtual-machine', HammerCLIForeman::VirtualMachine.desc,
+               HammerCLIForeman::VirtualMachine
     subcommand 'image', HammerCLIForeman::Image.desc, HammerCLIForeman::Image
   end
 

data/lib/hammer_cli_foreman/compute_resource/ec2.rb

@@ -15,6 +15,17 @@ module HammerCLIForeman
         ]
       end
 
+      def provider_vm_specific_fields
+        [
+          Fields::Field.new(:label => _('DNS'), :path => [:dns_name]),
+          Fields::Field.new(:label => _('Type'), :path => [:flavor_id]),
+          Fields::Field.new(:label => _('State'), :path => [:state]),
+          Fields::Field.new(:label => _('Owner Id'), :path => [:ownerId]),
+          Fields::Field.new(:label => _('DNS Name'), :path => [:dns_name]),
+          Fields::Field.new(:label => _('Virtualization Type'), :path => [:virtualization_type])
+        ]
+      end
+
       def mandatory_resource_options
         super + %i[region user password]
       end

data/lib/hammer_cli_foreman/compute_resource/gce.rb

@@ -28,6 +28,15 @@ module HammerCLIForeman
         ]
       end
 
+      def provider_vm_specific_fields
+        [
+          Fields::Field.new(:label => _('Machine Type'), :path => [:machine_type]),
+          Fields::Field.new(:label => _('Status'), :path => [:status]),
+          Fields::Field.new(:label => _('Description'), :path => [:description]),
+          Fields::Field.new(:label => _('Zone'), :path => [:zone])
+        ]
+      end
+
       def mandatory_resource_options
         super + %I{project key_path zone}
       end

data/lib/hammer_cli_foreman/compute_resource/libvirt.rb

@@ -41,6 +41,17 @@ module HammerCLIForeman
         'nics_attributes'
       end
 
+      def provider_vm_specific_fields
+        [
+            Fields::Field.new(:label => _('CPUs'), :path => [:cpus]),
+            Fields::Field.new(:label => _('Memory'), :path => [:memory_size]),
+            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])
+        ]
+      end
+
       def mandatory_resource_options
         super + %i[url]
       end

data/lib/hammer_cli_foreman/compute_resource/openstack.rb

@@ -20,6 +20,13 @@ module HammerCLIForeman
       def mandatory_resource_options
         super + %i[url user password]
       end
+
+      def provider_vm_specific_fields
+        [
+          Fields::Field.new(:label => _('State'), :path => [:state]),
+          Fields::Field.new(:label => _('Tenant Id'), :path => [:tenant_id])
+        ]
+      end
     end
 
     HammerCLIForeman.register_compute_resource('openstack', OpenStack.new)

data/lib/hammer_cli_foreman/compute_resource/ovirt.rb

@@ -7,17 +7,19 @@ module HammerCLIForeman
 
       def compute_attributes
         [
-          ['cluster',  _('ID or name of cluster to use')],
-          ['template', _('Hardware profile to use')],
-          ['cores',    _('Integer value, number of cores')],
-          ['sockets',  _('Integer value, number of sockets')],
-          ['memory',   _('Amount of memory, integer value in bytes')]
+          ['cluster',         _('ID or name of cluster to use')],
+          ['template',        _('Hardware profile to use')],
+          ['cores',           _('Integer value, number of cores')],
+          ['sockets',         _('Integer value, number of sockets')],
+          ['memory',          _('Amount of memory, integer value in bytes')],
+          ['display_type',    _('Possible values: %s') % 'VNC, SPICE'],
+          ['keyboard_layout', _('Possible values: %s. Not usable if display type is SPICE.') % 'ar, de-ch, es, fo, fr-ca, hu, ja, mk, no, pt-br, sv, da, en-gb, et, fr, fr-ch, is, lt, nl, pl, ru, th, de, en-us, fi, fr-be, hr, it, lv, nl-be, pt, sl, tr']
         ]
       end
 
       def host_attributes
         [
-          ['start', _('Boolean (expressed as 0 or 1), whether to start the machine or not')]
+          ['start', _('Boolean, set 1 to start the vm')]
         ]
       end
 
@@ -33,9 +35,9 @@ module HammerCLIForeman
         [
           ['size_gb',        _('Volume size in GB, integer value')],
           ['storage_domain', _('ID or name of storage domain')],
-          ['bootable',       _('Boolean, only one volume can be bootable')],
-          ['preallocate',    _('Boolean, set %s to preallocate') % 'true'],
-          ['wipe_after_delete', _('Boolean, set %s to wipe disk after delete') % 'true'],
+          ['bootable',       _('Boolean, set 1 for bootable, only one volume can be bootable')],
+          ['preallocate',    _('Boolean, set 1 to preallocate')],
+          ['wipe_after_delete', _('Boolean, set 1 to wipe disk after delete')],
           ['interface', _('Disk interface name, must be ide, virto or virto_scsi')]
         ]
       end
@@ -46,6 +48,16 @@ module HammerCLIForeman
         ]
       end
 
+      def provider_vm_specific_fields
+        [
+          Fields::Field.new(:label => _('CPUs'), :path => [:cpu]),
+          Fields::Field.new(:label => _('Memory'), :path => [:memory]),
+          Fields::Field.new(:label => _('Status'), :path => [:status]),
+          Fields::Field.new(:label => _('Cores'), :path => [:cores]),
+          Fields::Field.new(:label => _('Type'), :path => [:type])
+        ]
+      end
+
       def mandatory_resource_options
         super + %i[url user password datacenter]
       end

data/lib/hammer_cli_foreman/compute_resource/vmware.rb

@@ -18,8 +18,8 @@ module HammerCLIForeman
           ['firmware',             'automatic/bios/efi'],
           ['guest_id',             _('Guest OS ID form VMware')],
           ['hardware_version',     _('Hardware version ID from VMware')],
-          ['memoryHotAddEnabled',  _('Must be a 1 or 0, lets you add CPU resources while the machine is on')],
-          ['cpuHotAddEnabled',     _('Must be a 1 or 0, lets you add memory resources while the machine is on')],
+          ['memoryHotAddEnabled',  _('Must be a 1 or 0, lets you add memory resources while the machine is on')],
+          ['cpuHotAddEnabled',     _('Must be a 1 or 0, lets you add CPU resources while the machine is on')],
           ['add_cdrom',            _('Must be a 1 or 0, Add a CD-ROM drive to the virtual machine')],
           ['annotation',           _('Annotation Notes')],
           ['scsi_controllers',     [_('List with SCSI controllers definitions'),
@@ -67,6 +67,19 @@ module HammerCLIForeman
         ]
       end
 
+      def provider_vm_specific_fields
+        [
+            Fields::Field.new(:label => _('CPUs'), :path => [:cpus]),
+            Fields::Field.new(:label => _('Memory'), :path => [:memory_mb]),
+            Fields::Field.new(:label => _('Power Status'), :path => [:power_state]),
+            Fields::Field.new(:label => _('Host Name'), :path => [:hostname]),
+            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])
+        ]
+      end
+
       def mandatory_resource_options
         super + %i[user password datacenter server]
       end

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -15,10 +15,14 @@ module HammerCLIForeman
       base.option "--puppet-ca-proxy", "PUPPET_CA_PROXY_NAME", _("Name of puppet CA proxy")
       base.option "--puppet-proxy", "PUPPET_PROXY_NAME",  _("Name of puppet proxy")
       base.option "--parent", "PARENT_NAME",  _("Name of parent hostgroup")
-      base.option "--root-pass", "ROOT_PASSWORD",  _("Root password")
-      base.option "--ask-root-pass", "ASK_ROOT_PW", "",
-        :format => HammerCLI::Options::Normalizers::Bool.new
+      base.option ["--root-password", "--root-pass"], "ROOT_PASSWORD",  _("Root password"),
+                  deprecated: { '--root-pass' => _("Use --root-password instead") }
+      base.option ["--ask-root-password", "--ask-root-pass"], "ASK_ROOT_PW", "",
+                  format: HammerCLI::Options::Normalizers::Bool.new,
+                  deprecated: { '--ask-root-pass' => _("Use --ask-root-password instead") }
       base.option "--subnet6", "SUBNET6_NAME", _("Subnet IPv6 name")
+
+      base.build_options without: %i[root_pass]
     end
 
     def self.ask_password
@@ -32,12 +36,8 @@ module HammerCLIForeman
       params['hostgroup']["puppet_proxy_id"] ||= proxy_id(option_puppet_proxy) if option_puppet_proxy
       params['hostgroup']["puppet_ca_proxy_id"] ||= proxy_id(option_puppet_ca_proxy) if option_puppet_ca_proxy
 
-      # Remove after API docs are fixed: https://projects.theforeman.org/issues/28923
-      puppetclass_ids = option_puppetclass_ids || puppet_class_ids(option_puppetclass_names)
-      params['hostgroup']['puppetclass_ids'] = puppetclass_ids unless puppetclass_ids.nil?
-
-      params['hostgroup']['root_pass'] = option_root_pass if option_root_pass
-      params['hostgroup']['root_pass'] = HammerCLIForeman::HostgroupUpdateCreateCommons::ask_password if option_ask_root_pass
+      params['hostgroup']['root_pass'] = option_root_password if option_root_password
+      params['hostgroup']['root_pass'] = HammerCLIForeman::HostgroupUpdateCreateCommons::ask_password if option_ask_root_password
 
       params['hostgroup']['subnet6_id'] = resolver.subnet_id('option_name' => option_subnet6) if option_subnet6
       params
@@ -48,11 +48,6 @@ module HammerCLIForeman
     def proxy_id(name)
       resolver.smart_proxy_id('option_name' => name) if name
     end
-
-    def puppet_class_ids(names)
-      resolver.puppetclass_ids('option_names' => names) if names
-    end
-
   end
 
   class Hostgroup < HammerCLIForeman::Command
@@ -87,7 +82,8 @@ module HammerCLIForeman
         field nil, _("Parent"), Fields::SingleReference, :key => :parent, :hide_blank => true
         field nil, _("Puppet CA Proxy"), Fields::SingleReference, :key => :puppet_ca_proxy
         field nil, _("Puppet Master Proxy"), Fields::SingleReference, :key => :puppet_proxy
-        field nil, _("ComputeProfile"), Fields::SingleReference, :key => :compute_profile
+        field nil, _("Compute Profile"), Fields::SingleReference, :key => :compute_profile
+	field nil, _("Compute Resource"), Fields::SingleReference, :key => :compute_resource
         label _('Network') do
           field nil, _("Subnet ipv4"), Fields::SingleReference, :key => :subnet
           field nil, _("Subnet ipv6"), Fields::SingleReference, :key => :subnet6
@@ -116,8 +112,6 @@ module HammerCLIForeman
       success_message _("Hostgroup created.")
       failure_message _("Could not create the hostgroup")
 
-      build_options
-
       extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
@@ -128,8 +122,6 @@ module HammerCLIForeman
       success_message _("Hostgroup updated.")
       failure_message _("Could not update the hostgroup")
 
-      build_options
-
       extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -14,15 +14,22 @@ module HammerCLIForeman
         base.option "--ask-root-password", "ASK_ROOT_PW", " ",
           :format => HammerCLI::Options::Normalizers::Bool.new
 
-        base.option "--puppet-proxy", "PUPPET_PROXY_NAME", ""
-        base.option "--puppet-ca-proxy", "PUPPET_CA_PROXY_NAME", ""
-        base.option "--puppet-class-ids", "PUPPET_CLASS_IDS", "",
-          :format => HammerCLI::Options::Normalizers::List.new,
-          :attribute_name => :option_puppetclass_ids
-        base.option "--puppet-classes", "PUPPET_CLASS_NAMES", "",
-          :format => HammerCLI::Options::Normalizers::List.new,
-          :attribute_name => :option_puppetclass_names
-
+        base.option '--puppet-proxy', 'PUPPET_PROXY_NAME', '',
+                    referenced_resource: 'puppet_proxy',
+                    aliased_resource: 'puppet_proxy'
+        base.option '--puppet-ca-proxy', 'PUPPET_CA_PROXY_NAME', '',
+                    referenced_resource: 'puppet_ca_proxy',
+                    aliased_resource: 'puppet_ca_proxy'
+        base.option_family(
+          format: HammerCLI::Options::Normalizers::List.new,
+          aliased_resource: 'puppet-class',
+          description: 'Names/Ids of associated puppet classes'
+        ) do
+          parent '--puppet-class-ids', 'PUPPET_CLASS_IDS', '',
+                 attribute_name: :option_puppetclass_ids
+          child '--puppet-classes', 'PUPPET_CLASS_NAMES', '',
+                 attribute_name: :option_puppetclass_names
+        end
         bme_options = {}
         bme_options[:default] = 'true' if base.action.to_sym == :create
 
@@ -59,7 +66,7 @@ module HammerCLIForeman
 
       def request_params
         params = super
-        owner_id = get_resource_id(HammerCLIForeman.foreman_resource(:users), :required => false, :scoped => true)
+        owner_id = owner_id(option_user_login, params['host']['owner_type'])
         params['host']['owner_id'] ||= owner_id unless owner_id.nil?
 
         puppet_proxy_id = proxy_id(option_puppet_proxy)
@@ -79,6 +86,14 @@ module HammerCLIForeman
         params['host']['host_parameters_attributes'] ||= option_typed_parameters unless option_typed_parameters.nil?
         params['host']['compute_attributes'] = option_compute_attributes || {}
 
+        compute_attributes = params['host']['compute_attributes']
+        compute_attributes['display'] = {} unless compute_attributes['display_type'].nil? && compute_attributes['keyboard_layout'].nil?
+        compute_attributes['display']['type'] = compute_attributes['display_type'] unless compute_attributes['display_type'].nil?
+        compute_attributes['display']['keyboard_layout'] = compute_attributes['keyboard_layout'] unless compute_attributes['keyboard_layout'].nil?
+        compute_attributes.delete('display_type')
+        compute_attributes.delete('keyboard_layout')
+        params['host']['compute_attributes'] = compute_attributes
+
         if action == :update
           params['host']['compute_attributes']['volumes_attributes'] = nested_attributes(option_volume_list) unless option_volume_list.empty?
           params['host']['interfaces_attributes'] = interfaces_attributes unless option_interface_list.empty?
@@ -119,6 +134,13 @@ module HammerCLIForeman
 
       private
 
+      def owner_id(name, type = 'User')
+        return unless name
+        return resolver.user_id('option_login' => name) if type == 'User'
+
+        resolver.usergroup_id('option_name' => name)
+      end
+
       def proxy_id(name)
         resolver.smart_proxy_id('option_name' => name) if name
       end

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -1,16 +1,16 @@
 module HammerCLIForeman
 
   class Searchable
+    attr_reader :name, :description, :format
 
     def initialize(name, description, options={})
       @name = name
       @description = description
       @editable = options[:editable].nil? ? true : options[:editable]
       @format = options[:format]
+      @parent = options[:parent]
     end
 
-    attr_reader :name, :description
-
     def plural_name
       ApipieBindings::Inflector.pluralize(@name)
     end
@@ -19,10 +19,9 @@ module HammerCLIForeman
       @editable
     end
 
-    def format
-      @format
+    def parent?
+      @parent
     end
-
   end
 
   class Searchables
@@ -51,15 +50,17 @@ module HammerCLIForeman
       :hostgroup =>        [ s_name(_("Hostgroup name")), s("title", _("Hostgroup title"), :editable => false) ],
       # :image =>            [],
       :interface =>        [],
-      :location =>         [  s("name", _("Location Name, Set the current location context for the request")),
-                              s("title", _("Location title, Set the current location context for the request" ),:editable => false),
-                              s("id", _("Set the current location context for the request"), :editable => false, :format => HammerCLI::Options::Normalizers::Number.new),
+      :location =>         [  s('name', _('Location Name, Set the current location context for the request')),
+                              s('title', _('Location title, Set the current location context for the request' ),
+                                editable: false
+                              )
       ],
       :medium =>           [ s_name(_("Medium name")) ],
       :model =>            [ s_name(_("Model name")) ],
-      :organization =>     [ s("name", _("Set the current organization context for the request")),
-                             s("title", _("Set the current organization context for the request"),:editable => false),
-                             s("id", _("Set the current organization context for the request"), :editable => false, :format => HammerCLI::Options::Normalizers::Number.new),
+      :organization =>     [ s('name', _('Set the current organization context for the request')),
+                             s('title', _('Set the current organization context for the request'),
+                               editable: false
+                             )
       ],
       :operatingsystem =>  [ s("title", _("Operating system title"), :editable => false) ],
       :override_value =>   [],

data/lib/hammer_cli_foreman/mail_notification.rb

@@ -0,0 +1,31 @@
+
+module HammerCLIForeman
+
+  class MailNotification < HammerCLIForeman::Command
+    resource :mail_notifications
+
+    class ListCommand < HammerCLIForeman::ListCommand
+
+      output do
+        field :id, _("Id")
+        field :name, _("Name")
+      end
+
+      build_options
+    end
+
+    class InfoCommand < HammerCLIForeman::InfoCommand
+      output do
+        field :id, _("Id")
+        field :name, _("Name")
+        field :description, _("Description")
+        field :subscription_type, _("Subscription type")
+      end
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end
+

data/lib/hammer_cli_foreman/option_builders.rb

@@ -73,12 +73,15 @@ module HammerCLIForeman
         builders << SearchablesOptionBuilder.new(resource, @searchables)
         dependent_resources += @dependency_resolver.resource_dependencies(resource, :only_required => true, :recursive => true)
       end
-
       dependent_resources += @dependency_resolver.action_dependencies(action, :only_required => false, :recursive => false)
       dependent_resources += @dependency_resolver.action_dependencies(action, :only_required => true, :recursive => true)
 
       dependent_resources.uniq(&:name).each do |dep_resource|
-        builders << DependentSearchablesOptionBuilder.new(dep_resource, @searchables)
+        builders << DependentSearchablesOptionBuilder.new(
+          dep_resource,
+          @searchables,
+          context: { action: action }
+        )
       end
 
       IdArrayParamsFilter.new(:only_required => false).for_action(action).each do |p|
@@ -181,9 +184,10 @@ module HammerCLIForeman
 
   class DependentSearchablesOptionBuilder < SearchablesAbstractOptionBuilder
 
-    def initialize(resource, searchables)
+    def initialize(resource, searchables, options = {})
       @resource = resource
       @searchables = searchables
+      @context = options[:context] || {}
     end
 
     attr_reader :resource
@@ -200,6 +204,13 @@ module HammerCLIForeman
       searchables = @searchables.for(resource)
       resource_name = resource.singular_name
       aliased_name = aliased(resource_name, resource_name_map)
+      types = searchables.map(&:name).push('id').map(&:capitalize).join('/')
+      associated_resource = resource.singular_name.to_s.tr('_', ' ')
+      family = HammerCLI::Options::OptionFamily.new(
+        referenced_resource: resource_name,
+        aliased_resource: aliased_name,
+        description: _('%{types} of associated %{resource}') % { types: types, resource: associated_resource }
+      )
 
       unless searchables.empty?
         first = searchables[0]
@@ -207,36 +218,34 @@ module HammerCLIForeman
 
         # First option is named by the resource
         # Eg. --organization with accessor option_organization_name
-        options << option(
+        options << family.child(
           optionamize("--#{aliased_name}"),
           "#{aliased_name}_#{first.name}".upcase,
           first.description || " ",
-          :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{first.name}"),
-          :referenced_resource => resource.singular_name
+          attribute_name: HammerCLI.option_accessor_name("#{resource_name}_#{first.name}")
         )
-
         # Other options are named by the resource plus the searchable name
         # Eg. --organization-label with accessor option_organization_label
         remaining.each do |s|
-          options << option(
+          options << family.send(s.parent? ? :parent : :child,
             optionamize("--#{aliased_name}-#{s.name}"),
             "#{aliased_name}_#{s.name}".upcase,
             s.description || " ",
-            :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{s.name}"),
-            :referenced_resource => resource.singular_name,
-            :format => s.format
+            attribute_name: HammerCLI.option_accessor_name("#{resource_name}_#{s.name}"),
+            format: s.format
           )
         end
       end
 
-      options << option(
-        optionamize("--#{aliased_name}-id"),
-        "#{aliased_name}_id".upcase,
-        description("id", :show),
-        :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_id"),
-        :format => HammerCLI::Options::Normalizers::Number.new,
-        :referenced_resource => resource.singular_name
-      )
+      unless options.any? { |o| o.handles?("--#{aliased_name}-id") }
+        options << family.parent(
+          optionamize("--#{aliased_name}-id"),
+          "#{aliased_name}_id".upcase,
+          description("#{aliased_name}_id", @context[:action]),
+          attribute_name: HammerCLI.option_accessor_name("#{resource_name}_id"),
+          format: HammerCLI::Options::Normalizers::Number.new
+        )
+      end
       options
     end
 
@@ -244,6 +253,14 @@ module HammerCLIForeman
       resource_name_map[name.to_s] || resource_name_map[name.to_sym] || name
     end
 
+    def description(param_name, action)
+      return super('id', :show) if action.nil?
+
+      param = ParamsNameFilter.new(param_name).for_action(action).first
+      return ' ' if param.nil?
+
+      param.description
+    end
   end
 
   class UpdateDependentSearchablesOptionBuilder < DependentSearchablesOptionBuilder
@@ -254,42 +271,44 @@ module HammerCLIForeman
       searchables = @searchables.for(resource)
       resource_name = resource.singular_name
       aliased_name = aliased(resource_name, resource_name_map)
-
+      family = HammerCLI::Options::OptionFamily.new(
+        prefix: 'new-',
+        aliased_resource: aliased_name,
+        referenced_resource: resource_name
+      )
       unless searchables.empty?
         first = searchables[0]
         remaining = searchables[1..-1] || []
 
         # First option is named by the resource
         # Eg. --new-organization with accessor option_new_organization_name
-        options << option(
+        options << family.child(
           optionamize("--new-#{aliased_name}"),
           "new_#{aliased_name}_#{first.name}".upcase,
-          first.description || ' ',
-          attribute_name: HammerCLI.option_accessor_name("new_#{resource_name}_#{first.name}"),
-          referenced_resource: resource.singular_name
+          _('Use to update'),
+          attribute_name: HammerCLI.option_accessor_name("new_#{resource_name}_#{first.name}")
         )
-
         # Other options are named by the resource plus the searchable name
         # Eg. --new-organization-label with accessor option_new_organization_label
         remaining.each do |s|
-          options << option(
+          options << family.send(s.parent? ? :parent : :child,
             optionamize("--new-#{aliased_name}-#{s.name}"),
             "new_#{aliased_name}_#{s.name}".upcase,
-            s.description || ' ',
-            attribute_name: HammerCLI.option_accessor_name("new_#{resource_name}_#{s.name}"),
-            referenced_resource: resource.singular_name
+            _('Use to update'),
+            attribute_name: HammerCLI.option_accessor_name("new_#{resource_name}_#{s.name}")
           )
         end
       end
 
-      options << option(
-        optionamize("--new-#{aliased_name}-id"),
-        "new_#{aliased_name}_id".upcase,
-        description('id', :show),
-        attribute_name: HammerCLI.option_accessor_name("new_#{resource_name}_id"),
-        format: HammerCLI::Options::Normalizers::Number.new,
-        referenced_resource: resource.singular_name
-      )
+      unless options.any? { |o| o.handles?("--new-#{aliased_name}-id") }
+        options << family.parent(
+          optionamize("--new-#{aliased_name}-id"),
+          "new_#{aliased_name}_id".upcase,
+          _('Use to update'),
+          attribute_name: HammerCLI.option_accessor_name("new_#{resource_name}_id"),
+          format: HammerCLI::Options::Normalizers::Number.new
+        )
+      end
       options
     end
   end
@@ -308,28 +327,31 @@ module HammerCLIForeman
       unless searchables.empty?
         first = searchables[0]
         remaining = searchables[1..-1] || []
-
+        types = searchables.map(&:plural_name).map(&:capitalize).join('/')
+        associated_resource = resource.name.to_s.tr('_', ' ')
+        family = HammerCLI::Options::OptionFamily.new(
+          format: HammerCLI::Options::Normalizers::List.new,
+          referenced_resource: resource_name,
+          aliased_resource: aliased_name,
+          description: _('%{types} of associated %{resource}') % { types: types, resource: associated_resource }
+        )
         # First option is named by the resource
         # Eg. --organizations with accessor option_organization_names
-        options << option(
+        options << family.child(
           optionamize("--#{aliased_plural_name}"),
           "#{aliased_name}_#{first.plural_name}".upcase,
-          " ",
-          :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{first.plural_name}"),
-          :format => HammerCLI::Options::Normalizers::List.new,
-          :referenced_resource => resource.singular_name
+          ' ',
+          attribute_name: HammerCLI.option_accessor_name("#{resource_name}_#{first.plural_name}")
         )
 
         # Other options are named by the resource plus the searchable name
         # Eg. --organization-labels with accessor option_organization_labels
         remaining.each do |s|
-          options << option(
+          options << family.send(s.parent? ? :parent : :child,
             optionamize("--#{aliased_name}-#{s.plural_name}"),
             "#{aliased_name}_#{s.plural_name}".upcase,
-            " ",
-            :attribute_name => HammerCLI.option_accessor_name("#{resource_name}_#{s.plural_name}"),
-            :format => HammerCLI::Options::Normalizers::List.new,
-            :referenced_resource => resource.singular_name
+            ' ',
+            attribute_name: HammerCLI.option_accessor_name("#{resource_name}_#{s.plural_name}")
           )
         end
       end