hammer_cli_foreman 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 879dc32762958668d6e95ffb5ff7ba04222b42be763aad77bd00045763074d45
-  data.tar.gz: 75334fc224d49d58d2b0f3ff9b420db02fa25d84df2f8595736e4fe92872fdcf
+  metadata.gz: bf971111e45df5faaf2deeb304771676bcfa6e8de748e84f094725d309dc2e5b
+  data.tar.gz: 7de28c7b33572b008e5e40eeb417b95f446015a3052c46e888837ae20d5c2af4
 SHA512:
-  metadata.gz: 6e0f879c792cadf51b3a53fcac50297f5620a203b1a7e2d0c85df655926f29da00f5452734a79e79f000fb3ab030ff3058cf569e3339c5991d942a2fb2145d20
-  data.tar.gz: 46800432d77b3cea0c324995b5cd4ba3a49d69bde6f6d4ba2fc6bd0e1b7c2a69f7ed6148f3489ba3a7912f2742396844a31666a29ea71076598f956349ccafa6
+  metadata.gz: 5f3df104c1d2555838f0012819795156bbb9a06de830bc18e5ec85537756f9f0520ac3475acc852a1bfcda7846986327280b2f1355f83853bc79f9cf1d58f446
+  data.tar.gz: c273ec8d72e082eba1fd6b81c0312cdc7eb3f0ea0412db12d035b1ede224448ed65d290f6f666f5cc06fe7565dfa2f8724e959965afa526d70098845fd1f2a09

data/doc/host_create.md

@@ -39,8 +39,6 @@ Options:
  --domain-id DOMAIN_ID                                         Numerical ID or domain name
  --enabled ENABLED                                             Include this host within Foreman reporting
                                                                One of true/false, yes/no, 1/0.
- --environment ENVIRONMENT_NAME                                Environment name
- --environment-id ENVIRONMENT_ID                                
  --hostgroup HOSTGROUP_NAME                                    Hostgroup name
  --hostgroup-id HOSTGROUP_ID                                    
  --hostgroup-title HOSTGROUP_TITLE                             Hostgroup title
@@ -96,6 +94,8 @@ Options:
  --puppet-ca-proxy-id PUPPET_CA_PROXY_ID                       Puppet CA proxy ID
  --puppet-class-ids PUPPET_CLASS_IDS                           Comma separated list of values. Values containing comma should be quoted or escaped with backslash
  --puppet-classes PUPPET_CLASS_NAMES                           Comma separated list of values. Values containing comma should be quoted or escaped with backslash
+ --puppet-environment PUPPET_ENVIRONMENT_NAME                  Puppet Environment name
+ --puppet-environment-id PUPPET_ENVIRONMENT_ID                                
  --puppet-proxy PUPPET_PROXY_NAME                               
  --puppet-proxy-id PUPPET_PROXY_ID                             Puppet proxy ID
  --pxe-loader PXE_LOADER                                       DHCP filename option (Grub2/PXELinux by default)

data/doc/release_notes.md

@@ -1,5 +1,10 @@
 Release notes
 =============
+### 0.17.1 (2019-07-10)
+* Consistent puppet environment naming in hammer ([#23204](http://projects.theforeman.org/issues/23204))
+* Create hostgroup with puppet classes ([#24717](http://projects.theforeman.org/issues/24717))
+* Fix help on commands with no resource ([#26865](http://projects.theforeman.org/issues/26865))
+
 ### 0.17.0 (2019-04-24)
 * Add public key option in create compute resource CLI ([#25491](http://projects.theforeman.org/issues/25491))
 * Background template rendering ([PR #414](https://github.com/theforeman/hammer-cli-foreman/pull/414)) ([#26355](http://projects.theforeman.org/issues/26355))

data/lib/hammer_cli_foreman.rb

@@ -22,6 +22,7 @@ module HammerCLIForeman
   require 'hammer_cli_foreman/logger'
 
   begin
+    require 'hammer_cli_foreman/command_extensions'
     require 'hammer_cli_foreman/commands'
     require 'hammer_cli_foreman/associating_commands'
     require 'hammer_cli_foreman/references'
@@ -58,7 +59,12 @@ module HammerCLIForeman
     )
 
     HammerCLI::MainCommand.lazy_subcommand('environment', _("Manipulate environments"),
-      'HammerCLIForeman::Environment', 'hammer_cli_foreman/environment'
+      'HammerCLIForeman::PuppetEnvironment', 'hammer_cli_foreman/puppet_environment',
+      :warning => _('%{env} command is deprecated and will be removed in one of the future versions. Please use %{puppet_env} command instead.') % {:env => 'environment', :puppet_env => 'puppet-environment'}
+    )
+
+    HammerCLI::MainCommand.lazy_subcommand('puppet-environment', _("Manipulate Puppet environments"),
+      'HammerCLIForeman::PuppetEnvironment', 'hammer_cli_foreman/puppet_environment'
     )
 
     HammerCLI::MainCommand.lazy_subcommand('fact', _("Search facts"),

data/lib/hammer_cli_foreman/associating_commands.rb

@@ -53,23 +53,27 @@ module HammerCLIForeman
       end
     end
 
-    module Environment
+    module PuppetEnvironment
       extend CommandExtension
 
-      class AddEnvironmentCommand < HammerCLIForeman::AddAssociatedCommand
+      class AddPuppetEnvironmentCommand < HammerCLIForeman::AddAssociatedCommand
         associated_resource :environments
-        desc _("Associate an environment")
+        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 RemoveEnvironmentCommand < HammerCLIForeman::RemoveAssociatedCommand
+      class RemovePuppetEnvironmentCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource :environments
-        desc _("Disassociate an environment")
+        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
 
@@ -372,5 +376,3 @@ module HammerCLIForeman
 
   end
 end
-
-

data/lib/hammer_cli_foreman/combination.rb

@@ -58,6 +58,8 @@ module HammerCLIForeman
         o.expand(:all).except(:config_templates,)
         o.without(:config_template_id)
       end
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
     class CreateCombination < HammerCLIForeman::CreateCommand
@@ -70,6 +72,8 @@ module HammerCLIForeman
         o.expand(:all).except(:config_templates,)
         o.without(:config_template_id)
       end
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
     class DeleteCombination < HammerCLIForeman::DeleteCommand

data/lib/hammer_cli_foreman/command_extensions.rb

@@ -0,0 +1,3 @@
+require 'hammer_cli_foreman/command_extensions/puppet_environment'
+require 'hammer_cli_foreman/command_extensions/puppet_environments'
+require 'hammer_cli_foreman/command_extensions/option_sources'

data/lib/hammer_cli_foreman/command_extensions/option_sources.rb

@@ -0,0 +1,16 @@
+module HammerCLIForeman
+  module CommandExtensions
+    class OptionSources < HammerCLI::CommandExtensions
+      inheritable true
+
+      option_sources do |sources, command|
+        id_resolution = HammerCLI::Options::ProcessorList.new(name: 'IdResolution')
+        id_resolution << HammerCLIForeman::OptionSources::IdParams.new(command)
+        id_resolution << HammerCLIForeman::OptionSources::IdsParams.new(command)
+        id_resolution << HammerCLIForeman::OptionSources::SelfParam.new(command)
+
+        sources << id_resolution
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/command_extensions/puppet_environment.rb

@@ -0,0 +1,23 @@
+module HammerCLIForeman
+  module CommandExtensions
+    class PuppetEnvironment < HammerCLI::CommandExtensions
+      # Remove when support of --environment options is ended.
+      option '--environment', 'ENVIRONMENT_NAME', _('Environment name'),
+             attribute_name: :option_environment_name,
+             deprecated: { '--environment' => _('Use --puppet-environment instead') }
+      option '--environment-id', 'ENVIRONMENT_ID', _(''),
+             format: HammerCLI::Options::Normalizers::Number.new,
+             attribute_name: :option_environment_id,
+             deprecated: { '--environment-id' => _('Use --puppet-environment-id instead') }
+
+      option_sources do |sources, command|
+        sources.find_by_name('IdResolution').insert_relative(
+          :after,
+          'IdParams',
+          HammerCLIForeman::OptionSources::PuppetEnvironmentParams.new(command)
+        )
+        sources
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/command_extensions/puppet_environments.rb

@@ -0,0 +1,23 @@
+module HammerCLIForeman
+  module CommandExtensions
+    class PuppetEnvironments < HammerCLI::CommandExtensions
+      # Remove when support of --environments options is ended.
+      option '--environments', 'ENVIRONMENT_NAMES', _(''),
+             attribute_name: :option_environment_names,
+             deprecated: { '--environments' => _('Use --puppet-environments instead') }
+      option '--environment-ids', 'ENVIRONMENT_IDS', _('Environment IDs'),
+             format: HammerCLI::Options::Normalizers::List.new,
+             attribute_name: :option_environment_ids,
+             deprecated: { '--environment-ids' => _('Use --puppet-environment-ids instead') }
+
+      option_sources do |sources, command|
+        sources.find_by_name('IdResolution').insert_relative(
+          :after,
+          'IdsParams',
+          HammerCLIForeman::OptionSources::PuppetEnvironmentParams.new(command)
+        )
+        sources
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/commands.rb

@@ -8,7 +8,14 @@ module HammerCLIForeman
     :ptable => :partition_table,
     :ptables => :partition_tables,
     :puppetclass => :puppet_class,
-    :puppetclasses => :puppet_classes
+    :puppetclasses => :puppet_classes,
+    :environment => :puppet_environment,
+    :environments => :puppet_environments
+  }
+
+  RESOURCE_ALIAS_NAME_MAPPING = {
+    environment: :puppet_environment,
+    environments: :puppet_environments
   }
 
   def self.foreman_api
@@ -107,6 +114,17 @@ module HammerCLIForeman
       HammerCLIForeman::RESOURCE_NAME_MAPPING
     end
 
+    def self.resource_alias_name_mapping
+      HammerCLIForeman::RESOURCE_ALIAS_NAME_MAPPING
+    end
+
+    def self.alias_name_for_resource(resource, singular: true)
+      return nil if resource.nil?
+      return resource_alias_name_mapping[resource.name.to_sym] unless singular
+
+      resource_alias_name_mapping[resource.singular_name.to_sym]
+    end
+
     def self.build_options(builder_params={})
       builder_params[:resource_mapping] ||= resource_name_mapping
       builder_params = HammerCLIForeman::BuildParams.new(builder_params)
@@ -121,6 +139,7 @@ module HammerCLIForeman
     end
 
     def get_resource_id(resource, options={})
+      resource_alias = self.class.alias_name_for_resource(resource)
       all_opts = options[:all_options] || all_options
       if options[:scoped]
         opts = resolver.scoped_options(resource.singular_name, all_opts, :single)
@@ -128,7 +147,7 @@ module HammerCLIForeman
         opts = all_opts
       end
       begin
-        resolver.send("#{resource.singular_name}_id", opts)
+        resolver.send("#{resource_alias || resource.singular_name}_id", opts)
       rescue HammerCLIForeman::MissingSearchOptions => e
         if (options[:required] == true || resource_search_requested(resource, opts))
           logger.info "Error occured while searching for #{resource.singular_name}"
@@ -138,10 +157,11 @@ module HammerCLIForeman
     end
 
     def get_resource_ids(resource, options={})
+      resource_alias = self.class.alias_name_for_resource(resource)
       all_opts = options[:all_options] || all_options
       opts = resolver.scoped_options(resource.singular_name, all_opts, :multi)
       begin
-        resolver.send("#{resource.singular_name}_ids", opts)
+        resolver.send("#{resource_alias || resource.singular_name}_ids", opts)
       rescue HammerCLIForeman::MissingSearchOptions => e
         if (options[:required] == true || resource_search_requested(resource, opts, true))
           logger.info "Error occured while searching for #{resource.name}"
@@ -188,16 +208,7 @@ module HammerCLIForeman
       params_pruned
     end
 
-    def option_sources
-      sources = super
-
-      id_resolution = HammerCLI::Options::ProcessorList.new(name: 'IdResolution')
-      id_resolution << HammerCLIForeman::OptionSources::IdParams.new(self)
-      id_resolution << HammerCLIForeman::OptionSources::IdsParams.new(self)
-      id_resolution << HammerCLIForeman::OptionSources::SelfParam.new(self)
-
-      sources << id_resolution
-    end
+    extend_with(HammerCLIForeman::CommandExtensions::OptionSources.new)
 
     private
 
@@ -254,9 +265,9 @@ module HammerCLIForeman
     end
 
     def help
-      meta = resource.action(action).apidoc[:metadata]
-      return super if meta.nil?
+      return super unless resource
 
+      meta = resource.action(action).apidoc[:metadata]
       if meta && meta[:search] && respond_to?(:option_search)
         self.class.extend_help do |h|
           h.section(_('Search fields'), id: :search_fields_section) do |h|
@@ -303,7 +314,7 @@ module HammerCLIForeman
         ]
       end
     end
-   
+
     def search_field_help_value(field)
       if field[:values] && field[:values].is_a?(Array)
         _('Values') + ': ' + field[:values].join(', ')

data/lib/hammer_cli_foreman/host.rb

@@ -300,6 +300,7 @@ module HammerCLIForeman
         end
       end
 
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
@@ -308,6 +309,8 @@ module HammerCLIForeman
 
       include HammerCLIForeman::Hosts::CommonUpdateOptions
       include HammerCLIForeman::Hosts::CommonUpdateHelp
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 

data/lib/hammer_cli_foreman/hostgroup.rb

@@ -115,6 +115,8 @@ module HammerCLIForeman
       failure_message _("Could not create the hostgroup")
 
       build_options
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 
@@ -125,6 +127,8 @@ module HammerCLIForeman
       failure_message _("Could not update the hostgroup")
 
       build_options
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -38,7 +38,8 @@ module HammerCLIForeman
       :compute_resource => [ s_name(_("Compute resource name")) ],
       :compute_profile => [ s_name(_("Compute profile name")) ],
       :domain =>           [ s_name(_("Domain name")) ],
-      :environment =>      [ s_name(_("Environment name")) ],
+      :environment =>        [s_name(_('Puppet environment name'))],
+      :puppet_environment => [s_name(_('Puppet environment name'))],
       :fact_value =>       [],
       :filter =>           [],
       :host =>             [ s_name(_("Host name")) ],
@@ -77,6 +78,7 @@ module HammerCLIForeman
   end
 
   class IdResolver
+    ALL_PER_PAGE = 1000
 
     attr_reader :api
 
@@ -121,6 +123,22 @@ module HammerCLIForeman
       options[HammerCLI.option_accessor_name("ids")] || find_puppetclasses(options).collect { |c| c['id'] }
     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)
@@ -218,12 +236,28 @@ module HammerCLIForeman
         search_options[param.name] ||= send(param.name, scoped_options(*scoped_options_params))
       end
       search_options = route_options(options, action).merge(search_options)
-
-      results = resource.call(action_name, search_options)
+      expected_count = expected_record_count(options, resource, :multi)
+      results = retrieve_all(resource, action_name, search_options, expected_count)
       results = HammerCLIForeman.collection_to_common_format(results)
       results
     end
 
+    def retrieve_all(resource, action, search_options, expected_count = 1)
+      return resource.call(action, search_options) unless action == :index
+
+      search_options[:per_page] = ALL_PER_PAGE
+      search_options[:page] = 1
+      data = resource.call(action, search_options)
+      last_page = ([expected_count, 1].max.to_f / ALL_PER_PAGE).ceil
+      all = data
+      while search_options[:page] != last_page
+        search_options[:page] += 1
+        data = resource.call(action, search_options)
+        all = deep_merge(all, data)
+      end
+      all
+    end
+
     def route_options(options, action)
       return {} if action.routes.any? { |r| r.params_in_path.empty? }
 
@@ -343,6 +377,21 @@ module HammerCLIForeman
       {}
     end
 
+    private
+
+    def deep_merge(dest, src)
+      dest = dest.clone
+      dest.merge!(src) do |_key, old_val, new_val|
+        if old_val.is_a?(Hash) && new_val.is_a?(Hash)
+          deep_merge(old_val, new_val)
+        elsif old_val.is_a?(Array) && new_val.is_a?(Array)
+          old_val += new_val
+        else
+          new_val
+        end
+      end
+    end
+
   end
 
 end

data/lib/hammer_cli_foreman/location.rb

@@ -106,7 +106,7 @@ module HammerCLIForeman
     end
 
     HammerCLIForeman::AssociatingCommands::Hostgroup.extend_command(self)
-    HammerCLIForeman::AssociatingCommands::Environment.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/option_sources.rb

@@ -2,3 +2,4 @@ require 'hammer_cli_foreman/option_sources/id_params'
 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/puppet_environment_params'

data/lib/hammer_cli_foreman/option_sources/puppet_environment_params.rb

@@ -0,0 +1,59 @@
+module HammerCLIForeman
+  module OptionSources
+    class PuppetEnvironmentParams < HammerCLI::Options::Sources::Base
+      def initialize(command)
+        @command = command
+      end
+
+      def get_options(_defined_options, result)
+        if result['option_environment_id'].nil? &&
+           (@command.respond_to?(:option_environment_id) ||
+           @command.respond_to?(:option_environment_name))
+          put_puppet_environment_id(result)
+        end
+        if result['option_environment_ids'].nil? &&
+           (@command.respond_to?(:option_environment_ids) ||
+           @command.respond_to?(:option_environment_names))
+          put_puppet_environment_ids(result)
+        end
+        result
+      end
+
+      private
+
+      def put_puppet_environment_id(result)
+        if result['option_environment_name'].nil?
+          if @command.option_environment_id
+            result['option_environment_id'] = @command.option_environment_id
+          elsif @command.option_environment_name
+            result['option_environment_name'] = @command.option_environment_name
+            result['option_environment_id'] = @command.resolver.puppet_environment_id(
+              @command.resolver.scoped_options('environment', result, :single)
+            )
+          end
+        else
+          result['option_environment_id'] = @command.resolver.puppet_environment_id(
+            @command.resolver.scoped_options('environment', result, :single)
+          )
+        end
+      end
+
+      def put_puppet_environment_ids(result)
+        if result['option_environment_names'].nil?
+          if @command.option_environment_ids
+            result['option_environment_ids'] = @command.option_environment_ids
+          elsif @command.option_environment_names
+            result['option_environment_names'] = @command.option_environment_names
+            result['option_environment_ids'] = @command.resolver.puppet_environment_ids(
+              @command.resolver.scoped_options('environment', result, :multi)
+            )
+          end
+        else
+          result['option_environment_ids'] = @command.resolver.puppet_environment_ids(
+            @command.resolver.scoped_options('environment', result, :multi)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/organization.rb

@@ -57,6 +57,8 @@ module HammerCLIForeman
       failure_message _("Could not create the organization")
 
       build_options
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironments.new)
     end
 
 
@@ -69,6 +71,8 @@ module HammerCLIForeman
       failure_message _("Could not update the organization")
 
       build_options
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironments.new)
     end
 
 
@@ -108,7 +112,7 @@ module HammerCLIForeman
 
 
     HammerCLIForeman::AssociatingCommands::Hostgroup.extend_command(self)
-    HammerCLIForeman::AssociatingCommands::Environment.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/{environment.rb → puppet_environment.rb}

@@ -1,10 +1,9 @@
 require 'hammer_cli'
 require 'hammer_cli_foreman/smart_class_parameter'
 
-
 module HammerCLIForeman
 
-  class Environment < HammerCLIForeman::Command
+  class PuppetEnvironment < HammerCLIForeman::Command
 
     resource :environments
 
@@ -55,6 +54,8 @@ module HammerCLIForeman
 
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersList
       build_options_for :environments
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 

data/lib/hammer_cli_foreman/smart_class_parameter.rb

@@ -51,6 +51,8 @@ module HammerCLIForeman
       end
 
       build_options
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand

data/lib/hammer_cli_foreman/smart_proxy.rb

@@ -107,6 +107,8 @@ module HammerCLIForeman
       def print_data(record)
         print_record(output_definition, record)
       end
+
+      extend_with(HammerCLIForeman::CommandExtensions::PuppetEnvironment.new)
     end
 
 

data/lib/hammer_cli_foreman/testing/api_expectations.rb

@@ -173,7 +173,11 @@ module HammerCLIForeman
       end
 
       def index_response(items, options={})
-        cnt = items.length
+        cnt = if items.is_a?(Hash)
+                items.keys.count
+              else
+                items.length
+              end
         {
           "total" => options.fetch(:total, cnt),
           "subtotal" => options.fetch(:subtotal, cnt),

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new '0.17.0'
+    @version ||= Gem::Version.new '0.17.1'
   end
 end

data/test/functional/hostgroup/create_test.rb

@@ -246,6 +246,40 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup create --name hg1 --puppet-classes pc1,pc2))
       end
 
+      it 'allows puppet class names that exceeds entries_per_page' do
+        search_objects = []
+        response_objects = []
+        ids = []
+        names = []
+        1100.times.with_object('pc').each do |id, name|
+          next_name = "\"#{name}#{id}\""
+          search_objects << "name = #{next_name}"
+          response_objects << { 'id' => id, 'name' => next_name }
+          ids << id
+          names << next_name
+        end
+
+        api_expects(:puppetclasses, :index) do |p|
+          p[:search] == search_objects.join(' or ') &&
+            p[:page].to_i == 1 &&
+            p[:per_page].to_i == HammerCLIForeman::IdResolver::ALL_PER_PAGE
+        end.returns(
+          index_response('puppetclasses' => response_objects[0...1000]))
+
+        api_expects(:puppetclasses, :index) do |p|
+          p[:search] == search_objects.join(' or ') &&
+            p[:page].to_i == 2 &&
+            p[:per_page].to_i == HammerCLIForeman::IdResolver::ALL_PER_PAGE
+        end.returns(index_response('puppetclasses' => response_objects[1000...1100]))
+
+        api_expects(:hostgroups, :create) do |p|
+          p['hostgroup']['name'] == 'hg1' &&
+            p['hostgroup']['puppetclass_ids'] == ids
+        end
+
+        run_cmd(%w[hostgroup create --name hg1 --puppet-classes] << names.join(',').tr('"', ''))
+      end
+
       it 'allows puppet proxy id' do
         api_expects(:hostgroups, :create).with_params({
           :hostgroup => {

data/test/functional/template_test.rb

@@ -129,14 +129,45 @@ describe 'template' do
       @cmd = %w(template combination)
     end
 
-    it 'should create new combination' do
+    it 'should create new combination with warning' do
       params = ['create','--provisioning-template-id=10', '--hostgroup-id=1', '--environment-id=1']
       expected_result = success_result("Template combination created.\n")
+      expected_result.expected_err = "Warning: Option --environment-id is deprecated. Use --puppet-environment-id instead\n"
+      api_expects(:template_combinations, :create, 'Create template combination') do |params|
+        params['provisioning_template_id'] == 10 &&
+          params['hostgroup_id'] == 1 &&
+          params['environment_id'] == 1 &&
+          params['template_combination'] == {'environment_id' => 1, 'hostgroup_id' => 1}
+      end
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'should create new combination' do
+      params = ['create','--provisioning-template-id=10', '--hostgroup-id=1', '--puppet-environment-id=1']
+      expected_result = success_result("Template combination created.\n")
       api_expects(:template_combinations, :create, 'Create template combination') do |params|
-        params["provisioning_template_id"] == 10 &&
-          params["hostgroup_id"] == 1 &&
-            params["environment_id"] == 1 &&
-              params["template_combination"] == {"environment_id" => 1, "hostgroup_id" => 1}
+        params['provisioning_template_id'] == 10 &&
+          params['hostgroup_id'] == 1 &&
+          params['environment_id'] == 1 &&
+          params['template_combination'] == {'environment_id' => 1, 'hostgroup_id' => 1}
+      end
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'should update combination with warning' do
+      params = ['update', '--id=3', '--provisioning-template-id=10', '--hostgroup-id=1', '--environment-id=1']
+      expected_result = success_result("Template combination updated.\n")
+      expected_result.expected_err = "Warning: Option --environment-id is deprecated. Use --puppet-environment-id instead\n"
+      api_expects(:template_combinations, :update, 'Update template combination') do |params|
+        params['id'] == '3' &&
+          params['provisioning_template_id'] == 10 &&
+          params['hostgroup_id'] == 1 &&
+          params['environment_id'] == 1 &&
+          params['template_combination'] == { 'environment_id' => 1, 'hostgroup_id' => 1 }
       end
 
       result = run_cmd(@cmd + params)
@@ -144,13 +175,14 @@ describe 'template' do
     end
 
     it 'should update combination' do
-      params = ['update','--id=3','--provisioning-template-id=10', '--hostgroup-id=1', '--environment-id=1']
+      params = ['update', '--id=3', '--provisioning-template-id=10', '--hostgroup-id=1', '--puppet-environment-id=1']
       expected_result = success_result("Template combination updated.\n")
       api_expects(:template_combinations, :update, 'Update template combination') do |params|
-        params["provisioning_template_id"] == 10 &&
-          params["hostgroup_id"] == 1 &&
-          params["environment_id"] == 1 &&
-          params["template_combination"] == {"environment_id" => 1, "hostgroup_id" => 1}
+        params['id'] == '3' &&
+          params['provisioning_template_id'] == 10 &&
+          params['hostgroup_id'] == 1 &&
+          params['environment_id'] == 1 &&
+          params['template_combination'] == { 'environment_id' => 1, 'hostgroup_id' => 1 }
       end
 
       result = run_cmd(@cmd + params)

data/test/unit/helpers/command.rb

@@ -17,6 +17,14 @@ class IdResolverTestProxy
     @original_resolver.searchables(resource)
   end
 
+  def puppet_environment_id(options)
+    environment_id(options)
+  end
+
+  def puppet_environment_ids(options)
+    environment_ids(options)
+  end
+
   protected
 
   def define_id_finders

data/test/unit/id_resolver_test.rb

@@ -122,14 +122,14 @@ describe HammerCLIForeman::IdResolver do
       let(:resolver_run) { proc { resolver.user_id({"option_name" => "John Doe"}) } }
 
       it "raises exception when no resource is found" do
-        ResourceMocks.mock_action_call(:users, :index, [])
+        ResourceMocks.mock_action_call(:users, :index, index_response([]))
 
         err = resolver_run.must_raise HammerCLIForeman::ResolverError
         err.message.must_equal "user not found."
       end
 
       it "raises exception when multiple resources are found" do
-        ResourceMocks.mock_action_call(:users, :index, [john, jane])
+        ResourceMocks.mock_action_call(:users, :index, index_response([john, jane]))
 
         err = resolver_run.must_raise HammerCLIForeman::ResolverError
         err.message.must_equal "Found more than one user."
@@ -156,7 +156,7 @@ describe HammerCLIForeman::IdResolver do
       end
 
       it "returns id of the resource" do
-        ResourceMocks.mock_action_call(:users, :index, [john])
+        ResourceMocks.mock_action_call(:users, :index, index_response([john]))
 
         resolver_run.call.must_equal john_id
       end
@@ -167,16 +167,16 @@ describe HammerCLIForeman::IdResolver do
       let(:resolver_run) { proc { resolver.post_id({"option_name" => "Post 11", "option_user_name" => "John Doe"}) } }
 
       it "raises exception when no resource is found" do
-        ResourceMocks.mock_action_call(:posts, :index, [])
-        ResourceMocks.mock_action_call(:users, :index, [])
+        ResourceMocks.mock_action_call(:posts, :index, index_response([]))
+        ResourceMocks.mock_action_call(:users, :index, index_response([]))
 
         err = resolver_run.must_raise HammerCLIForeman::ResolverError
         err.message.must_equal "user not found."
       end
 
       it "raises exception when multiple resources are found" do
-        ResourceMocks.mock_action_call(:posts, :index, [])
-        ResourceMocks.mock_action_call(:users, :index, [john, jane])
+        ResourceMocks.mock_action_call(:posts, :index, index_response([]))
+        ResourceMocks.mock_action_call(:users, :index, index_response([john, jane]))
 
         err = resolver_run.must_raise HammerCLIForeman::ResolverError
         err.message.must_equal "Found more than one user."
@@ -199,12 +199,16 @@ describe HammerCLIForeman::IdResolver do
       end
 
       it "returns id of the resource" do
-        ResourceMocks.mock_action_call(:posts, :index, [
-          {"id" => 11, "name" => "Post 11"}
-        ])
-        ResourceMocks.mock_action_call(:users, :index, [
-          {"id" => 22, "name" => "User 22"}
-        ])
+        ResourceMocks.mock_action_call(:posts, :index, index_response(
+          [
+            {"id" => 11, "name" => "Post 11"}
+          ]
+        ))
+        ResourceMocks.mock_action_call(:users, :index, index_response(
+          [
+            {"id" => 22, "name" => "User 22"}
+          ]
+        ))
         resolver_run.call.must_equal 11
       end
     end
@@ -248,13 +252,13 @@ describe HammerCLIForeman::IdResolver do
           ( resource == :users &&
             action == :index &&
             params[:search] == "name = \"John Doe\" or name = \"Jane Doe\"")
-        end.returns([john, jane])
+        end.returns(index_response([john, jane]))
 
         assert_equal [john_id, jane_id], resolver.user_ids({"option_names" => ["John Doe", "Jane Doe"]})
       end
 
       it "raises exception when wrong number of resources is found even with conflicting options" do
-        ResourceMocks.mock_action_call(:users, :index, [john])
+        ResourceMocks.mock_action_call(:users, :index, index_response([john]))
 
         assert_raises HammerCLIForeman::ResolverError do
           resolver.user_ids({"option_names" => ["John Doe", "Jane Doe"], "option_name" => "group1"})
@@ -262,7 +266,7 @@ describe HammerCLIForeman::IdResolver do
       end
 
       it "raises exception when wrong number of resources is found" do
-        ResourceMocks.mock_action_call(:users, :index, [john])
+        ResourceMocks.mock_action_call(:users, :index, index_response([john]))
 
         assert_raises HammerCLIForeman::ResolverError do
           resolver.user_ids({"option_names" => ["John Doe", "Jane Doe"]})
@@ -270,7 +274,7 @@ describe HammerCLIForeman::IdResolver do
       end
 
       it "raises exception when no search options were set" do
-        ResourceMocks.mock_action_call(:users, :index, [john])
+        ResourceMocks.mock_action_call(:users, :index, index_response([john]))
 
         assert_raises HammerCLIForeman::MissingSearchOptions do
           resolver.user_ids({})
@@ -278,7 +282,7 @@ describe HammerCLIForeman::IdResolver do
       end
 
       it "returns empty array for empty input" do
-        ResourceMocks.mock_action_call(:users, :index, [john, jane])
+        ResourceMocks.mock_action_call(:users, :index, index_response([john, jane]))
 
         assert_equal [], resolver.user_ids({"option_names" => []})
       end

data/test/unit/{environment_test.rb → puppet_environment_test.rb}

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
-require 'hammer_cli_foreman/environment'
+require 'hammer_cli_foreman/puppet_environment'
 
-describe HammerCLIForeman::Environment do
+describe HammerCLIForeman::PuppetEnvironment do
 
   include CommandTestHelper
 
@@ -12,7 +12,7 @@ describe HammerCLIForeman::Environment do
       ResourceMocks.mock_action_call(:environments, :index, [])
     end
 
-    let(:cmd) { HammerCLIForeman::Environment::ListCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::PuppetEnvironment::ListCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "no arguments"
@@ -32,7 +32,7 @@ describe HammerCLIForeman::Environment do
 
   context "InfoCommand" do
 
-    let(:cmd) { HammerCLIForeman::Environment::InfoCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::PuppetEnvironment::InfoCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
@@ -56,7 +56,7 @@ describe HammerCLIForeman::Environment do
 
   context "CreateCommand" do
 
-    let(:cmd) { HammerCLIForeman::Environment::CreateCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::PuppetEnvironment::CreateCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "name", ["--name=env"]
@@ -69,7 +69,7 @@ describe HammerCLIForeman::Environment do
 
   context "DeleteCommand" do
 
-    let(:cmd) { HammerCLIForeman::Environment::DeleteCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::PuppetEnvironment::DeleteCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "name", ["--name=env"]
@@ -82,7 +82,7 @@ describe HammerCLIForeman::Environment do
 
   context "UpdateCommand" do
 
-    let(:cmd) { HammerCLIForeman::Environment::UpdateCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::PuppetEnvironment::UpdateCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "name", ["--name=env", "--new-name=env2"]
@@ -99,11 +99,13 @@ describe HammerCLIForeman::Environment do
       ResourceMocks.smart_class_parameters_index
     end
 
-    let(:cmd) { HammerCLIForeman::Environment::SCParamsCommand.new("", ctx) }
+    let(:cmd) { HammerCLIForeman::PuppetEnvironment::SCParamsCommand.new("", ctx) }
 
     context "parameters" do
       it_should_accept "environment", ["--environment=env"]
       it_should_accept "environment-id", ["--environment-id=1"]
+      it_should_accept "puppet-environment", ["--puppet-environment=env"]
+      it_should_accept "puppet-environment-id", ["--puppet-environment-id=1"]
       # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -100,6 +100,10 @@ files:
 - lib/hammer_cli_foreman/auth_source.rb
 - lib/hammer_cli_foreman/auth_source_ldap.rb
 - lib/hammer_cli_foreman/combination.rb
+- lib/hammer_cli_foreman/command_extensions.rb
+- lib/hammer_cli_foreman/command_extensions/option_sources.rb
+- lib/hammer_cli_foreman/command_extensions/puppet_environment.rb
+- lib/hammer_cli_foreman/command_extensions/puppet_environments.rb
 - lib/hammer_cli_foreman/commands.rb
 - lib/hammer_cli_foreman/common_parameter.rb
 - lib/hammer_cli_foreman/compute_attribute.rb
@@ -120,7 +124,6 @@ files:
 - lib/hammer_cli_foreman/defaults.rb
 - lib/hammer_cli_foreman/dependency_resolver.rb
 - lib/hammer_cli_foreman/domain.rb
-- lib/hammer_cli_foreman/environment.rb
 - lib/hammer_cli_foreman/exception_handler.rb
 - lib/hammer_cli_foreman/exceptions.rb
 - lib/hammer_cli_foreman/external_usergroup.rb
@@ -143,6 +146,7 @@ files:
 - lib/hammer_cli_foreman/option_sources.rb
 - lib/hammer_cli_foreman/option_sources/id_params.rb
 - lib/hammer_cli_foreman/option_sources/ids_params.rb
+- lib/hammer_cli_foreman/option_sources/puppet_environment_params.rb
 - lib/hammer_cli_foreman/option_sources/self_param.rb
 - lib/hammer_cli_foreman/option_sources/user_params.rb
 - lib/hammer_cli_foreman/organization.rb
@@ -154,6 +158,7 @@ files:
 - lib/hammer_cli_foreman/partition_table.rb
 - lib/hammer_cli_foreman/personal_access_token.rb
 - lib/hammer_cli_foreman/puppet_class.rb
+- lib/hammer_cli_foreman/puppet_environment.rb
 - lib/hammer_cli_foreman/realm.rb
 - lib/hammer_cli_foreman/references.rb
 - lib/hammer_cli_foreman/report_template.rb
@@ -479,7 +484,6 @@ files:
 - test/unit/defaults_test.rb
 - test/unit/dependency_resolver_test.rb
 - test/unit/domain_test.rb
-- test/unit/environment_test.rb
 - test/unit/exception_handler_test.rb
 - test/unit/external_usergroup_test.rb
 - test/unit/fact_test.rb
@@ -504,6 +508,7 @@ files:
 - test/unit/param_filters_test.rb
 - test/unit/partition_table_test.rb
 - test/unit/puppet_class_test.rb
+- test/unit/puppet_environment_test.rb
 - test/unit/realm_test.rb
 - test/unit/role_test.rb
 - test/unit/settings_test.rb
@@ -784,7 +789,6 @@ test_files:
 - test/reports/TEST-HammerCLIForeman-Architecture-InfoCommand-parameters.xml
 - test/unit/operating_system_test.rb
 - test/unit/location_test.rb
-- test/unit/environment_test.rb
 - test/unit/common_parameter_test.rb
 - test/unit/settings_test.rb
 - test/unit/image_test.rb
@@ -812,6 +816,7 @@ test_files:
 - test/unit/config_report_test.rb
 - test/unit/user_test.rb
 - test/unit/filter_test.rb
+- test/unit/puppet_environment_test.rb
 - test/unit/output/formatters_test.rb
 - test/unit/host_test.rb
 - test/unit/subnet_test.rb