hammer_cli_foreman 0.11.0 → 0.12.0

data/lib/hammer_cli_foreman/external_usergroup.rb

@@ -54,7 +54,7 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _("External user group created")
+      success_message _("External user group created.")
       failure_message _("Could not create external user group")
 
       build_options
@@ -62,7 +62,7 @@ module HammerCLIForeman
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("External user group updated")
+      success_message _("External user group updated.")
       failure_message _("Could not update external user group")
 
       build_options
@@ -70,7 +70,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("External user group deleted")
+      success_message _("External user group deleted.")
       failure_message _("Could not delete the external user group")
 
       build_options
@@ -80,4 +80,3 @@ module HammerCLIForeman
   end
 
 end
-

data/lib/hammer_cli_foreman/filter.rb

@@ -43,23 +43,28 @@ module HammerCLIForeman
 
 
     module TaxonomyCheck
-      def taxonomy_options?
-        option_location_names || option_location_ids || option_organization_names || option_organization_ids
-      end
-
-      def signal_override_usage_error
-        signal_usage_error _('Organizations and locations can be set only for overriding filters')
-      end
 
       def self.included(base)
+        def taxonomy_options?
+          opt_names = ['location_ids', 'organization_ids']
+          opt_names += resolver.searchables(:locations).map { |s| 'location_' + s.plural_name }
+          opt_names += resolver.searchables(:organizations).map { |s| 'organization_' + s.plural_name }
+          opt_names.any? { |opt| send(HammerCLI.option_accessor_name(opt)) }
+        end
+
+        def signal_override_usage_error
+          signal_usage_error _('Organizations and locations can be set only for overriding filters.')
+        end
+
         base.extend_help do |h|
-          h.section('Overriding organizations and locations') do
+          h.section(_('Overriding organizations and locations')) do
             override_condition = "--override=true"
             org_opts = '--organization[s|-ids]'
             loc_opts = '--location[s|-ids]'
 
-            h.text(_("Filters inherit organizations and locations from its role by default. This behavior can be changed by setting %{condition}\n"+
+            h.text(_("Filters inherit organizations and locations from its role by default. This behavior can be changed by setting %{condition}.%{wsp}" +
               "Therefore options %{org_opts} and %{loc_opts} are applicable only when the override flag is set.") % {
+              :wsp => "\n",
               :org_opts => org_opts,
               :loc_opts => loc_opts,
               :condition => override_condition
@@ -73,12 +78,11 @@ module HammerCLIForeman
     class CreateCommand < HammerCLIForeman::CreateCommand
       include TaxonomyCheck
 
-      success_message _("Permission filter for [%<resource_type>s] created")
+      success_message _("Permission filter for [%<resource_type>s] created.")
       failure_message _("Could not create the permission filter")
 
-      def execute
+      def validate_options
         signal_override_usage_error if !option_override && taxonomy_options?
-        super
       end
 
       build_options
@@ -88,7 +92,7 @@ module HammerCLIForeman
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       include TaxonomyCheck
 
-      success_message _("Permission filter for [%<resource_type>s] updated")
+      success_message _("Permission filter for [%<resource_type>s] updated.")
       failure_message _("Could not update the permission filter")
 
       def request_params
@@ -101,9 +105,8 @@ module HammerCLIForeman
         params
       end
 
-      def execute
+      def validate_options
         signal_override_usage_error if !override? && taxonomy_options?
-        super
       end
 
       def override?
@@ -115,7 +118,7 @@ module HammerCLIForeman
       end
 
       def filter
-        @filter ||= HammerCLIForeman.foreman_resource!(:filters).action(:show).call({ :id => option_id }, request_headers, request_options)
+        @filter ||= HammerCLIForeman.foreman_resource!(:filters).action(:show).call({ :id => get_identifier }, request_headers, request_options)
       end
 
       build_options
@@ -123,7 +126,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Permission filter deleted")
+      success_message _("Permission filter deleted.")
       failure_message _("Could not delete the permission filter")
 
       build_options
@@ -161,8 +164,4 @@ module HammerCLIForeman
 
     autoload_subcommands
   end
-
 end
-
-
-

data/lib/hammer_cli_foreman/host.rb

@@ -35,7 +35,7 @@ module HammerCLIForeman
         field :mac, _("MAC")
       end
 
-      build_options
+      build_options :without => [:include, :thin]
     end
 
 
@@ -61,9 +61,9 @@ module HammerCLIForeman
         field nil, _("Host Group"), Fields::SingleReference, :key => :hostgroup, :display_field => 'title'
         field nil, _("Compute Resource"), Fields::SingleReference, :key => :compute_resource
         field nil, _("Compute Profile"), Fields::SingleReference, :key => :compute_profile, :hide_blank => true
-        field nil, _("Environment"), Fields::SingleReference, :key => :environment
-        field :puppet_ca_proxy_id, _("Puppet CA Id")
-        field :puppet_proxy_id, _("Puppet Master Id")
+        field nil, _("Puppet Environment"), Fields::SingleReference, :key => :environment
+        field nil, _("Puppet CA Proxy"), Fields::SingleReference, :key => :puppet_ca_proxy
+        field nil, _("Puppet Master Proxy"), Fields::SingleReference, :key => :puppet_proxy
         field :certname, _("Cert name")
         field :managed, _("Managed"), Fields::Boolean
 
@@ -71,9 +71,11 @@ module HammerCLIForeman
         field :last_report, _("Last report"), Fields::Date
 
         label _("Network") do
-          field :ip, _("IP")
+          field :ip, _("IPv4 address"), Fields::Field, :hide_blank => true
+          field :ip6, _("IPv6 address"), Fields::Field, :hide_blank => true
           field :mac, _("MAC")
-          field nil, _("Subnet"), Fields::SingleReference, :key => :subnet
+          field nil, _("Subnet ipv4"), Fields::SingleReference, :key => :subnet
+          field nil, _("Subnet ipv6"), Fields::SingleReference, :key => :subnet6
           field nil, _("Domain"), Fields::SingleReference, :key => :domain
           field nil, _("Service provider"), Fields::Label, :hide_blank => true do
             field :sp_name, _("SP Name"), Fields::Field, :hide_blank => true
@@ -88,7 +90,8 @@ module HammerCLIForeman
           field :identifier, _('Identifier')
           field :_type, _('Type')
           field :mac, _('MAC address')
-          field :ip, _('IP address')
+          field :ip, _('IPv4 address'), Fields::Field, :hide_blank => true
+          field :ip6, _('IPv6 address'), Fields::Field, :hide_blank => true
           field :fqdn, _('FQDN')
         end
 
@@ -100,6 +103,7 @@ module HammerCLIForeman
           field :build, _("Build"), Fields::Boolean
           field nil, _("Medium"), Fields::SingleReference, :key => :medium
           field nil, _("Partition Table"), Fields::SingleReference, :key => :ptable
+          field :pxe_loader, _("PXE Loader"), Fields::Field, :hide_blank => true
           field :disk, _("Custom partition table"), Fields::LongText
           # image
           # for image based
@@ -113,7 +117,7 @@ module HammerCLIForeman
 
         # additional info
         label _("Additional info") do
-          field :owner_id, _("Owner Id")
+          field nil, _("Owner"), Fields::SingleReference, :key => :owner
           field :owner_type, _("Owner Type")
           field :enabled, _("Enabled"), Fields::Boolean
           field nil, _("Model"), Fields::SingleReference, :key => :model, :hide_blank => true
@@ -209,18 +213,39 @@ module HammerCLIForeman
     end
 
 
-    class ReportsCommand < HammerCLIForeman::AssociatedResourceListCommand
+    class ReportsCommand < HammerCLIForeman::ListCommand
       command_name "reports"
       resource :reports, :index
-      parent_resource :hosts
+
+      option('--id', "ID", _('Host id'), :referenced_resource => 'host')
+      option('--name', "NAME", _('Host name'))
 
       output HammerCLIForeman::Report::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 CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _("Host created")
+      success_message _("Host created.")
       failure_message _("Could not create the host")
 
       include HammerCLIForeman::Hosts::CommonUpdateOptions
@@ -241,7 +266,7 @@ module HammerCLIForeman
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("Host updated")
+      success_message _("Host updated.")
       failure_message _("Could not update the host")
 
       include HammerCLIForeman::Hosts::CommonUpdateOptions
@@ -250,7 +275,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Host deleted")
+      success_message _("Host deleted.")
       failure_message _("Could not delete the host")
 
       build_options
@@ -258,7 +283,7 @@ module HammerCLIForeman
 
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
-      desc _("Create or update parameter for a host.")
+      desc _("Create or update parameter for a host")
 
       success_message_for :update, _("Host parameter updated")
       success_message_for :create, _("New host parameter created")
@@ -274,9 +299,9 @@ module HammerCLIForeman
 
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
-      desc _("Delete parameter for a host.")
+      desc _("Delete parameter for a host")
 
-      success_message _("Host parameter deleted")
+      success_message _("Host parameter deleted.")
 
       def validate_options
         super
@@ -326,9 +351,9 @@ module HammerCLIForeman
 
       def success_message
         if option_force?
-          _("Power off forced.")
+          _("Power off forced")
         else
-          _("Powering the host off.")
+          _("Powering the host off")
         end
       end
 

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -61,11 +61,11 @@ module HammerCLIForeman
         field :name, _("Name")
         field :title, _("Title")
         field nil, _("Operating System"), Fields::SingleReference, :key => :operatingsystem
-        field nil, _("Environment"), Fields::SingleReference, :key => :environment
+        field nil, _("Puppet Environment"), Fields::SingleReference, :key => :environment
         field nil, _("Model"), Fields::SingleReference, :key => :model
       end
 
-      build_options
+      build_options :without => :include
     end
 
 
@@ -73,19 +73,26 @@ module HammerCLIForeman
 
       output ListCommand.output_definition do
         field :description, _("Description"), Fields::LongText, :hide_blank => true
-        field nil, _("Subnet"), Fields::SingleReference, :key => :subnet
-
-        field nil, _("Domain"), Fields::SingleReference, :key => :domain
-        field nil, _("Architecture"), Fields::SingleReference, :key => :architecture
-        field nil, _("Partition Table"), Fields::SingleReference, :key => :ptable
-        field nil, _("Medium"), Fields::SingleReference, :key => :medium
-        field :puppet_ca_proxy_id, _("Puppet CA Proxy Id")
-        field :puppet_proxy_id, _("Puppet Master Proxy Id")
+        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
+        label _('Network') do
+          field nil, _("Subnet ipv4"), Fields::SingleReference, :key => :subnet
+          field nil, _("Subnet ipv6"), Fields::SingleReference, :key => :subnet6
+          field nil, _("Realm"), Fields::SingleReference, :key => :realm
+          field nil, _("Domain"), Fields::SingleReference, :key => :domain
+        end
+        label _('Operating system') do
+          field nil, _("Architecture"), Fields::SingleReference, :key => :architecture
+          field nil, _("Operating System"), Fields::SingleReference, :key => :operatingsystem
+          field nil, _("Medium"), Fields::SingleReference, :key => :medium
+          field nil, _("Partition Table"), Fields::SingleReference, :key => :ptable
+          field :pxe_loader, _("PXE Loader"), Fields::Field, :hide_blank => true
+        end
         HammerCLIForeman::References.puppetclasses(self)
         HammerCLIForeman::References.parameters(self)
         HammerCLIForeman::References.taxonomies(self)
-        field :ancestry, _("Parent Id")
       end
 
       build_options
@@ -95,7 +102,7 @@ module HammerCLIForeman
     class CreateCommand < HammerCLIForeman::CreateCommand
       include HostgroupUpdateCreateCommons
 
-      success_message _("Hostgroup created")
+      success_message _("Hostgroup created.")
       failure_message _("Could not create the hostgroup")
 
       build_options
@@ -105,7 +112,7 @@ module HammerCLIForeman
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       include HostgroupUpdateCreateCommons
 
-      success_message _("Hostgroup updated")
+      success_message _("Hostgroup updated.")
       failure_message _("Could not update the hostgroup")
 
       build_options
@@ -113,7 +120,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Hostgroup deleted")
+      success_message _("Hostgroup deleted.")
       failure_message _("Could not delete the hostgroup")
 
       build_options
@@ -138,7 +145,7 @@ module HammerCLIForeman
 
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
-      desc _("Create or update parameter for a hostgroup.")
+      desc _("Create or update parameter for a hostgroup")
 
       success_message_for :update, _("Hostgroup parameter updated")
       success_message_for :create, _("New hostgroup parameter created")
@@ -149,9 +156,9 @@ module HammerCLIForeman
 
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
-      desc _("Delete parameter for a hostgroup.")
+      desc _("Delete parameter for a hostgroup")
 
-      success_message _("Hostgroup parameter deleted")
+      success_message _("Hostgroup parameter deleted.")
 
       build_options
     end
@@ -178,5 +185,3 @@ module HammerCLIForeman
   end
 
 end
-
-

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -35,20 +35,18 @@ module HammerCLIForeman
         bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
         base.option "--overwrite", "OVERWRITE", " ",  bme_options
 
-        base.option "--parameters", "PARAMS", _("Host parameters."),
+        base.option "--parameters", "PARAMS", _("Host parameters"),
           :format => HammerCLI::Options::Normalizers::KeyValueList.new
-        base.option "--compute-attributes", "COMPUTE_ATTRS", _("Compute resource attributes."),
+        base.option "--compute-attributes", "COMPUTE_ATTRS", _("Compute resource attributes"),
           :format => HammerCLI::Options::Normalizers::KeyValueList.new
         base.option "--volume", "VOLUME", _("Volume parameters"), :multivalued => true,
           :format => HammerCLI::Options::Normalizers::KeyValueList.new
-        base.option "--interface", "INTERFACE", _("Interface parameters."), :multivalued => true,
+        base.option "--interface", "INTERFACE", _("Interface parameters"), :multivalued => true,
           :format => HammerCLI::Options::Normalizers::KeyValueList.new
-        base.option "--provision-method", "METHOD", " ",
-          :format => HammerCLI::Options::Normalizers::Enum.new(['build', 'image'])
 
         base.build_options :without => [
               # - temporarily disabled params that will be removed from the api ------------------
-              :provision_method, :capabilities, :flavour_ref, :image_ref, :start,
+              :capabilities, :flavour_ref, :image_ref, :start,
               :network, :cpus, :memory, :provider, :type, :tenant_id, :image_id,
               # ----------------------------------------------------------------------------------
               :puppet_class_ids, :host_parameters_attributes, :interfaces_attributes, :root_pass]

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -52,7 +52,7 @@ module HammerCLIForeman
       :ptable =>           [ s_name(_("Partition table name")) ],
       :proxy =>            [ s_name(_("Proxy name")) ],
       :puppetclass =>      [ s_name(_("Puppet class name")) ],
-      :report =>           [ s_name(_("Report name")) ],
+      :report =>           [],
       :role =>             [ s_name(_("User role name")) ],
       :setting =>          [ s_name(_("Setting name"), :editable => false) ],
       :subnet =>           [ s_name(_("Subnet name")) ],
@@ -82,15 +82,22 @@ module HammerCLIForeman
       define_id_finders
     end
 
-    def scoped_options(scope, options)
+    # @param mode [Symbol] mode in which ids are searched :single, :multi, nil for old beahvior
+    def scoped_options(scope, options, mode = nil)
       scoped_options = options.dup
 
       resource = HammerCLIForeman.param_to_resource(scope)
       return scoped_options unless resource
 
-      option_names = searchables(resource).map { |s| s.name }
-      option_names += searchables(resource).map { |s| s.plural_name }
-      option_names << "id"
+      option_names = []
+      if (mode.nil? || mode == :single)
+        option_names << "id"
+        option_names += searchables(resource).map { |s| s.name }
+      end
+      if (mode.nil? || mode == :multi)
+        option_names << "ids"
+        option_names += searchables(resource).map { |s| s.plural_name }
+      end
 
       option_names.each do |name|
         option = HammerCLI.option_accessor_name(name)
@@ -106,22 +113,15 @@ module HammerCLIForeman
       scoped_options
     end
 
-
-    def puppetclass_id(options)
-      if options[HammerCLI.option_accessor_name("id")]
-        return options[HammerCLI.option_accessor_name("id")]
-      else
-        resource = @api.resource(:puppetclasses)
-        results = resolved_call(:puppetclasses, :index, options)[0]
-        results = results.values.flatten
-        return pick_result(results, resource)['id']
-      end
-    end
-
     def puppetclass_ids(options)
       options[HammerCLI.option_accessor_name("ids")] || find_puppetclasses(options).collect { |c| c['id'] }
     end
 
+    def searchables(resource)
+      resource = @api.resource(resource) if resource.is_a? Symbol
+      @searchables.for(resource)
+    end
+
     protected
 
     def define_id_finders
@@ -140,23 +140,39 @@ module HammerCLIForeman
     end
 
     def get_id(resource_name, options)
-      options[HammerCLI.option_accessor_name("id")] || find_resource(resource_name, options)['id']
+      options[HammerCLI.option_accessor_name("id")] ||
+          nil_from_searchables(resource_name, options) ||
+          find_resource(resource_name, options)['id']
     end
 
     def get_ids(resource_name, options)
       if (ids = options[HammerCLI.option_accessor_name("ids")])
         ids
-      elsif !options_empty?(@api.resource(resource_name), options)
-        find_resources(resource_name, options).map{|r| r['id']}
-      else
+      elsif (ids = nil_from_searchables(resource_name, options, :plural => true))
+        ids
+      elsif options_not_set?(@api.resource(resource_name), options)
+        resource = @api.resource(resource_name)
+        raise MissingSearchOptions.new(_("Missing options to search %s") % resource.name, resource)
+      elsif options_empty?(@api.resource(resource_name), options)
         []
+      else
+        find_resources(resource_name, options).map{|r| r['id']}
+      end
+    end
+
+    def nil_from_searchables(resource_name, options, plural = false)
+      resource = @api.resource(resource_name)
+      searchables(resource).each do |s|
+        option_name = plural ? s.plural_name.to_s : s.name.to_s
+        return HammerCLI::NilValue if options[HammerCLI.option_accessor_name(option_name)] == HammerCLI::NilValue
       end
+      nil
     end
 
     def find_resources(resource_name, options)
       resource = @api.resource(resource_name)
-      results = resolved_call(resource_name, :index, options)
-      raise ResolverError.new(_("one of %s not found") % resource.name, resource) if results.count < expected_record_count(options, resource)
+      results = resolved_call(resource_name, :index, options, :multi)
+      raise ResolverError.new(_("one of %s not found.") % resource.name, resource) if results.count < expected_record_count(options, resource)
       results
     end
 
@@ -167,8 +183,8 @@ module HammerCLIForeman
       if (ids = options[HammerCLI.option_accessor_name("ids")])
         ids
       elsif !options_empty?(resource, options)
-        results = resolved_call(resource_name, :index, options).first.values.flatten
-        raise ResolverError.new(_("one of %s not found") % resource.name, resource) if results.count < expected_record_count(options, resource)
+        results = resolved_call(resource_name, :index, options, :multi).first.values.flatten
+        raise ResolverError.new(_("one of %s not found.") % resource.name, resource) if results.count < expected_record_count(options, resource)
         results
       else
         []
@@ -182,17 +198,20 @@ module HammerCLIForeman
     end
 
     def find_resource_raw(resource_name, options)
-      resolved_call(resource_name, :index, options)
+      resolved_call(resource_name, :index, options, :single)
     end
 
 
-    def resolved_call(resource_name, action_name, options)
+    # @param mode [Symbol] mode in which ids are searched :single, :multi, nil for old beahvior
+    def resolved_call(resource_name, action_name, options, mode = nil)
       resource = @api.resource(resource_name)
       action = resource.action(action_name)
 
-      search_options = search_options(options, resource)
+      search_options = search_options(options, resource, mode)
       IdParamsFilter.new(:only_required => true).for_action(action).each do |param|
-        search_options[param.name] ||= send(param.name, scoped_options(param.name.gsub(/_id$/, ""), options))
+        scoped_options_params = [param.name.gsub(/_id$/, ""), options]
+        scoped_options_params << mode if method(:scoped_options).arity == -3
+        search_options[param.name] ||= send(param.name, scoped_options(*scoped_options_params))
       end
       search_options = route_options(options, action).merge(search_options)
 
@@ -218,26 +237,35 @@ module HammerCLIForeman
     end
 
     def pick_result(results, resource)
-      raise ResolverError.new(_("%s not found") % resource.singular_name, resource) if results.empty?
-      raise ResolverError.new(_("found more than one %s") % resource.singular_name, resource) if results.count > 1
+      raise ResolverError.new(_("%s not found.") % resource.singular_name, resource) if results.empty?
+      raise ResolverError.new(_("Found more than one %s.") % resource.singular_name, resource) if results.count > 1
       results[0]
     end
 
-    def search_options(options, resource)
-      method = "create_#{resource.name}_search_options"
-      search_options = if respond_to?(method, true)
-                         send(method, options)
-                       else
-                         create_search_options(options, resource)
-                       end
-      raise MissingSearchOptions.new(_("Missing options to search %s") % resource.singular_name, resource) if search_options.empty?
+    # @param mode [Symbol] mode in which ids are searched :single, :multi, nil for old beahvior
+    def search_options(options, resource, mode = nil)
+      override_method = "create_#{resource.name}_search_options"
+      search_options = if respond_to?(override_method, true)
+        create_search_options_params = [override_method, options]
+        if method(override_method.to_sym).arity == -2
+          create_search_options_params << mode
+        else
+          warn "create_*_search_options methods (#{override_method}) without 'mode' parameter are deprecated"
+        end
+        send(*create_search_options_params)
+      else
+        create_search_options_params = [options, resource]
+        if method(:create_search_options).arity == -3
+          create_search_options_params << mode
+        else
+          warn "create_search_options methods without 'mode' parameter are deprecated"
+        end
+        create_search_options(*create_search_options_params)
+      end
+      raise MissingSearchOptions.new(_("Missing options to search %s.") % resource.singular_name, resource) if search_options.empty?
       search_options
     end
 
-    def searchables(resource)
-      @searchables.for(resource)
-    end
-
     def expected_record_count(options, resource)
       searchables(resource).each do |s|
         value = options[HammerCLI.option_accessor_name(s.name.to_s)]
@@ -263,13 +291,20 @@ module HammerCLIForeman
     end
 
     def options_empty?(resource, options)
-      searchables(resource).any? do |s|
+      searchables(resource).all? do |s|
         values = options[HammerCLI.option_accessor_name(s.plural_name.to_s)]
-        values && values.respond_to?(:empty?) && values.empty?
+        values.nil? || (values.respond_to?(:empty?) && values.empty?)
       end
     end
 
-    def create_smart_class_parameters_search_options(options)
+    def options_not_set?(resource, options)
+      searchables(resource).all? do |s|
+        values = options[HammerCLI.option_accessor_name(s.plural_name.to_s)]
+        values.nil?
+      end
+    end
+
+    def create_smart_class_parameters_search_options(options, mode = nil)
       search_options = {}
       value = options[HammerCLI.option_accessor_name('name')]
       search_options[:search] = "key = \"#{value}\""
@@ -277,7 +312,7 @@ module HammerCLIForeman
       search_options
     end
 
-    def create_smart_variables_search_options(options)
+    def create_smart_variables_search_options(options, mode = nil)
       search_options = {}
       value = options[HammerCLI.option_accessor_name('variable')]
 
@@ -288,13 +323,14 @@ module HammerCLIForeman
       search_options
     end
 
-    def create_search_options(options, resource)
+    # @param mode [Symbol] mode in which ids are searched :single, :multi, nil for old beahvior
+    def create_search_options(options, resource, mode = nil)
       searchables(resource).each do |s|
         value = options[HammerCLI.option_accessor_name(s.name.to_s)]
         values = options[HammerCLI.option_accessor_name(s.plural_name.to_s)]
-        if value
+        if value && (mode.nil? || mode == :single)
           return {:search => "#{s.name} = \"#{value}\""}
-        elsif values
+        elsif values && (mode.nil? || mode == :multi)
           query = values.map{|v| "#{s.name} = \"#{v}\"" }.join(" or ")
           return {:search => query}
         end