hammer_cli_foreman 2.5.1 → 3.0.0

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -14,22 +14,6 @@ module HammerCLIForeman
         base.option "--ask-root-password", "ASK_ROOT_PW", " ",
           :format => HammerCLI::Options::Normalizers::Bool.new
 
-        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
 
@@ -56,7 +40,7 @@ module HammerCLIForeman
               :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]
+              :host_parameters_attributes, :interfaces_attributes, :root_pass]
       end
 
       def self.ask_password
@@ -69,12 +53,6 @@ module HammerCLIForeman
         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)
-        params['host']['puppet_proxy_id'] ||= puppet_proxy_id unless puppet_proxy_id.nil?
-
-        puppet_ca_proxy_id = proxy_id(option_puppet_ca_proxy)
-        params['host']['puppet_ca_proxy_id'] ||= puppet_ca_proxy_id unless puppet_ca_proxy_id.nil?
-
         if action == :create
           params['host']['build'] = true if option_build.nil?
           params['host']['managed'] = true if option_managed.nil?

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -42,8 +42,6 @@ module HammerCLIForeman
       :compute_resource => [ s_name(_("Compute resource name")) ],
       :compute_profile => [ s_name(_("Compute profile name")) ],
       :domain =>           [ s_name(_("Domain name")) ],
-      :environment =>        [s_name(_('Puppet environment name'))],
-      :puppet_environment => [s_name(_('Puppet environment name'))],
       :fact_value =>       [],
       :filter =>           [],
       :host =>             [ s_name(_("Host name")) ],
@@ -66,7 +64,6 @@ module HammerCLIForeman
       :override_value =>   [],
       :ptable =>           [ s_name(_("Partition table name")) ],
       :proxy =>            [ s_name(_("Proxy name")) ],
-      :puppetclass =>      [ s_name(_("Puppet class name")) ],
       :config_report =>    [],
       :role =>             [ s_name(_("User role name")) ],
       :setting =>          [ s_name(_("Setting name"), :editable => false) ],
@@ -74,7 +71,6 @@ module HammerCLIForeman
       :template =>         [],
       :user =>             [ s("login", _("User's login to search by")) ],
       :common_parameter =>      [ s_name(_("Common parameter name")) ],
-      :smart_class_parameter => [ s_name(_("Smart class parameter name"), :editable => false) ],
       :template_combination => [],
       :compute_attribute => []
     }
@@ -129,44 +125,6 @@ module HammerCLIForeman
       scoped_options
     end
 
-    def puppetclass_ids(options)
-      resource_name = :puppetclasses
-      resource = @api.resource(resource_name)
-      results = if (ids = options[HammerCLI.option_accessor_name("ids")])
-        ids
-      elsif (ids = nil_from_searchables(resource_name, options, :plural => true))
-        ids
-      elsif options_not_set?(resource, options)
-        raise MissingSearchOptions.new(_("Missing options to search %s") % resource.name, resource)
-      elsif options_empty?(resource, options)
-        []
-      else
-        require('hammer_cli_foreman/puppet_class')
-        results = HammerCLIForeman::PuppetClass::ListCommand.unhash_classes(
-          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, :multi)
-
-        results.map { |r| r['id'] }
-      end
-    end
-
-    def environment_id(options)
-      puppet_environment_id(options)
-    end
-
-    def puppet_environment_id(options)
-      get_id(:environments, options)
-    end
-
-    def environment_ids(options)
-      puppet_environment_ids(options)
-    end
-
-    def puppet_environment_ids(options)
-      get_ids(:environments, options)
-    end
-
     def searchables(resource)
       resource = @api.resource(resource) if resource.is_a? Symbol
       @searchables.for(resource)
@@ -331,17 +289,6 @@ module HammerCLIForeman
       0
     end
 
-    # puppet class search results are in non-standard format
-    # and needs to be un-hashed first
-    def puppetclass_id(options)
-      return options[HammerCLI.option_accessor_name("id")] if options[HammerCLI.option_accessor_name("id")]
-      resource = @api.resource(:puppetclasses)
-      results = find_resource_raw(:puppetclasses, options)
-      require('hammer_cli_foreman/puppet_class')
-      results = HammerCLIForeman::PuppetClass::ListCommand.unhash_classes(results)
-      pick_result(results, resource)['id']
-    end
-
     def options_empty?(resource, options)
       searchables(resource).all? do |s|
         values = options[HammerCLI.option_accessor_name(s.plural_name.to_s)]
@@ -356,14 +303,6 @@ module HammerCLIForeman
       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}\""
-      search_options[:puppetclass_id] = puppetclass_id(scoped_options("puppetclass", options))
-      search_options
-    end
-
     # @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|

data/lib/hammer_cli_foreman/location.rb

@@ -36,7 +36,6 @@ module HammerCLIForeman
         HammerCLIForeman::References.partition_tables(self)
         HammerCLIForeman::References.domains(self)
         HammerCLIForeman::References.realms(self)
-        HammerCLIForeman::References.environments(self)
         HammerCLIForeman::References.hostgroups(self)
         HammerCLIForeman::References.parameters(self)
         collection :organizations, _("Organizations"), :numbered => false, :hide_blank => true do
@@ -58,8 +57,6 @@ module HammerCLIForeman
       failure_message _("Could not create the location")
 
       build_options
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironments.new)
     end
 
 
@@ -72,8 +69,6 @@ module HammerCLIForeman
       failure_message _("Could not update the location")
 
       build_options
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironments.new)
     end
 
 
@@ -112,7 +107,6 @@ module HammerCLIForeman
     end
 
     HammerCLIForeman::AssociatingCommands::Hostgroup.extend_command(self)
-    HammerCLIForeman::AssociatingCommands::PuppetEnvironment.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Domain.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Medium.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Subnet.extend_command(self)

data/lib/hammer_cli_foreman/mail_notification.rb

@@ -11,7 +11,7 @@ module HammerCLIForeman
         field :name, _("Name")
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -22,7 +22,7 @@ module HammerCLIForeman
         field :subscription_type, _("Subscription type")
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     autoload_subcommands

data/lib/hammer_cli_foreman/model.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :hardware_model, _("HW model")
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -23,7 +23,7 @@ module HammerCLIForeman
         HammerCLIForeman::References.timestamps(self)
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -31,14 +31,14 @@ module HammerCLIForeman
       success_message _("Hardware model created.")
       failure_message _("Could not create the hardware model")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _("Hardware model deleted.")
       failure_message _("Could not delete the hardware model")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -46,7 +46,7 @@ module HammerCLIForeman
       success_message _("Hardware model updated.")
       failure_message _("Could not update the hardware model")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 

data/lib/hammer_cli_foreman/operating_system.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :family, _("Family")
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -36,7 +36,7 @@ module HammerCLIForeman
         HammerCLIForeman::References.parameters(self)
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -44,7 +44,7 @@ module HammerCLIForeman
       success_message _("Operating system created.")
       failure_message _("Could not create the operating system")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -52,7 +52,7 @@ module HammerCLIForeman
       success_message _("Operating system updated.")
       failure_message _("Could not update the operating system")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -60,7 +60,7 @@ module HammerCLIForeman
       success_message _("Operating system deleted.")
       failure_message _("Could not delete the operating system")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -76,7 +76,7 @@ module HammerCLIForeman
         validator.any(:option_operatingsystem_id, :option_operatingsystem_title).required
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -90,7 +90,7 @@ module HammerCLIForeman
         validator.any(:option_operatingsystem_id, :option_operatingsystem_title).required
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -156,8 +156,8 @@ module HammerCLIForeman
         HammerCLI::EX_OK
       end
 
-      build_options expand: { except: %i[organizations locations] },
-                    without: %i[organization_id location_id template_kind_id type]
+      build_options without: [:template_kind_id, :type]
+
     end
 
 
@@ -192,7 +192,7 @@ module HammerCLIForeman
         {"operatingsystem_id" => option_id}
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 

data/lib/hammer_cli_foreman/option_sources.rb

@@ -3,6 +3,5 @@ require 'hammer_cli_foreman/option_sources/ids_params'
 require 'hammer_cli_foreman/option_sources/self_param'
 require 'hammer_cli_foreman/option_sources/user_params'
 require 'hammer_cli_foreman/option_sources/fields_params'
-require 'hammer_cli_foreman/option_sources/puppet_environment_params'
 require 'hammer_cli_foreman/option_sources/new_params'
 require 'hammer_cli_foreman/option_sources/referenced_resource_id_params'

data/lib/hammer_cli_foreman/option_sources/id_params.rb

@@ -13,22 +13,39 @@ module HammerCLIForeman
         IdParamsFilter.new(:only_required => false).for_action(@command.resource.action(@command.action))
       end
 
-      def get_options(defined_options, result)
+      def needs_resolving?(param_option, param_resource, all_opts)
+        return false unless param_updatable?(param_resource)
+
+        searchables_set = @command.searchables.for(param_resource).any? do |s|
+          option = HammerCLI.option_accessor_name("#{param_resource.singular_name}_#{s.name}")
+          !all_opts[option].nil?
+        end
+        return all_opts[param_option].nil? unless searchables_set
+
+        # Remove set '<resource_name>_id' option to force resolving in case of
+        # '<resource_name>_[name|title]' was set
+        all_opts.delete(param_option)
+        true
+      end
+
+      def get_options(_defined_options, result)
         # resolve all '<resource_name>_id' parameters if they are defined as options
         # (they can be skipped using .without or .expand.except)
         return result if @command.action.nil?
+
         available_id_params.each do |api_param|
           param_resource = HammerCLIForeman.param_to_resource(api_param.name)
-          if result[HammerCLI.option_accessor_name(api_param.name)].nil? && param_updatable?(param_resource)
-            resource_id = @command.get_resource_id(param_resource, :scoped => true, :required => api_param.required?, :all_options => result)
-            result[HammerCLI.option_accessor_name(api_param.name)] = resource_id if resource_id
-          end
+          param_option = HammerCLI.option_accessor_name(api_param.name)
+          next unless needs_resolving?(param_option, param_resource, result)
+
+          resource_id = @command.get_resource_id(
+            param_resource, scoped: true, required: api_param.required?, all_options: result
+          )
+          result[param_option] = resource_id if resource_id
         end
         result
-
       rescue HammerCLIForeman::MissingSearchOptions => e
-
-        switches = @command.class.find_options(:referenced_resource => e.resource.singular_name).map(&:long_switch)
+        switches = @command.class.find_options(referenced_resource: e.resource.singular_name).map(&:long_switch)
 
         if switches.empty?
           error_message = _("Could not find %{resource}. Some search options were missing, please see --help.")
@@ -40,8 +57,8 @@ module HammerCLIForeman
 
         raise MissingSearchOptions.new(
           error_message % {
-            :resource => e.resource.singular_name,
-            :switches => switches.join(", ")
+            resource: e.resource.singular_name,
+            switches: switches.join(', ')
           },
           e.resource
         )

data/lib/hammer_cli_foreman/option_sources/ids_params.rb

@@ -13,15 +13,34 @@ module HammerCLIForeman
         IdArrayParamsFilter.new(:only_required => false).for_action(@command.resource.action(@command.action))
       end
 
-      def get_options(defined_options, result)
-        return result if @command.action.nil?
+      def needs_resolving?(param_option, param_resource, all_opts)
+        return false unless param_updatable?(param_resource)
+
+        searchables_set = @command.searchables.for(param_resource).any? do |s|
+          option = HammerCLI.option_accessor_name("#{param_resource.singular_name}_#{s.plural_name}")
+          !all_opts[option].nil?
+        end
+        return all_opts[param_option].nil? unless searchables_set
+
+        # Remove set '<resource_name>_ids' option to force resolving in case of
+        # '<resource_name>_[names|titles]' was set
+        all_opts.delete(param_option)
+        true
+      end
+
+      def get_options(_defined_options, result)
         # resolve all '<resource_name>_ids' parameters if they are defined as options
+        return result if @command.action.nil?
+
         available_ids_params.each do |api_param|
           param_resource = HammerCLIForeman.param_to_resource(api_param.name)
-          if result[HammerCLI.option_accessor_name(api_param.name)].nil? && param_updatable?(param_resource)
-            resource_ids = @command.get_resource_ids(param_resource, :scoped => true, :required => api_param.required?, :all_options => result)
-            result[HammerCLI.option_accessor_name(api_param.name)] = resource_ids if resource_ids
-          end
+          param_option = HammerCLI.option_accessor_name(api_param.name)
+          next unless needs_resolving?(param_option, param_resource, result)
+
+          resource_ids = @command.get_resource_ids(
+            param_resource, scoped: true, required: api_param.required?, all_options: result
+          )
+          result[param_option] = resource_ids if resource_ids
         end
         result
       end

data/lib/hammer_cli_foreman/organization.rb

@@ -36,7 +36,6 @@ module HammerCLIForeman
         HammerCLIForeman::References.partition_tables(self)
         HammerCLIForeman::References.domains(self)
         HammerCLIForeman::References.realms(self)
-        HammerCLIForeman::References.environments(self)
         HammerCLIForeman::References.hostgroups(self)
         HammerCLIForeman::References.parameters(self)
         collection :locations, _("Locations"), :numbered => false, :hide_blank => true do
@@ -59,8 +58,6 @@ module HammerCLIForeman
       failure_message _("Could not create the organization")
 
       build_options
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironments.new)
     end
 
 
@@ -73,8 +70,6 @@ module HammerCLIForeman
       failure_message _("Could not update the organization")
 
       build_options
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironments.new)
     end
 
 
@@ -114,7 +109,6 @@ module HammerCLIForeman
 
 
     HammerCLIForeman::AssociatingCommands::Hostgroup.extend_command(self)
-    HammerCLIForeman::AssociatingCommands::PuppetEnvironment.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Domain.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Medium.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Subnet.extend_command(self)