hammer_cli_foreman 2.5.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93d22f69396968e2647cc8efb573ec822089921f6aa70c61241a1f89dab81943
-  data.tar.gz: e057aef23b95de6e1c358415be115f6a9aa3c77baa5c53bf5d095ad12cfd6f4f
+  metadata.gz: 8287acd52ceb1bea84f8d518c3793d521d084ae771622ea7fc4dcccccd794a1b
+  data.tar.gz: b557d8fbbc7a451cd09084211c6e8a46a46ef3c198744cbb9c8dc7e861090e93
 SHA512:
-  metadata.gz: d5be068183ddf5f0f1f3288337fe9d7acbb8f42e441ac665ac89413ea08ea9d5728df3005153b1bb85534e6ecaeca3ae1911b34985a3a51831db32695265e96e
-  data.tar.gz: f8a21cba6a36e76a220c32ad9c2f1e73329773c949c9c968c921f86c13b2a20f0eec854f68ee2e0295aaa50e8f28128c93f98af48c838be2d2a2ae712a2046b2
+  metadata.gz: 283fd640422b5749f6dc9094907bb1c68e72cef15696704f4493f548dd23ca13bd1066fca15616996d4ff6ba48648d904f5633e3cc3305c30464fa9e22c8bf44
+  data.tar.gz: 94b81f8171c914bdd1435ad00a17c1b1606402bac1ab9b21ca3014056ed285029bc79fe2b0646630d964d3b4715bd94b42a67a35f5399cace731ec44c87e4ee8

data/doc/release_notes.md

@@ -1,10 +1,16 @@
 Release notes
 =============
-### 2.5.2 (2022-02-01)
-* Fix puppet-class command description ([PR #590](https://github.com/theforeman/hammer-cli-foreman/pull/590)), [#33438](http://projects.theforeman.org/issues/33438)
-
-### 2.5.1 (2021-06-08)
+### 3.0.0 (2021-08-04)
+* Puppet extraction ([PR #571](https://github.com/theforeman/hammer-cli-foreman/pull/571)), [#33174](http://projects.theforeman.org/issues/33174)
+* Update rel-eng notebook ([PR #573](https://github.com/theforeman/hammer-cli-foreman/pull/573))
+* Bump version to 3.0-develop
+* Deprecate root-pass and remove deprecation warning, [#22574](http://projects.theforeman.org/issues/22574)
+* Return org and loc options to all hammer commands ([PR #575](https://github.com/theforeman/hammer-cli-foreman/pull/575)), [#32872](http://projects.theforeman.org/issues/32872)
+*  prevent full-help from failure if apidoc not available ([PR #574](https://github.com/theforeman/hammer-cli-foreman/pull/574)), [#32861](http://projects.theforeman.org/issues/32861)
 * Show new msg for empty update commands, [#32454](http://projects.theforeman.org/issues/32454)
+* Remove --environment deprecations ([PR #569](https://github.com/theforeman/hammer-cli-foreman/pull/569)), [#28862](http://projects.theforeman.org/issues/28862)
+* Force name resolving due defaults, [#32392](http://projects.theforeman.org/issues/32392)
+* Bump to 2.6.0-develop
 
 ### 2.5.0 (2021-05-04)
 * Update test data to latest foreman

data/lib/hammer_cli_foreman/architecture.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
 
 
@@ -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,7 +31,7 @@ module HammerCLIForeman
       success_message _("Architecture created.")
       failure_message _("Could not create the architecture")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -39,7 +39,7 @@ module HammerCLIForeman
       success_message _("Architecture deleted.")
       failure_message _("Could not delete the architecture")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
 
@@ -47,7 +47,7 @@ module HammerCLIForeman
       success_message _("Architecture updated.")
       failure_message _("Could not update the architecture")
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     HammerCLIForeman::AssociatingCommands::OperatingSystem.extend_command(self)

data/lib/hammer_cli_foreman/associating_commands.rb

@@ -53,30 +53,6 @@ module HammerCLIForeman
       end
     end
 
-    module PuppetEnvironment
-      extend CommandExtension
-
-      class AddPuppetEnvironmentCommand < HammerCLIForeman::AddAssociatedCommand
-        associated_resource :environments
-        desc _('Associate a Puppet environment')
-
-        success_message _("The environment has been associated.")
-        failure_message _("Could not associate the environment")
-
-        extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
-      end
-
-      class RemovePuppetEnvironmentCommand < HammerCLIForeman::RemoveAssociatedCommand
-        associated_resource :environments
-        desc _('Disassociate a Puppet environment')
-
-        success_message _("The environment has been disassociated.")
-        failure_message _("Could not disassociate the environment")
-
-        extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
-      end
-    end
-
     module Domain
       extend CommandExtension
 

data/lib/hammer_cli_foreman/bookmark.rb

@@ -15,34 +15,34 @@ module HammerCLIForeman
         field :owner_type, _('Owner Type')
       end
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       output ListCommand.output_definition
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
       success_message _('Bookmark %<name>s created.')
       failure_message _('Failed to create %<name>s bookmark')
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       success_message _('Bookmark %<name>s updated successfully.')
       failure_message _('Failed to update %<name>s bookmark')
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _('Bookmark deleted successfully.')
       failure_message _('Failed to delete bookmark')
 
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     autoload_subcommands

data/lib/hammer_cli_foreman/combination.rb

@@ -6,8 +6,7 @@ module HammerCLIForeman
 
     module RequestParams
       def request_params
-        combination_params = { 'hostgroup_id' => params['hostgroup_id'].to_s,
-                               'environment_id' => params['environment_id'].to_s }
+        combination_params = { 'hostgroup_id' => params['hostgroup_id'].to_s }
         super.merge('template_combination' => combination_params)
       end
     end
@@ -21,8 +20,6 @@ module HammerCLIForeman
         field :provisioning_template_name, _('Provisioning template name')
         field :hostgroup_id, _('Hostgroup ID')
         field :hostgroup_name, _('Hostgroup name')
-        field :environment_id, _('Environment ID')
-        field :environment_name, _('Environment name')
 
         HammerCLIForeman::References.taxonomies(self)
         HammerCLIForeman::References.timestamps(self)
@@ -31,8 +28,6 @@ module HammerCLIForeman
       build_options do |o|
         o.expand(:all)
       end
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
     class ListCombination < HammerCLIForeman::ListCommand
@@ -40,12 +35,11 @@ module HammerCLIForeman
         field :id, _('ID')
         field nil, _('Provisioning Template'), Fields::SingleReference, :key => :provisioning_template
         field nil, _('Hostgroup'), Fields::SingleReference, :key => :hostgroup
-        field nil, _('Environment'), Fields::SingleReference, :key => :environment
       end
 
       build_options do |o|
-        o.expand(:all).except(:hostgroups, :environments)
-        o.without(:hostgroup_id, :environment_id)
+        o.expand(:all).except(:hostgroups)
+        o.without(:hostgroup_id)
       end
     end
 
@@ -58,8 +52,6 @@ module HammerCLIForeman
       build_options do |o|
         o.expand(:all)
       end
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
     class CreateCombination < HammerCLIForeman::CreateCommand
@@ -71,8 +63,6 @@ module HammerCLIForeman
       build_options do |o|
         o.expand(:all)
       end
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
     class DeleteCombination < HammerCLIForeman::DeleteCommand

data/lib/hammer_cli_foreman/command_extensions.rb

@@ -1,7 +1,5 @@
 require 'hammer_cli_foreman/command_extensions/update_common'
 require 'hammer_cli_foreman/command_extensions/fields'
-require 'hammer_cli_foreman/command_extensions/puppet_environment'
-require 'hammer_cli_foreman/command_extensions/puppet_environments'
 require 'hammer_cli_foreman/command_extensions/option_sources'
 require 'hammer_cli_foreman/command_extensions/hosts'
 require 'hammer_cli_foreman/command_extensions/ping'

data/lib/hammer_cli_foreman/commands.rb

@@ -7,16 +7,9 @@ module HammerCLIForeman
     :usergroups => :user_groups,
     :ptable => :partition_table,
     :ptables => :partition_tables,
-    :puppetclass => :puppet_class,
-    :puppetclasses => :puppet_classes,
-    :environment => :puppet_environment,
-    :environments => :puppet_environments
   }
 
-  RESOURCE_ALIAS_NAME_MAPPING = {
-    environment: :puppet_environment,
-    environments: :puppet_environments
-  }
+  RESOURCE_ALIAS_NAME_MAPPING = { }
 
   def self.foreman_api
     foreman_api_connection
@@ -294,7 +287,7 @@ module HammerCLIForeman
     def help
       return super unless resource
 
-      meta = resource.action(action).apidoc[:metadata]
+      meta = resource.action(action).apidoc&.dig(:metadata)
       if meta && meta[:search] && respond_to?(:option_search)
         self.class.extend_help do |h|
           h.section(_('Search / Order fields'), id: :search_fields_section) do |h|

data/lib/hammer_cli_foreman/compute_profile.rb

@@ -9,7 +9,7 @@ module HammerCLIForeman
         field :id, _('Id')
         field :name, _('Name')
       end
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -25,13 +25,13 @@ module HammerCLIForeman
           field :vm_attrs, _('VM attributes')
         end
       end
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
       success_message _('Compute profile created.')
       failure_message _('Could not create a compute profile')
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
@@ -40,7 +40,7 @@ module HammerCLIForeman
       validate_options do
         any(:option_name,:option_id).required
       end
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
@@ -49,7 +49,7 @@ module HammerCLIForeman
       validate_options do
         any(:option_name,:option_id).required
       end
-      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
+      build_options
     end
 
     lazy_subcommand('values', _("Create update and delete Compute profile values"),

data/lib/hammer_cli_foreman/host.rb

@@ -1,7 +1,5 @@
 require 'hammer_cli_foreman/fact'
 require 'hammer_cli_foreman/config_report'
-require 'hammer_cli_foreman/puppet_class'
-require 'hammer_cli_foreman/smart_class_parameter'
 require 'hammer_cli_foreman/interface'
 require 'hammer_cli_foreman/hosts/common_update_options'
 require 'hammer_cli_foreman/compute_resource/register_compute_resources'
@@ -31,8 +29,6 @@ module HammerCLIForeman
       end
 
       build_options :without => [:include]
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 
@@ -58,9 +54,6 @@ 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, _("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
 
@@ -191,23 +184,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(:hostgroup_id, :environment_id)
-        o.expand.only(:hosts)
-      end
-    end
-
     class ConfigReportsCommand < HammerCLIForeman::ListCommand
       command_name 'config-reports'
       resource :config_reports, :index
@@ -293,7 +269,6 @@ module HammerCLIForeman
         end
       end
 
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
       extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::Interfaces.new)
       extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.custom(add_host_specific_attrs: true).new)
     end
@@ -324,7 +299,6 @@ module HammerCLIForeman
         sources
       end
 
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
       extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::Interfaces.new)
       extend_with(HammerCLIForeman::CommandExtensions::Hosts::Help::ComputeResources.custom(add_host_specific_attrs: true).new)
     end
@@ -457,15 +431,6 @@ module HammerCLIForeman
       build_options without: [:power_action]
     end
 
-    class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
-      build_options_for :hosts
-
-      def validate_options
-        super
-        validator.any(:option_host_name, :option_host_id).required
-      end
-    end
-
     class RebuildConfigCommand < HammerCLIForeman::SingleResourceCommand
       action :rebuild_config
       command_name "rebuild-config"

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -1,25 +1,12 @@
-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 ["--root-password"], "ROOT_PASSWORD",  _("Root password")
       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") }
+                  format: HammerCLI::Options::Normalizers::Bool.new
       base.option "--subnet6", "SUBNET6_NAME", _("Subnet IPv6 name")
 
       base.build_options without: %i[root_pass]
@@ -33,8 +20,6 @@ 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']['root_pass'] = option_root_password if option_root_password
       params['hostgroup']['root_pass'] = HammerCLIForeman::HostgroupUpdateCreateCommons::ask_password if option_ask_root_password
@@ -61,7 +46,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 +59,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 +78,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 +91,6 @@ module HammerCLIForeman
 
       success_message _("Hostgroup created.")
       failure_message _("Could not create the hostgroup")
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 
@@ -121,8 +99,6 @@ module HammerCLIForeman
 
       success_message _("Hostgroup updated.")
       failure_message _("Could not update the hostgroup")
-
-      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 
@@ -133,24 +109,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 +128,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

@@ -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|