foreman_ansible 3.0.9 → 4.0.0

data/test/unit/services/fact_parser_test.rb

@@ -71,13 +71,12 @@ module ForemanAnsible
           '_timestamp' => '2018-10-29 20:01:51 +0100',
           'ansible_facts' =>
           {
-            'ansible_interfaces' => [
-                'eth0'
-            ],
+            'ansible_interfaces' => %w[eth0 eth1 eth2 bond0],
             'ansible_eth0' => {
               'active' => true,
               'device' => 'eth0',
-              "macaddress" => '52:54:00:04:55:37',
+              'macaddress' => '52:54:00:04:55:37',
+              'perm_macaddress' => '52:54:00:04:55:37',
               'ipv4' => {
                   'address' => '10.10.0.10',
                   'netmask' => '255.255.0.0',
@@ -93,6 +92,45 @@ module ForemanAnsible
               'mtu' => 1500,
               'promisc' => false,
               'type' => 'ether'
+            },
+            'ansible_eth1' => {
+              'active' => true,
+              'device' => 'eth1',
+              'macaddress' => '52:54:00:04:55:38',
+              'perm_macaddress' => '52:54:00:04:55:38',
+              'mtu' => 1500,
+              'promisc' => false,
+              'type' => 'ether'
+            },
+            'ansible_eth2' => {
+              'active' => true,
+              'device' => 'eth2',
+              'macaddress' => '52:54:00:04:55:38',
+              'perm_macaddress' => '52:54:00:04:55:39',
+              'mtu' => 1500,
+              'promisc' => false,
+              'type' => 'ether'
+            },
+            'ansible_bond0' => {
+              'active' => true,
+              'device' => 'bond0',
+              'macaddress' => '52:54:00:04:55:38',
+              'ipv4' => {
+                  'address' => '10.10.0.11',
+                  'netmask' => '255.255.0.0',
+                  'network' => '10.10.0.0'
+              },
+              'ipv6' => [
+                  {
+                      'address' => 'fd00::5054:00ff:fe04:5538',
+                      'prefix' => '64',
+                      'scope' => 'host'
+                  }
+              ],
+              'mtu' => 1500,
+              'promisc' => false,
+              'slaves' => %w[eth1 eth2],
+              'type' => 'bonding'
             }
           }
         )
@@ -105,6 +143,21 @@ module ForemanAnsible
       assert_equal '10.10.0.10', interface['ipaddress']
       assert_equal 'fd00::5054:00ff:fe04:5537', interface['ipaddress6']
     end
+
+    test 'Parses MAC address correctly when bonded' do
+      iut0 = 'eth0'.dup
+      iut1 = 'eth1'.dup
+      iut2 = 'eth2'.dup
+      but0 = 'bond0'.dup
+      interface_eth0 = @facts_parser.get_facts_for_interface(iut0)
+      interface_eth1 = @facts_parser.get_facts_for_interface(iut1)
+      interface_eth2 = @facts_parser.get_facts_for_interface(iut2)
+      interface_bond0 = @facts_parser.get_facts_for_interface(but0)
+      assert_equal '52:54:00:04:55:37', interface_eth0['macaddress']
+      assert_equal '52:54:00:04:55:38', interface_eth1['macaddress']
+      assert_equal '52:54:00:04:55:39', interface_eth2['macaddress']
+      assert_equal '52:54:00:04:55:38', interface_bond0['macaddress']
+    end
   end
 
   # Tests for Debian parser

data/test/unit/services/inventory_creator_test.rb

@@ -41,17 +41,14 @@ module ForemanAnsible
         returns(2222).at_least_once
       Setting.expects(:[]).with('remote_execution_ssh_user').
         returns('root').at_least_once
-      Setting.expects(:[]).with('remote_execution_ssh_password').
-        returns('asafepassword').at_least_once
-      Setting.expects(:[]).with('remote_execution_sudo_password').
-        returns('foobar').at_least_once
       Setting.expects(:[]).with('ansible_winrm_server_cert_validation').
         returns(true).at_least_once
       Setting.expects(:[]).with('ansible_connection').
         returns('ssh').at_least_once
+      Setting.expects(:[]).with('remote_execution_effective_user_method').
+        returns('sudo').at_least_once
       @host.expects(:host_params).returns(extra_options).at_least_once
-      @template_invocation.job_invocation.expects(:password).
-        returns(nil).at_least_once
+      @template_invocation.job_invocation.expects(:password).never
       inventory = ForemanAnsible::InventoryCreator.new(@host,
                                                        @template_invocation)
       connection_params = inventory.connection_params(@host)
@@ -71,26 +68,12 @@ module ForemanAnsible
                    connection_params['ansible_ssh_private_key_file']
       assert_equal extra_options['ansible_port'],
                    connection_params['ansible_port']
-      assert_equal Setting['remote_execution_ssh_password'],
-                   connection_params['ansible_ssh_pass']
-      assert_equal Setting['remote_execution_sudo_password'],
-                   connection_params['ansible_sudo_pass']
       assert_equal Setting['ansible_winrm_server_cert_validation'],
                    connection_params['ansible_winrm_server_cert_validation']
-    end
-
-    test 'job invocation ssh password is passed when available' do
-      inventory = ForemanAnsible::InventoryCreator.new(@host,
-                                                       @template_invocation)
-      assert_equal(@template_invocation.job_invocation.password,
-                   inventory.rex_ssh_password(@host))
-    end
-
-    test 'job invocation sudo password is passed when available' do
-      inventory = ForemanAnsible::InventoryCreator.new(@host,
-                                                       @template_invocation)
-      assert_equal(@template_invocation.job_invocation.sudo_password,
-                   inventory.rex_sudo_password(@host))
+      assert_equal Setting['remote_execution_effective_user_method'],
+                   connection_params['ansible_become_method']
+      refute connection_params.key?('ansible_ssh_pass')
+      refute connection_params.key?('ansible_sudo_pass')
     end
 
     test 'ssh private key is passed when available' do
@@ -105,6 +88,8 @@ module ForemanAnsible
         returns('root')
       host.params.expects(:[]).with('remote_execution_ssh_port').
         returns('2222')
+      host.params.expects(:[]).with('remote_execution_effective_user_method').
+        returns('sudo')
       connection_params = inventory.connection_params(host)
       assert_equal path_to_key,
                    connection_params['ansible_ssh_private_key_file']
@@ -123,7 +108,7 @@ module ForemanAnsible
       template_invocation = FactoryBot.build(:template_invocation,
                                              :template => job_template,
                                              :job_invocation => job_invocation)
-      job_invocation.expects(:password).returns(nil).at_least_once
+      job_invocation.expects(:password).never
       input_value = FactoryBot.create(
         :template_invocation_input_value,
         :template_invocation => template_invocation,

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -0,0 +1 @@
+export const translate = s => s;

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { Grid, Row, Col } from 'patternfly-react';
 import { lowerCase } from 'lodash';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import AvailableRolesList from './components/AvailableRolesList';
 import AssignedRolesList from './components/AssignedRolesList';

data/webpack/components/AnsibleRolesSwitcher/components/AnsiblePermissionDenied.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { EmptyStatePattern as EmptyState } from 'foremanReact/components/common/EmptyState';
 
 const AnsiblePermissionDenied = props => {

data/webpack/components/AnsibleRolesSwitcher/components/AnsibleRole.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { ListView, Tooltip, OverlayTrigger } from 'patternfly-react';
 import classNames from 'classnames';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import AnsibleRoleActionButton from './AnsibleRoleActionButton';
 import '../AnsibleRolesSwitcher.scss';

data/webpack/components/AnsibleRolesSwitcher/components/AssignedRolesList.js

@@ -16,28 +16,6 @@ const AssignedRolesList = ({
 }) => {
   const directlyAssignedRoles = assignedRoles.filter(role => !role.inherited);
 
-  const inputFields = (directlyAssignedRoles, resourceName) => {
-    let result;
-    if (isEmpty(directlyAssignedRoles)) {
-       result = <input type="hidden" name={`${resourceName}[ansible_role_ids][]`} value=""/>
-    } else {
-      result = directlyAssignedRoles.map(role => (
-        <input
-          key={role.id}
-          type="hidden"
-          name={`${resourceName}[ansible_role_ids][]`}
-          value={role.id}
-        />
-      ))
-    }
-
-    return (
-      <div>
-        { result }
-      </div>
-    );
-  }
-
   return (
     <div>
       <ListView>
@@ -60,7 +38,24 @@ const AssignedRolesList = ({
           />
         ))}
       </ListView>
-      { inputFields(directlyAssignedRoles, resourceName) }
+      <div>
+        {isEmpty(directlyAssignedRoles) ? (
+          <input
+            type="hidden"
+            name={`${resourceName}[ansible_role_ids][]`}
+            value=""
+          />
+        ) : (
+          directlyAssignedRoles.map(role => (
+            <input
+              key={role.id}
+              type="hidden"
+              name={`${resourceName}[ansible_role_ids][]`}
+              value={role.id}
+            />
+          ))
+        )}
+      </div>
     </div>
   );
 };

data/webpack/index.js

@@ -1,11 +1,12 @@
+import $ from 'jquery';
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import injectReducer from 'foremanReact/redux/reducers/registerReducer';
 import ReportJsonViewer from './components/ReportJsonViewer';
 import AnsibleRolesSwitcher from './components/AnsibleRolesSwitcher';
-import $ from 'jquery';
-
 import reducer from './reducer';
 
+const { tfm } = window;
+
 componentRegistry.register({
   name: 'ReportJsonViewer',
   type: ReportJsonViewer,
@@ -17,7 +18,7 @@ componentRegistry.register({
 
 injectReducer('foremanAnsible', reducer);
 
-window.tfm.initAnsibleRoleSwitcher = () => {
+tfm.initAnsibleRoleSwitcher = () => {
   $(document).on('ContentLoad', evt => {
     tfm.reactMounter.mount(
       'AnsibleRolesSwitcher',
@@ -25,4 +26,4 @@ window.tfm.initAnsibleRoleSwitcher = () => {
       $('#ansible_roles_switcher').data('roles')
     );
   });
-}
+};

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 4.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -72,20 +72,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +140,6 @@ files:
 - app/helpers/foreman_ansible/ansible_reports_helper.rb
 - app/helpers/foreman_ansible/ansible_roles_helper.rb
 - app/helpers/foreman_ansible/hosts_helper_extensions.rb
-- app/lib/actions/foreman_ansible/helpers/host_common.rb
 - app/lib/actions/foreman_ansible/helpers/play_roles_description.rb
 - app/lib/proxy_api/ansible.rb
 - app/models/ansible_role.rb
@@ -213,6 +212,7 @@ files:
 - app/views/foreman_ansible/job_templates/power_action_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/puppet_run_once_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/run_command_-_ansible_default.erb
+- app/views/foreman_ansible/job_templates/run_playbook-ansible_default.erb
 - app/views/foreman_ansible/job_templates/service_action_-_ansible_default.erb
 - app/views/ui_ansible_roles/index.json.rabl
 - app/views/ui_ansible_roles/main.json.rabl
@@ -229,6 +229,7 @@ files:
 - db/migrate/20180628125416_add_ansible_role_id_to_lookup_keys.rb
 - db/migrate/20190318094437_add_imported_attr_to_ansible_variables.rb
 - db/migrate/20190328114657_remove_top_level_ansible_variables_setting.rb
+- db/migrate/20191010074208_remove_ansible_implementation_setting.rb
 - db/seeds.d/62_ansible_proxy_feature.rb
 - db/seeds.d/75_job_templates.rb
 - db/seeds.d/90_notification_blueprints.rb
@@ -291,6 +292,7 @@ files:
 - test/unit/helpers/ansible_reports_helper_test.rb
 - test/unit/host_ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
+- test/unit/lib/foreman_ansible_core/ansible_runner_test.rb
 - test/unit/lib/foreman_ansible_core/command_creator_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
@@ -305,6 +307,7 @@ files:
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
+- webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/common/EmptyState.js
 - webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js
@@ -389,22 +392,23 @@ test_files:
 - test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/helpers/ansible_reports_helper_test.rb
 - test/unit/lib/foreman_ansible_core/command_creator_test.rb
+- test/unit/lib/foreman_ansible_core/ansible_runner_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
 - test/unit/services/api_roles_importer_test.rb
-- test/unit/services/fact_importer_test.rb
-- test/unit/services/fact_parser_test.rb
 - test/unit/services/fact_sparser_test.rb
 - test/unit/services/insights_plan_runner_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
 - test/unit/services/ansible_variables_importer_test.rb
+- test/unit/services/fact_importer_test.rb
+- test/unit/services/fact_parser_test.rb
 - test/unit/services/inventory_creator_test.rb
-- test/unit/ansible_provider_test.rb
 - test/unit/ansible_role_test.rb
-- test/unit/ansible_variable_test.rb
 - test/unit/host_ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
+- test/unit/ansible_provider_test.rb
+- test/unit/ansible_variable_test.rb
 - test/test_plugin_helper.rb

data/app/lib/actions/foreman_ansible/helpers/host_common.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Actions
-  module ForemanAnsible
-    module Helpers
-      # Shared task methods between hostgroup and host roles actions
-      module HostCommon
-        def finalize
-          return unless delegated_output[:exit_status].to_s != '0'
-          error! _('Playbook execution failed')
-        end
-
-        def rescue_strategy
-          ::Dynflow::Action::Rescue::Fail
-        end
-
-        def humanized_name
-          _('Play Ansible roles')
-        end
-
-        def humanized_output
-          continuous_output.humanize
-        end
-
-        def fill_continuous_output(continuous_output)
-          delegated_output.fetch('result', []).each do |raw_output|
-            continuous_output.add_raw_output(raw_output)
-          end
-        rescue StandardError => e
-          continuous_output.add_exception(_('Error loading data from proxy'), e)
-        end
-
-        def find_options
-          { :verbosity_level => Setting[:ansible_verbosity] }
-        end
-      end
-    end
-  end
-end