hammer_cli_foreman 2.5.1 → 3.2.0

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -1,28 +1,22 @@
-require 'hammer_cli_foreman/smart_class_parameter'
-require 'hammer_cli_foreman/puppet_class'
-
 module HammerCLIForeman
 
   module HostgroupUpdateCreateCommons
 
     def self.included(base)
-      base.option "--puppet-class-ids", "PUPPETCLASS_IDS", _("List of puppetclass 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-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-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.option '--root-password', 'ROOT_PASSWORD', _('Root password')
+      base.option '--ask-root-password', 'ASK_ROOT_PW', '',
+                  format: HammerCLI::Options::Normalizers::Bool.new
 
       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
@@ -32,10 +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']["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
-
+      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
 
@@ -61,7 +53,6 @@ module HammerCLIForeman
         field :name, _("Name")
         field :title, _("Title")
         field nil, _("Operating System"), Fields::SingleReference, :key => :operatingsystem
-        field nil, _("Puppet Environment"), Fields::SingleReference, :key => :environment
         field nil, _("Model"), Fields::SingleReference, :key => :model
       end
 
@@ -75,13 +66,10 @@ module HammerCLIForeman
         field :id, _("Id")
         field :name, _("Name")
         field :title, _("Title")
-        field nil, _("Puppet Environment"), Fields::SingleReference, :key => :environment
         field nil, _("Model"), Fields::SingleReference, :key => :model
 
         field :description, _("Description"), Fields::LongText, :hide_blank => true
         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, _("Compute Profile"), Fields::SingleReference, :key => :compute_profile
 	field nil, _("Compute Resource"), Fields::SingleReference, :key => :compute_resource
         label _('Network') do
@@ -97,7 +85,6 @@ module HammerCLIForeman
           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)
       end
@@ -111,8 +98,6 @@ module HammerCLIForeman
 
       success_message _("Hostgroup created.")
       failure_message _("Could not create the hostgroup")
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 
@@ -121,8 +106,6 @@ module HammerCLIForeman
 
       success_message _("Hostgroup updated.")
       failure_message _("Could not update the hostgroup")
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 
@@ -133,24 +116,6 @@ module HammerCLIForeman
       build_options
     end
 
-
-    class PuppetClassesCommand < HammerCLIForeman::ListCommand
-      command_name "puppet-classes"
-      resource :puppetclasses
-
-      output HammerCLIForeman::PuppetClass::ListCommand.output_definition
-
-      def send_request
-        HammerCLIForeman::PuppetClass::ListCommand.unhash_classes(super)
-      end
-
-      build_options do |o|
-        o.without(:host_id, :environment_id)
-        o.expand.only(:hostgroups)
-      end
-    end
-
-
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
       desc _("Create or update parameter for a hostgroup")
 
@@ -170,15 +135,6 @@ module HammerCLIForeman
       build_options
     end
 
-    class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
-      build_options_for :hostgroups
-
-      def validate_options
-        super
-        validator.any(:option_hostgroup_name, :option_hostgroup_id).required
-      end
-    end
-
     class RebuildConfigCommand < HammerCLIForeman::SingleResourceCommand
       action :rebuild_config
       command_name "rebuild-config"

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -3,33 +3,18 @@ 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")
 
         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 +41,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 +54,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?
@@ -134,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

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -1,14 +1,12 @@
 module HammerCLIForeman
 
   class Searchable
-    attr_reader :name, :description, :format
+    attr_reader :name, :description
 
     def initialize(name, description, options={})
       @name = name
       @description = description
       @editable = options[:editable].nil? ? true : options[:editable]
-      @format = options[:format]
-      @parent = options[:parent]
     end
 
     def plural_name
@@ -18,10 +16,6 @@ module HammerCLIForeman
     def editable?
       @editable
     end
-
-    def parent?
-      @parent
-    end
   end
 
   class Searchables
@@ -42,8 +36,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 +58,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 +65,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,49 +119,17 @@ 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)
     end
 
+    def template_kind_id(options = {})
+      name = options['option_type'] == 'snippet' ? nil : options['option_type']
+      options['option_name'] = name
+      get_id(:template_kinds, options)
+    end
+
     protected
 
     def define_id_finders
@@ -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