hammer_cli_foreman_ansible 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4be510cfce6a703825aef89bb9790b9d1d0cd7e0
-  data.tar.gz: cf4f2b25be3c5badcde36856278777f19eff41f1
+SHA256:
+  metadata.gz: 12f80a5bb288d8683aad9b3629edffbbd32bfb4afdf7aa597e4b370e2c19da58
+  data.tar.gz: 03d9f616b2d17580d15e93cae6fb79e0c6b599091fa4f0ed9cb7d6d2db986cdf
 SHA512:
-  metadata.gz: cb77aad37001df22b6a3edf555ba99166337013a5b7db0c9c310ca1dcbc27687752765ec36b7173bea4523ede553abd37c4a561cde70e2193fed8fb648c4d91d
-  data.tar.gz: 5030327b8b640ab59f3f5c847ad4ff8eeffd853c53b869fab9ee3ff8c3a433db2cc8b55fb6c3fc15fa76262c21803c4a03924b5ee115025aba612399fa2d825e
+  metadata.gz: 12f88c7777fae85e77ae1288aafb09e08d569989b7a19bedbc939cbaa0d374161b47e23de3f3a4ec35ae78567982d0dc832f4974a14223d0aed05e76092ff7f1
+  data.tar.gz: 4bf5229134f1ce01c9ab517d5a9adb9281a5b9be0cced399fa78bbe55134e571525e51e9aed1c7802ef464a36162f7965eb3683faa294b89f5f99cf73be19c7f

data/lib/hammer_cli_foreman_ansible/ansible.rb

@@ -16,6 +16,12 @@ module HammerCLIForemanAnsible
       'hammer_cli_foreman_ansible/ansible_variables'
     )
 
+    lazy_subcommand(
+      'inventory',
+      _('Ansible Inventory'),
+      'HammerCLIForemanAnsible::AnsibleInventoryCommand',
+      'hammer_cli_foreman_ansible/ansible_inventory'
+    )
     autoload_subcommands
   end
 end

data/lib/hammer_cli_foreman_ansible/ansible_inventory.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module HammerCLIForemanAnsible
+  class AnsibleInventoryCommand < HammerCLIForeman::Command
+    resource :ansible_inventories
+
+    class HostsCommand < HammerCLIForeman::Command
+      action :hosts
+      command_name 'hosts'
+      option '--as-json', :flag, _('Full response as json')
+
+      def print_data(data)
+        return super unless option_as_json?
+
+        puts JSON.pretty_generate(data)
+      end
+      build_options
+
+      extend_with(HammerCLIForemanAnsible::CommandExtensions::Inventory.new)
+    end
+
+    class HostgroupsCommand < HammerCLIForeman::Command
+      action :hostgroups
+      command_name 'hostgroups'
+      option '--as-json', :flag, _('Full response as json')
+
+      def print_data(data)
+        return super unless option_as_json?
+
+        puts JSON.pretty_generate(data)
+      end
+      build_options
+
+      extend_with(HammerCLIForemanAnsible::CommandExtensions::Inventory.new)
+    end
+
+    class ScheduleCommand < HammerCLIForeman::Command
+      action :schedule
+      command_name 'schedule'
+
+      output do
+        field :job_id, _('Job Id')
+        field :data_url, _('Data URL')
+      end
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end
+

data/lib/hammer_cli_foreman_ansible/ansible_roles.rb

@@ -25,6 +25,15 @@ module HammerCLIForemanAnsible
       build_options
     end
 
+    class SyncCommand < HammerCLIForeman::Command
+      action :sync
+      command_name 'sync'
+
+      success_message _('A task to Sync Ansible Roles was created.')
+      failure_message _('Could not sync roles')
+      build_options
+    end
+
     class ImportCommand < HammerCLIForeman::Command
       action :import
       command_name 'import'
@@ -87,7 +96,13 @@ module HammerCLIForemanAnsible
 
       output do
         collection :ansible_roles, _('Ansible roles available to be imported') do
-          field :name, nil
+          field :name, _("Role Name")
+          field :role_action, _("Action")
+          field :variables, _("Variables")
+          field :hosts_count, ("Hosts count")
+          field :hostgroup_count, ("Hostgroup count")
+
+
         end
       end
 

data/lib/hammer_cli_foreman_ansible/ansible_variables.rb

@@ -5,6 +5,7 @@ module HammerCLIForemanAnsible
     resource :ansible_variables
 
     class ListCommand < HammerCLIForeman::ListCommand
+
       output do
         field :id, _('Id')
 
@@ -15,7 +16,6 @@ module HammerCLIForemanAnsible
         field :ansible_role, _('Role')
         field :ansible_role_id, _('Role Id'), Fields::Id
       end
-
       build_options
     end
 
@@ -64,6 +64,16 @@ module HammerCLIForemanAnsible
       success_message _("Ansible variable [%{variable}] updated.")
       failure_message _("Could not update the ansible variable")
 
+      option "--override-value-order", "OVERRIDE_VALUE_ORDER", _("The order in which values are resolved"),
+             :format => HammerCLI::Options::Normalizers::List.new
+
+      def request_params
+        params = super
+        override_order = params['ansible_variable']['override_value_order']
+        params['ansible_variable']['override_value_order'] = override_order.join("\n") if override_order.is_a?(Array)
+        params
+      end
+
       build_options
     end
 

data/lib/hammer_cli_foreman_ansible/associated_ansible_role.rb

@@ -0,0 +1,85 @@
+module HammerCLIForemanAnsible
+  module AssociatedAnsibleRole
+    # This method fetches all associated resource (ansible roles) ids
+    # to send them back via :update endpoint of the main resource (host/hostgroup)
+    # We use this array of ids to add or remove direct associations
+    # This method is used to 'reset' associated ids via HammerCLIForeman::[Add|Remove]AssociatedCommand
+    def get_current_ids
+      roles = HammerCLIForeman.record_to_common_format(resource.call(association_name(true), { id: get_identifier }))
+      return ids_to_keep_for_removal(roles) if self.class.command_names.include?('remove')
+
+      ids_to_keep_for_addition(roles)
+    end
+
+    # Since there are no option_sources available to deal with such cases (AssociatedCommand)
+    # Make sure we get id of the provided role before we try to get already associated ones
+    def get_new_ids
+      associated_identifiers = get_associated_identifiers
+      @associated_identifier = get_associated_identifier
+
+      ids = get_current_ids.map(&:to_s)
+
+      required_ids = associated_identifiers.nil? ? [] : associated_identifiers.map(&:to_s)
+      required_ids << @associated_identifier.to_s unless @associated_identifier.nil?
+
+      ids = if self.class.command_names.include?('remove')
+              ids.delete_if { |id| required_ids.include? id }
+            else
+              ids + required_ids
+            end
+      ids.uniq
+    end
+
+    private
+
+    # Treat inherited as we do in UI:
+    # - Don't allow to directly associate them (the role is not available to select)
+    # - If the same role was assigned AND inherited then treat it as it was just assigned (keep it)
+    # - If the role is indirectly associated only then don't associate it directly unless --force provided
+    def ids_to_keep_for_addition(roles)
+      roles.map do |role|
+        # Keep directly associated roles
+        next role['id'] if role['directly_assigned']
+
+        # Host groups can have not inherited and not directly assigned roles in the response.
+        # This means those roles are from hosts, skip them.
+        # Hosts cannot have such case.
+
+        # Pre-check to force stop the command if we're trying to add an already inherited role
+        # (in case we don't have it directly associated as well)
+        if @associated_identifier == role['id'] && role['inherited']
+          next role['id'] if option_force?
+
+          msg = _(
+            'Ansible role %{name} is already inherited from a host group. Please use %{option} for direct association.'
+          ) % { name: role['name'], option: '--force' }
+          raise ArgumentError, msg
+        end
+
+        # We skip not directly assigned and inherited
+        # Also skip not inherited for host groups
+        nil
+      end.compact
+    end
+
+    # Treat inherited as we do in UI:
+    # - Don't allow to remove them (the role is not available to select)
+    # - If the same role was assigned AND inherited then treat it as it was just assigned (keep or remove it)
+    # - If the role was inherited only then don't remove it
+    def ids_to_keep_for_removal(roles)
+      roles.map do |role|
+        # Keep or remove later directly associated roles
+        next role['id'] if role['directly_assigned']
+
+        # Pre-check to force stop the command if we're trying to remove not directly assigned role
+        if role['id'] == @associated_identifier
+          raise ArgumentError, _('Ansible role %s is not assigned directly and cannot be removed.') % role['name']
+        end
+
+        # We skip not directly assigned and inherited
+        # Also skip not inherited for host groups
+        nil
+      end.compact
+    end
+  end
+end

data/lib/hammer_cli_foreman_ansible/command_extensions/inventory.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+module HammerCLIForemanAnsible
+  module CommandExtensions
+    class Inventory < HammerCLI::CommandExtensions
+      output do |definition|
+        definition.append do
+          from 'foreman' do
+            field :hostname, _('Name')
+            field :fqdn, _('FQDN')
+            field :hostgroup, _('Host Group')
+            field :location, _('Location')
+            field :organization, _('Organization')
+            field :domainname, _('Domain')
+            field :foreman_domain_description, _('Foreman domain description')
+            field :owner_name, _('Owner name')
+            field :owner_email, _('Owner email')
+            field :ssh_authorized_keys, _('SSH authorized keys')
+            field :root_pw, _('Root password')
+            field :foreman_config_groups, _('Foreman config groups')
+            field :puppetmaster, _('Puppet master')
+            field :foreman_env, _('Puppet environment')
+
+            collection :foreman_subnets, _('Subnets') do
+              field :name, _('Name')
+              field :network, _('Network')
+              field :mask, _('Mask')
+              field :gateway, _('Gateway')
+              field :dns_primary, _('Primary DNS')
+              field :dns_secondary, _('Secondary DNS')
+              field :from, _('From')
+              field :to, _('To')
+              field :boot_mode, _('Boot mode')
+              field :ipam, _('IPAM')
+              field :vlanid, _('VLAN ID')
+              field :mtu, _('MTU')
+              field :nic_delay, _('NIC delay')
+              field :network_type, _('Network type')
+              field :description, _('Description')
+            end
+
+            collection :foreman_interfaces, _('Network interfaces') do
+              field :name, _('Interface Name')
+              field :identifier, _('Identifier')
+              field :attrs,  _('Attributes'),Fields::Field, hide_blank: true
+              field :mac, _('MAC address')
+              field :ip, _('IPv4 address'), Fields::Field, hide_blank: true
+              field :ip6, _('IPv6 address'), Fields::Field, hide_blank: true
+              field :virtual, _('Virtual'), Fields::Boolean
+              field :link, _('Link'), Fields::Boolean
+              field :managed, _('Managed'), Fields::Boolean
+              field :primary, _('Primary'), Fields::Boolean
+              field :provision, _('Provision'), Fields::Boolean
+              field :subnet6, _('IPv6 subnet')
+              field :tag, _('Tag')
+              field :attached_to, _('Attached to')
+              field :type, _('Type')
+              field :attached_devices, _('Attached devices')
+              from 'subnet' do
+                label _('Subnet'), hide_blank: true do
+                  field :name, _('Name')
+                  field :network, _('Network')
+                  field :mask, _('Mask')
+                  field :gateway, _('Gateway')
+                  field :dns_primary, _('Primary DNS')
+                  field :dns_secondary, _('Secondary DNS')
+                  field :from, _('From')
+                  field :to, _('To')
+                  field :boot_mode, _('Boot mode')
+                  field :ipam, _('IPAM')
+                  field :vlanid, _('VLAN ID')
+                  field :mtu, _('MTU')
+                  field :nic_delay, _('NIC delay')
+                  field :network_type, _('Network type')
+                  field :description, _('Description')
+                end
+              end
+            end
+
+            collection :foreman_users, _('Foreman Users'), numbered: false do
+              field :firstname, _('First name')
+              field :lastname, _('Last name')
+              field :mail, _('Email')
+              field :description, _('Description')
+              field :fullname, _('Full name')
+              field :ssh_authorized_keys, _('SSH authorized keys')
+            end
+          end
+
+          collection :foreman_ansible_roles, _('Foreman Ansible Roles'), numbered: false do
+            field :name, _('Role')
+          end
+
+          field :ansible_roles_check_mode, _('Ansible role check mode'), Fields::Boolean
+          field :host_packages, _('Host packages')
+          field :host_registration_insights, _('Host registration insights'), Fields::Boolean
+          field :host_registration_remote_execution, _('Host registration remote execution'), Fields::Boolean
+          field :remote_execution_ssh_keys, _('Remote execution ssh keys')
+          field :remote_execution_ssh_user, _('Remote execution ssh user')
+          field :remote_execution_effective_user_method, _('Remote execution effective user method')
+          field :remote_execution_connect_by_ip, _('Remote execution connect by IP'), Fields::Boolean
+        end
+      end
+
+      before_print do |data, cmd_obj|
+        unless cmd_obj.option_as_json?
+          new_data = data['all']['hosts'].each_with_object([]) do |hostname, arr|
+            data['_meta']['hostvars'][hostname]['foreman']['foreman_users'] = data['_meta']['hostvars'][hostname]['foreman']['foreman_users']&.map { |u| u[1] }
+            data['_meta']['hostvars'][hostname]['foreman_ansible_roles'] =  data['_meta']['hostvars'][hostname]['foreman_ansible_roles']&.map { |r| { 'name' => r } }
+            arr << {
+              'hostname' => hostname
+            }.merge(data['_meta']['hostvars'][hostname])
+          end
+          data.clear
+          data['results'] = new_data
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman_ansible/command_extensions/resolver.rb

@@ -0,0 +1,15 @@
+module HammerCLIForemanAnsible
+  module ResolverExtension
+    def create_ansible_roles_search_options(options, mode = nil)
+      if self.class.to_s == 'HammerCLIKatello::IdResolver'
+        create_search_options_without_katello_api(options, api.resource(:ansible_roles), mode)
+      else
+        create_search_options(options, api.resource(:ansible_roles), mode)
+      end
+    end
+  end
+
+  ::HammerCLIForeman::IdResolver.instance_eval do
+    include ResolverExtension
+  end
+end

data/lib/hammer_cli_foreman_ansible/command_extensions.rb

@@ -0,0 +1,2 @@
+require 'hammer_cli_foreman_ansible/command_extensions/resolver'
+require 'hammer_cli_foreman_ansible/command_extensions/inventory'

data/lib/hammer_cli_foreman_ansible/host.rb

@@ -11,7 +11,10 @@ module HammerCLIForemanAnsible
       class ListCommand < HammerCLIForeman::ListCommand
         action :ansible_roles
 
-        output HammerCLIForemanAnsible::AnsibleRolesCommand::ListCommand.output_definition
+        output(HammerCLIForemanAnsible::AnsibleRolesCommand::ListCommand.output_definition) do
+          field :inherited, _('Inherited'), Fields::Boolean
+          field :directly_assigned, _('Directly assigned'), Fields::Boolean
+        end
 
         build_options
       end
@@ -35,6 +38,45 @@ module HammerCLIForemanAnsible
 
         build_options
       end
+
+      class AddAnsibleRoleCommand < HammerCLIForeman::AddAssociatedCommand
+        prepend HammerCLIForemanAnsible::AssociatedAnsibleRole
+
+        command_name 'add'
+        associated_resource :ansible_roles
+        desc _('Associate an Ansible role')
+
+        option '--force', :flag, _('Associate the Ansible role even if it already is associated indirectly')
+
+        success_message _('Ansible role has been associated.')
+        failure_message _('Could not associate the Ansible role')
+
+        validate_options do
+          any(:option_name, :option_id).required
+          any(:option_ansible_role_name, :option_ansible_role_id).required
+        end
+
+        build_options
+      end
+
+      class RemoveAnsibleRoleCommand < HammerCLIForeman::RemoveAssociatedCommand
+        prepend HammerCLIForemanAnsible::AssociatedAnsibleRole
+
+        command_name 'remove'
+        associated_resource :ansible_roles
+        desc _('Disassociate an Ansible role')
+
+        success_message _('Ansible role has been disassociated.')
+        failure_message _('Could not disassociate the Ansible role')
+
+        validate_options do
+          any(:option_name, :option_id).required
+          any(:option_ansible_role_name, :option_ansible_role_id).required
+        end
+
+        build_options
+      end
+
       autoload_subcommands
     end
   end

data/lib/hammer_cli_foreman_ansible/hostgroup.rb

@@ -11,7 +11,10 @@ module HammerCLIForemanAnsible
       class ListCommand < HammerCLIForeman::ListCommand
         action :ansible_roles
 
-        output HammerCLIForemanAnsible::AnsibleRolesCommand::ListCommand.output_definition
+        output(HammerCLIForemanAnsible::AnsibleRolesCommand::ListCommand.output_definition) do
+          field :inherited, _('Inherited'), Fields::Boolean
+          field :directly_assigned, _('Directly assigned'), Fields::Boolean
+        end
 
         build_options
       end
@@ -36,6 +39,44 @@ module HammerCLIForemanAnsible
         build_options
       end
 
+      class AddAnsibleRoleCommand < HammerCLIForeman::AddAssociatedCommand
+        prepend HammerCLIForemanAnsible::AssociatedAnsibleRole
+
+        command_name 'add'
+        associated_resource :ansible_roles
+        desc _('Associate an Ansible role')
+
+        option '--force', :flag, _('Associate the Ansible role even if it already is associated indirectly')
+
+        success_message _('Ansible role has been associated.')
+        failure_message _('Could not associate the Ansible role')
+
+        validate_options do
+          any(:option_name, :option_title, :option_id).required
+          any(:option_ansible_role_name, :option_ansible_role_id).required
+        end
+
+        build_options
+      end
+
+      class RemoveAnsibleRoleCommand < HammerCLIForeman::RemoveAssociatedCommand
+        prepend HammerCLIForemanAnsible::AssociatedAnsibleRole
+
+        command_name 'remove'
+        associated_resource :ansible_roles
+        desc _('Disassociate an Ansible role')
+
+        success_message _('Ansible role has been disassociated.')
+        failure_message _('Could not disassociate the Ansible role')
+
+        validate_options do
+          any(:option_name, :option_title, :option_id).required
+          any(:option_ansible_role_name, :option_ansible_role_id).required
+        end
+
+        build_options
+      end
+
       autoload_subcommands
     end
   end

data/lib/hammer_cli_foreman_ansible/version.rb

@@ -2,6 +2,6 @@
 
 module HammerCLIForemanAnsible
   def self.version
-    @version ||= Gem::Version.new '0.3.2'
+    @version ||= Gem::Version.new '0.4.0'
   end
 end

data/lib/hammer_cli_foreman_ansible.rb

@@ -8,9 +8,12 @@ module HammerCLIForemanAnsible
   require 'hammer_cli_foreman_ansible/i18n'
   require 'hammer_cli_foreman_ansible/ansible'
   require 'hammer_cli_foreman_ansible/ansible_roles'
+  require 'hammer_cli_foreman_ansible/associated_ansible_role'
   require 'hammer_cli_foreman_ansible/host'
   require 'hammer_cli_foreman_ansible/hostgroup'
 
+  require 'hammer_cli_foreman_ansible/command_extensions'
+
   HammerCLI::MainCommand.lazy_subcommand(
     'ansible',
     'Manage foreman ansible',