hammer_cli_foreman 2.5.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a7510aa3b7250c6c467a18d128bc575f5a79f40c3a07283bb65def698e9c4cc
-  data.tar.gz: e5b1cbbd810d718b84f6a0102883bd4825880efe10250bbd8af1688966f209f1
+  metadata.gz: 87407ba2c43be96a076220e9500050007447596f6d14024932fa85a7c9046f20
+  data.tar.gz: 2987c54ab5fef04cc45629754a55c62d16a252b6cd950e7de461a989712a79ca
 SHA512:
-  metadata.gz: e4112d9f91de37bfac6af33daf9d6e31d58d880889d421a873147dd75ac151c981849b641a90eb3322ca27add6b9dc8596f5a7fd8f6f95e830e1ffb3b8d3c5a5
-  data.tar.gz: 137ee8f5c12f70577b438132a4b5c2a68bb12c0f54f06fbdf6ad4d6db4b514bdea654c6daf3f1150132061a4e519f43c3d75828df4b2ac1fd96e767be9f45894
+  metadata.gz: 030d7c3ff4d19fb767e771c123b8cb0de2a6166cec3ec2012b689f7d920d3049a234f7900ee43141c2af97ce0d5aaf403ea9a9f3962072bdffc181126de57e70
+  data.tar.gz: 6acaf9a9b06c59b4c7db28b73bdc7dfe31170ac3b621adb2b85a5a501090e310a4fcfc703e2b6dc48170a693ff675507b8b9c478a8c344ff7793bfe778a8f3f3

data/doc/release_notes.md

@@ -1,7 +1,37 @@
 Release notes
 =============
-### 2.5.1 (2021-06-08)
+### 3.2.0 (2022-02-10)
+* Domain update doesn't reset dns implicitly ([PR #591](https://github.com/theforeman/hammer-cli-foreman/pull/591)), [#34177](http://projects.theforeman.org/issues/34177)
+* Send filter's tax params only when required ([PR #592](https://github.com/theforeman/hammer-cli-foreman/pull/592)), [#34199](http://projects.theforeman.org/issues/34199)
+* Add boot_order to compute-attribute ([PR #588](https://github.com/theforeman/hammer-cli-foreman/pull/588)), [#33910](http://projects.theforeman.org/issues/33910)
+* Add mail_enabled to user list/info command ([PR #589](https://github.com/theforeman/hammer-cli-foreman/pull/589)), [#34180](http://projects.theforeman.org/issues/34180)
+* Add token to host info command ([PR #586](https://github.com/theforeman/hammer-cli-foreman/pull/586)), [#34120](http://projects.theforeman.org/issues/34120)
+* Bump to 3.2.0-develop
+
+### 3.1.0 (2021-11-10)
+* Update test data for 3.1
+* Make sure provided options override defaults, [#33711](http://projects.theforeman.org/issues/33711)
+* Make template create/update commands use resolver, [#33721](http://projects.theforeman.org/issues/33721)
+* Revert fix rake version
+* Fix rake version
+* Show status once for proxy info ([PR #581](https://github.com/theforeman/hammer-cli-foreman/pull/581)), [#19510](http://projects.theforeman.org/issues/19510)
+* Add proxy status and version to info command ([PR #572](https://github.com/theforeman/hammer-cli-foreman/pull/572))
+* Associate a vm via hammer to a compute resource, [#33047](http://projects.theforeman.org/issues/33047)
+* Fix option builders and tests, [#33226](http://projects.theforeman.org/issues/33226)
+* Bump to 3.1.0-develop
+* Add parent title option for hostgroup, [#32878](http://projects.theforeman.org/issues/32878)
+
+### 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/domain.rb

@@ -0,0 +1,20 @@
+module HammerCLIForeman
+  module CommandExtensions
+    class Domain < HammerCLI::CommandExtensions
+      option_sources do |sources, command|
+        sources.find_by_name('IdResolution').insert_relative(
+          :after,
+          'IdParams',
+          HammerCLIForeman::OptionSources::ReferencedResourceIdParams.new(command)
+        )
+        sources
+      end
+
+      option_family associate: 'dns' do
+        child '--dns', 'DNS_NAME', _('Name of DNS proxy to use within this domain'),
+              attribute_name: :option_dns_name,
+              referenced_resource: :smart_proxy
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/command_extensions/subnet.rb

@@ -1,16 +1,7 @@
 module HammerCLIForeman
   module CommandExtensions
     class Subnet < HammerCLI::CommandExtensions
-      option "--dns", "DNS_NAME", _("DNS Proxy to use within this subnet"),
-             attribute_name: :option_dns_name,
-             referenced_resource: :smart_proxy
-      option "--dhcp", "DHCP_NAME", _("DHCP Proxy to use within this subnet"),
-             attribute_name: :option_dhcp_name,
-             referenced_resource: :smart_proxy
-      option "--tftp", "TFTP_NAME", _("TFTP Proxy to use within this subnet"),
-             attribute_name: :option_tftp_name,
-             referenced_resource: :smart_proxy
-      option "--prefix", "PREFIX", _("Network prefix in CIDR notation (e.g. 64) for this subnet")
+      option '--prefix', 'PREFIX', _('Network prefix in CIDR notation (e.g. 64) for this subnet')
 
       option_sources do |sources, command|
         sources.find_by_name('IdResolution').insert_relative(
@@ -20,6 +11,30 @@ module HammerCLIForeman
         )
         sources
       end
+
+      option_family associate: 'tftp' do
+        child '--tftp', 'TFTP_NAME', _('TFTP Proxy to use within this subnet'),
+              attribute_name: :option_tftp_name,
+              referenced_resource: :smart_proxy
+      end
+
+      option_family associate: 'dns' do
+        child '--dns', 'DNS_NAME', _('DNS Proxy to use within this subnet'),
+              attribute_name: :option_dns_name,
+              referenced_resource: :smart_proxy
+      end
+
+      option_family associate: 'dhcp' do
+        child '--dhcp', 'DHCP_NAME', _('DHCP Proxy to use within this subnet'),
+              attribute_name: :option_dhcp_name,
+              referenced_resource: :smart_proxy
+      end
+
+      option_family associate: 'bmc' do
+        child '--bmc', 'BMC_NAME', _('BMC Proxy to use within this subnet'),
+              attribute_name: :option_bmc_name,
+              referenced_resource: :smart_proxy
+      end
     end
   end
 end

data/lib/hammer_cli_foreman/command_extensions/user.rb

@@ -1,17 +1,21 @@
 module HammerCLIForeman
   module CommandExtensions
     class User < HammerCLI::CommandExtensions
-      option '--default-organization', 'DEFAULT_ORGANIZATION_NAME', _('Default organization name'),
-             aliased_resource: 'default_organization', referenced_resource: 'default_organization'
-      option '--default-location', 'DEFAULT_LOCATION_NAME', _('Default location name'),
-             aliased_resource: 'default_location', referenced_resource: 'default_location'
-
       option '--ask-password', 'ASK_PW', ' ', format: HammerCLI::Options::Normalizers::Bool.new
 
       option_sources do |sources, command|
         sources << HammerCLIForeman::OptionSources::UserParams.new(command)
         sources
       end
+
+      option_family associate: 'default_organization' do
+        child '--default-organization', 'DEFAULT_ORGANIZATION_NAME', _('Default organization name'),
+              aliased_resource: 'default_organization', referenced_resource: 'organization'
+      end
+      option_family associate: 'default_location' do
+        child '--default-location', 'DEFAULT_LOCATION_NAME', _('Default location name'),
+              aliased_resource: 'default_location', referenced_resource: 'location'
+      end
     end
   end
 end

data/lib/hammer_cli_foreman/command_extensions.rb

@@ -1,10 +1,9 @@
 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'
 require 'hammer_cli_foreman/command_extensions/status'
 require 'hammer_cli_foreman/command_extensions/user'
 require 'hammer_cli_foreman/command_extensions/subnet'
+require 'hammer_cli_foreman/command_extensions/domain'

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
@@ -104,9 +97,8 @@ module HammerCLIForeman
       configurator = BuilderConfigurator.new(searchables, dependency_resolver)
 
       builder = ForemanOptionBuilder.new(searchables)
-      builder.builders = []
+      builder.builders = super.builders
       builder.builders += configurator.builders_for(resource, resource.action(action)) if resource_defined?
-      builder.builders += super.builders
       builder
     end
 
@@ -294,7 +286,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_attribute.rb

@@ -12,7 +12,7 @@ module HammerCLIForeman
       profile = HammerCLIForeman.record_to_common_format(
           HammerCLIForeman.foreman_resource(:compute_profiles).call(:show, 'id' => options['option_compute_profile_id'] )
       )
-      params['compute_attribute'] = profile['compute_attributes'].select { |hash| hash['compute_resource_id'] == options['option_compute_resource_id']}[0] || {}
+      params['compute_attribute'] = profile['compute_attributes'].select { |hash| hash['compute_resource_id'].to_s == options['option_compute_resource_id'].to_s}[0] || {}
       params['compute_attribute'].delete('attributes') if params['compute_attribute']['attributes']
       params
     end

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/compute_resource/libvirt.rb

@@ -9,7 +9,8 @@ module HammerCLIForeman
         [
           ['cpus',   _('Number of CPUs'), { bold: true }],
           ['memory', _('String, amount of memory, value in bytes'), { bold: true }],
-          ['cpu_mode', _('Possible values: %{modes}') % { modes: 'default, host-model, host-passthrough' }]
+          ['cpu_mode', _('Possible values: %{modes}') % { modes: 'default, host-model, host-passthrough' }],
+          ['boot_order', _('Device names to specify the boot order')]
         ]
       end
 
@@ -48,7 +49,8 @@ module HammerCLIForeman
             Fields::Field.new(:label => _('Status'), :path => [:state]),
             Fields::Field.new(:label => _('OS Type'), :path => [:os_type]),
             Fields::Field.new(:label => _('Domain Type'), :path => [:domain_type]),
-            Fields::Field.new(:label => _('Persistent'), :path => [:persistent])
+            Fields::Field.new(:label => _('Persistent'), :path => [:persistent]),
+            Fields::List.new(:label => _('Boot order'), :path => [:boot_order])
         ]
       end
 

data/lib/hammer_cli_foreman/compute_resource/vmware.rb

@@ -25,7 +25,8 @@ module HammerCLIForeman
           ['scsi_controllers',     [_('List with SCSI controllers definitions'),
                                     '  type - ' + _('ID of the controller from VMware'),
                                     '  key  - ' + _('Key of the controller (e.g. 1000)')
-                                    ].flatten(1).join("\n")]
+                                    ].flatten(1).join("\n")],
+          ['boot_order',            _('Device names to specify the boot order')]
         ]
       end
 
@@ -76,7 +77,8 @@ module HammerCLIForeman
             Fields::Field.new(:label => _('Connection Status'), :path => [:connection_status]),
             Fields::Field.new(:label => _('Hardware Version'), :path => [:hardware_version]),
             Fields::Field.new(:label => _('Path'), :path => [:path]),
-            Fields::Field.new(:label => _('Operating System'), :path => [:operatingsystem])
+            Fields::Field.new(:label => _('Operating System'), :path => [:operatingsystem]),
+            Fields::List.new(:label => _('Boot order'), :path => [:boot_order])
         ]
       end
 

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -107,6 +107,7 @@ module HammerCLIForeman
     class AssociateVmsCommand < HammerCLIForeman::Command
       action :associate
       command_name 'associate-vms'
+      option "--vm-id","VM ID", _("Associate a specific VM")
       success_message _("Virtual machines have been associated.")
       failure_message _("Could not associate the virtual machines")
 

data/lib/hammer_cli_foreman/domain.rb

@@ -1,28 +1,5 @@
 module HammerCLIForeman
-
-  module DomainUpdateCreateCommons
-
-    def self.included(base)
-      base.option "--dns-id", "DNS_ID",  _("ID of DNS proxy to use within this domain")
-      base.option "--dns", "DNS_NAME", _("Name of DNS proxy to use within this domain")
-    end
-
-    def request_params
-      params = super
-      params['domain']["dns_id"] = option_dns_id || dns_id(option_dns)
-      params
-    end
-
-    private
-
-    def dns_id(name)
-      resolver.smart_proxy_id('option_name' => name) if name
-    end
-
-  end
-
   class Domain < HammerCLIForeman::Command
-
     resource :domains
 
     class ListCommand < HammerCLIForeman::ListCommand
@@ -52,24 +29,24 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      include DomainUpdateCreateCommons
-
       success_message _("Domain [%{name}] created.")
       failure_message _("Could not create the domain")
 
       option "--description", "DESC", _("Full name describing the domain"), :attribute_name => :option_fullname
-      build_options :without => [:domain_parameters_attributes, :fullname, :dns_id]
+      build_options :without => [:domain_parameters_attributes, :fullname]
+
+      extend_with(HammerCLIForeman::CommandExtensions::Domain.new)
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      include DomainUpdateCreateCommons
-
       success_message _("Domain [%{name}] updated.")
       failure_message _("Could not update the domain")
 
       option "--description", "DESC", _("Full name describing the domain"), :attribute_name => :option_fullname
       build_options :without => [:domain_parameters_attributes, :fullname]
+
+      extend_with(HammerCLIForeman::CommandExtensions::Domain.new)
     end
 
 

data/lib/hammer_cli_foreman/filter.rb

@@ -97,10 +97,10 @@ module HammerCLIForeman
 
       def request_params
         params = super
-        if !override?
+        unless override?
           # Clear taxonomies in case the filter is switching override from true to false
-          params['filter']['location_ids'] = []
-          params['filter']['organization_ids'] = []
+          params['filter']['location_ids'] = [] if !@filter || !@filter['locations'].empty?
+          params['filter']['organization_ids'] = [] if !@filter || !@filter['organizations'].empty?
         end
         params
       end

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,10 +54,8 @@ 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 :token, _("Token")
         field :managed, _("Managed"), Fields::Boolean
 
         field :installed_at, _("Installed at"), Fields::Date
@@ -191,23 +185,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 +270,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 +300,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 +432,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"