hammer_cli_foreman 2.3.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cb3de28c168226867cc9b1f4f63ea96bf2ff8746b831e2cdf01e6fe6670a53b
-  data.tar.gz: 55b321941992865b2339fd1e0d11b3845c1396c0699f90c52ab4ba774974b70f
+  metadata.gz: 9a7510aa3b7250c6c467a18d128bc575f5a79f40c3a07283bb65def698e9c4cc
+  data.tar.gz: e5b1cbbd810d718b84f6a0102883bd4825880efe10250bbd8af1688966f209f1
 SHA512:
-  metadata.gz: 7e50e0beb69a60b01613b3d7c282b927e54872de4533364e079f768e22f4a1e63aea967d7113e72a32ee35a20d4475a1cefef03055af956027e7fb3ce0fde00e
-  data.tar.gz: 8ec8cc1402c57faa1b5bbb960bb9b4963e2c4c0e21b9e0a62e88c7e02ca2a01f976c83795c21b7c801aa635842df6fc5fb0794283bd8f666364bd91f404c661d
+  metadata.gz: e4112d9f91de37bfac6af33daf9d6e31d58d880889d421a873147dd75ac151c981849b641a90eb3322ca27add6b9dc8596f5a7fd8f6f95e830e1ffb3b8d3c5a5
+  data.tar.gz: 137ee8f5c12f70577b438132a4b5c2a68bb12c0f54f06fbdf6ad4d6db4b514bdea654c6daf3f1150132061a4e519f43c3d75828df4b2ac1fd96e767be9f45894

data/doc/release_notes.md

@@ -1,5 +1,32 @@
 Release notes
 =============
+### 2.5.1 (2021-06-08)
+* Show new msg for empty update commands, [#32454](http://projects.theforeman.org/issues/32454)
+
+### 2.5.0 (2021-05-04)
+* Update test data to latest foreman
+*  change to resource_type_label, [#11454](http://projects.theforeman.org/issues/11454)
+* Display the report origin, [#32428](http://projects.theforeman.org/issues/32428)
+* Apply option family on searchablesoptionbuilder, [#30996](http://projects.theforeman.org/issues/30996)
+* Add associate vms command for compute resource ([PR #563](https://github.com/theforeman/hammer-cli-foreman/pull/563)), [#32271](http://projects.theforeman.org/issues/32271)
+* Support unrecognized services in ping, [#32265](http://projects.theforeman.org/issues/32265)
+* Change --owner_type's default to user ([PR #562](https://github.com/theforeman/hammer-cli-foreman/pull/562)), [#30814](http://projects.theforeman.org/issues/30814)
+* Drop puppetrun command from hammer ([PR #561](https://github.com/theforeman/hammer-cli-foreman/pull/561)), [#31806](http://projects.theforeman.org/issues/31806)
+* Global registration module ([PR #558](https://github.com/theforeman/hammer-cli-foreman/pull/558)), [#31630](http://projects.theforeman.org/issues/31630)
+* Add support for vnic profile ([PR #552](https://github.com/theforeman/hammer-cli-foreman/pull/552)), [#31493](http://projects.theforeman.org/issues/31493)
+* Bump to 2.5.0-develop
+* Bump to 2.4.0
+* Correct descriptions for resources, [#31668](http://projects.theforeman.org/issues/31668)
+
+
+### 2.4.0 (2021-02-01)
+* Fix hammer list failure when defaults are set ([PR #551](https://github.com/theforeman/hammer-cli-foreman/pull/551)), [#31384](http://projects.theforeman.org/issues/31384)
+* Deprecating puppetrun command ([PR #554](https://github.com/theforeman/hammer-cli-foreman/pull/554)), [#31536](http://projects.theforeman.org/issues/31536)
+* Set new owner with host update ([PR #556](https://github.com/theforeman/hammer-cli-foreman/pull/556)), [#31609](http://projects.theforeman.org/issues/31609)
+* Consume structured statuses api data ([PR #553](https://github.com/theforeman/hammer-cli-foreman/pull/553)), [#31570](http://projects.theforeman.org/issues/31570)
+* Added missing tests to filter ([PR #549](https://github.com/theforeman/hammer-cli-foreman/pull/549)), [#31074](http://projects.theforeman.org/issues/31074')
+* Bump to 2.4.0-develop
+
 ### 2.3.0 (2020-11-03)
 * Hammer ping skip authentication ([PR #550](https://github.com/theforeman/hammer-cli-foreman/pull/550)), [#31140](http://projects.theforeman.org/issues/31140)
 * Return non-zero exit code if services failed, [#30496](http://projects.theforeman.org/issues/30496)

data/lib/hammer_cli_foreman.rb

@@ -184,6 +184,9 @@ module HammerCLIForeman
 
     HammerCLI::MainCommand.lazy_subcommand('bookmark', _("Manage bookmarks"),
                                             'HammerCLIForeman::Bookmark', 'hammer_cli_foreman/bookmark')
+
+    HammerCLI::MainCommand.lazy_subcommand('host-registration', _("Host Registration"),
+                                            'HammerCLIForeman::Registration', 'hammer_cli_foreman/registration')
   rescue => e
     handler = HammerCLIForeman::ExceptionHandler.new(:context => {}, :adapter => :base)
     handler.handle_exception(e)

data/lib/hammer_cli_foreman/architecture.rb

@@ -11,7 +11,7 @@ module HammerCLIForeman
         field :name, _("Name")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -23,7 +23,7 @@ module HammerCLIForeman
         HammerCLIForeman::References.timestamps(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -31,7 +31,7 @@ module HammerCLIForeman
       success_message _("Architecture created.")
       failure_message _("Could not create the architecture")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -39,7 +39,7 @@ module HammerCLIForeman
       success_message _("Architecture deleted.")
       failure_message _("Could not delete the architecture")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -47,7 +47,7 @@ module HammerCLIForeman
       success_message _("Architecture updated.")
       failure_message _("Could not update the architecture")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     HammerCLIForeman::AssociatingCommands::OperatingSystem.extend_command(self)

data/lib/hammer_cli_foreman/bookmark.rb

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

data/lib/hammer_cli_foreman/command_extensions.rb

@@ -1,3 +1,4 @@
+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'

data/lib/hammer_cli_foreman/command_extensions/ping.rb

@@ -10,9 +10,28 @@ module HammerCLIForeman
         end
       end
 
+      def self.check_for_unrecognized(plugins, output_definition)
+        failed = plugins.select { |_, data| data['services'] }
+                        .each_with_object([]) { |(_, d), s| s << d['services'] }
+                        .reduce({}, :merge)
+                        .select do |name, data|
+          begin
+            output_definition.find_field(name)
+            false
+          rescue ArgumentError
+            data['status'] == _('FAIL')
+          end
+        end
+        return if failed.empty?
+
+        warn [_('%{count} more service(s) failed, but not shown:') % { count: failed.size },
+              failed.keys.join(', '),
+              ''].join("\n")
+      end
+
       def self.failed?(services)
-        services.each_value.any? { |s| s['status'] == _('FAIL') } ||
-          services['foreman']['database']['active'] == 'FAIL'
+        services['foreman']['database']['active'] == 'FAIL' ||
+          services.each_value.any? { |s| s['status'] == _('FAIL') }
       end
 
       request_options do |options|

data/lib/hammer_cli_foreman/command_extensions/status.rb

@@ -4,7 +4,7 @@ module HammerCLIForeman
       before_print do |data|
         return if data['results'].nil?
 
-        normalize_plugins(data['results']['foreman']['plugins'])
+        normalize_plugins(data['results']['foreman']['plugins']) if data['results']['foreman']['plugins'].any?(String)
         data['results']['foreman']['smart_proxies'].each do |proxy|
           proxy['features'] = normalize_features(proxy['features'])
           proxy['failed_features'] = normalize_failed_features(proxy['failed_features'])

data/lib/hammer_cli_foreman/command_extensions/update_common.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module HammerCLIForeman
+  module CommandExtensions
+    class UpdateCommon < HammerCLI::CommandExtensions
+      inheritable true
+
+      request_params do |params, command_object|
+        update_params = params[command_object.resource.singular_name]
+        command_object.context[:action_message] = :nothing_to_do if update_params && update_params.empty?
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/commands.rb

@@ -548,6 +548,19 @@ module HammerCLIForeman
       builder
     end
 
+    def self.inherited(child)
+      child.success_message_for(:nothing_to_do, _('Nothing to update.'))
+    end
+
+    def clean_up_context
+      super
+      context.delete(:action_message)
+    end
+
+    def success_message
+      success_message_for(context[:action_message] || :default)
+    end
+
     def method_options_for_params(params, options)
       opts = super
       # overwrite searchables with correct values
@@ -560,6 +573,7 @@ module HammerCLIForeman
       opts
     end
 
+    extend_with(HammerCLIForeman::CommandExtensions::UpdateCommon.new)
   end
 
 

data/lib/hammer_cli_foreman/compute_profile.rb

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

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -104,6 +104,15 @@ module HammerCLIForeman
       build_options
     end
 
+    class AssociateVmsCommand < HammerCLIForeman::Command
+      action :associate
+      command_name 'associate-vms'
+      success_message _("Virtual machines have been associated.")
+      failure_message _("Could not associate the virtual machines")
+
+      build_options
+    end
+
     class AvailableClustersCommand < HammerCLIForeman::ListCommand
       action :available_clusters
       command_name 'clusters'
@@ -128,6 +137,19 @@ module HammerCLIForeman
       build_options
     end
 
+    class AvailableVnicProfilesCommand < HammerCLIForeman::ListCommand
+      action :available_vnic_profiles
+      command_name 'vnic-profiles'
+
+      output do
+        field :id, _('VNIC profile ID'), Fields::Field, :max_width => 200, :hide_blank => true
+        field :name, _('Name')
+        field :network, _('Network ID')
+      end
+
+      build_options
+    end
+
     class AvailableImagesCommand < HammerCLIForeman::ListCommand
       action :available_images
       command_name 'images'

data/lib/hammer_cli_foreman/compute_resource/ovirt.rb

@@ -28,7 +28,8 @@ module HammerCLIForeman
         [
           ['compute_name',      _('Compute name, e.g. eth0')],
           ['compute_network',   _('Select one of available networks for a cluster, must be an ID or a name')],
-          ['compute_interface', _('Interface type')]
+          ['compute_interface', _('Interface type')],
+          ['compute_vnic_profile', _('Vnic Profile')]
         ]
       end
 

data/lib/hammer_cli_foreman/config_group.rb

@@ -8,7 +8,7 @@ module HammerCLIForeman
         field :name, _("Name")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -16,28 +16,28 @@ module HammerCLIForeman
         HammerCLIForeman::References.puppetclasses(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
       success_message _("Config group created.")
       failure_message _("Could not create the config group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       success_message _("Config group updated.")
       failure_message _("Could not update the config group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _("Config group has been deleted.")
       failure_message _("Could not delete the config group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     autoload_subcommands

data/lib/hammer_cli_foreman/config_report.rb

@@ -10,6 +10,7 @@ module HammerCLIForeman
         field :id, _("Id")
         field :host_name, _("Host")
         field :reported_at, _("Last report"), Fields::Date
+        field :origin, _("Origin")
         from "status" do
           field :applied, _("Applied")
           field :restarted, _("Restarted")
@@ -30,6 +31,7 @@ module HammerCLIForeman
         field :id, _("Id")
         field :host_name, _("Host")
         field :reported_at, _("Reported at"), Fields::Date
+        field :origin, _("Origin")
         label _("Report status") do
           from "status" do
             field :applied, _("Applied")

data/lib/hammer_cli_foreman/filter.rb

@@ -78,7 +78,7 @@ module HammerCLIForeman
     class CreateCommand < HammerCLIForeman::CreateCommand
       include TaxonomyCheck
 
-      success_message _("Permission filter for [%<resource_type>s] created.")
+      success_message _("Permission filter for [%<resource_type_label>s] created.")
       failure_message _("Could not create the permission filter")
 
       def validate_options
@@ -92,7 +92,7 @@ module HammerCLIForeman
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       include TaxonomyCheck
 
-      success_message _("Permission filter for [%<resource_type>s] updated.")
+      success_message _("Permission filter for [%<resource_type_label>s] updated.")
       failure_message _("Could not update the permission filter")
 
       def request_params

data/lib/hammer_cli_foreman/host.rb

@@ -171,17 +171,7 @@ module HammerCLIForeman
     end
 
 
-    class PuppetRunCommand < HammerCLIForeman::SingleResourceCommand
-      command_name "puppetrun"
-      resource :puppet_hosts
-      action :puppetrun
-
-      def print_data(records)
-        print_message _('Puppet run triggered')
-      end
-
-      build_options
-    end
+ 
 
 
     class FactsCommand < HammerCLIForeman::AssociatedResourceListCommand

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -6,7 +6,7 @@ module HammerCLIForeman
         base.option "--owner", "OWNER_LOGIN", _("Login of the owner"),
           :attribute_name => :option_user_login
         base.option "--owner-id", "OWNER_ID", _("ID of the owner"),
-          :attribute_name => :option_user_id
+          :attribute_name => :option_owner_id
 
         base.option "--root-password", "ROOT_PW",
           _("Required if host is managed and value is not inherited from host group or default password in settings")
@@ -134,13 +134,14 @@ module HammerCLIForeman
 
       private
 
-      def owner_id(name, type = 'User')
+     
+      def owner_id(name, type)
         return unless name
-        return resolver.user_id('option_login' => name) if type == 'User'
+        return resolver.usergroup_id('option_name' => name) if type == 'Usergroup'
 
-        resolver.usergroup_id('option_name' => name)
+        resolver.user_id('option_login' => name)
       end
-
+      
       def proxy_id(name)
         resolver.smart_proxy_id('option_name' => name) if name
       end