foreman_remote_execution 1.2.2 → 1.3.0

data/test/unit/remote_execution_provider_test.rb

@@ -90,7 +90,6 @@ describe RemoteExecutionProvider do
       end
     end
 
-
     describe 'ssh port from settings' do
       before do
         Setting[:remote_execution_ssh_port] = '66'
@@ -112,5 +111,60 @@ describe RemoteExecutionProvider do
       end
     end
 
+    describe '#find_ip_or_hostname' do
+      let(:host) do
+        FactoryGirl.create(:host) do |host|
+          host.interfaces = [FactoryGirl.build(:nic_managed, flags.merge(:ip => nil, :name => 'somehost.somedomain.org', :primary => true)),
+                             FactoryGirl.build(:nic_managed, flags.merge(:ip => '127.0.0.1'))]
+        end
+      end
+
+      let(:flags) do
+        { :primary => false, :provision => false, :execution => false }
+      end
+
+      it 'gets fqdn from flagged interfaces if not preferring ips' do
+        # falling to primary interface
+        SSHExecutionProvider.find_ip_or_hostname(host).must_equal 'somehost.somedomain.org'
+
+        # execution wins if present
+        execution_interface = FactoryGirl.build(:nic_managed,
+                                                flags.merge(:execution => true, :name => 'special.somedomain.org'))
+        host.interfaces << execution_interface
+        host.primary_interface.update_attributes(:execution => false)
+        host.interfaces.each(&:save)
+        host.reload
+        SSHExecutionProvider.find_ip_or_hostname(host).must_equal execution_interface.fqdn
+      end
+
+      it 'gets ip from flagged interfaces' do
+        host.params['remote_execution_connect_by_ip'] = true
+        # no ip address set on relevant interface - fallback to fqdn
+        SSHExecutionProvider.find_ip_or_hostname(host).must_equal 'somehost.somedomain.org'
+
+        # provision interface with ip while primary without
+        provision_interface = FactoryGirl.build(:nic_managed,
+                                                flags.merge(:provision => true, :ip => '10.0.0.1'))
+        host.interfaces << provision_interface
+        host.primary_interface.update_attributes(:provision => false)
+        host.interfaces.each(&:save)
+        host.reload
+        SSHExecutionProvider.find_ip_or_hostname(host).must_equal provision_interface.ip
+
+        # both primary and provision interface have IPs: the primary wins
+        host.primary_interface.update_attributes(:ip => '10.0.0.2', :execution => false)
+        host.reload
+        SSHExecutionProvider.find_ip_or_hostname(host).must_equal host.primary_interface.ip
+
+        # there is an execution interface with IP: it wins
+        execution_interface = FactoryGirl.build(:nic_managed,
+                                                flags.merge(:execution => true, :ip => '10.0.0.3'))
+        host.interfaces << execution_interface
+        host.primary_interface.update_attributes(:execution => false)
+        host.interfaces.each(&:save)
+        host.reload
+        SSHExecutionProvider.find_ip_or_hostname(host).must_equal execution_interface.ip
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -312,6 +312,7 @@ files:
 - db/migrate/20160127162711_reword_puppet_template_description.rb
 - db/migrate/20160203104056_add_concurrency_options_to_job_invocation.rb
 - db/migrate/20160926225841_update_template_input_value.rb
+- db/migrate/20170110145641_add_host_action_button_to_remote_execution_feature.rb
 - db/seeds.d/60-ssh_proxy_feature.rb
 - db/seeds.d/70-job_templates.rb
 - db/seeds.d/90-bookmarks.rb
@@ -383,6 +384,8 @@ files:
 - locale/zh_CN/foreman_remote_execution.po
 - locale/zh_TW/LC_MESSAGES/foreman_remote_execution.mo
 - locale/zh_TW/foreman_remote_execution.po
+- test/benchmark/run_hosts_job_benchmark.rb
+- test/benchmark/targeting_benchmark.rb
 - test/factories/foreman_remote_execution_factories.rb
 - test/functional/api/v2/foreign_input_sets_controller_test.rb
 - test/functional/api/v2/job_invocations_controller_test.rb
@@ -390,7 +393,6 @@ files:
 - test/functional/api/v2/remote_execution_features_controller_test.rb
 - test/functional/api/v2/template_inputs_controller_test.rb
 - test/test_plugin_helper.rb
-- test/unit/actions/run_host_job_test.rb
 - test/unit/actions/run_hosts_job_test.rb
 - test/unit/concerns/exportable_test.rb
 - test/unit/concerns/host_extensions_test.rb
@@ -426,12 +428,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config
   management functionality with remote management functionality.
 test_files:
+- test/benchmark/run_hosts_job_benchmark.rb
+- test/benchmark/targeting_benchmark.rb
 - test/factories/foreman_remote_execution_factories.rb
 - test/functional/api/v2/foreign_input_sets_controller_test.rb
 - test/functional/api/v2/job_invocations_controller_test.rb
@@ -439,7 +443,6 @@ test_files:
 - test/functional/api/v2/remote_execution_features_controller_test.rb
 - test/functional/api/v2/template_inputs_controller_test.rb
 - test/test_plugin_helper.rb
-- test/unit/actions/run_host_job_test.rb
 - test/unit/actions/run_hosts_job_test.rb
 - test/unit/concerns/exportable_test.rb
 - test/unit/concerns/host_extensions_test.rb

data/test/unit/actions/run_host_job_test.rb

@@ -1,50 +0,0 @@
-require 'test_plugin_helper'
-
-module ForemanRemoteExecution
-  class RunHostJobTest < ActiveSupport::TestCase
-    include Dynflow::Testing
-
-    let(:action) do
-      create_action(Actions::RemoteExecution::RunHostJob)
-    end
-
-    describe '#find_ip_or_hostname' do
-      let(:host) { FactoryGirl.create(:host) }
-      let(:flags) do
-        { :primary => false, :provision => false, :execution => false }
-      end
-
-      it 'finds hostname' do
-        host.expects(:fqdn).returns('somehost.somedomain.org')
-        action.send(:find_ip_or_hostname, host).must_equal 'somehost.somedomain.org'
-      end
-
-      it 'gets ip from unflagged interfaces' do
-        ip = '127.0.0.1'
-        host.interfaces = [FactoryGirl.build(:nic_managed, flags.merge(:ip => nil)),
-                           FactoryGirl.build(:nic_managed, flags.merge(:ip => ip))]
-        action.send(:find_ip_or_hostname, host).must_equal ip
-      end
-
-      it 'gets ip from flagged interfaces' do
-        unflagged_interface = FactoryGirl.build(:nic_managed, flags)
-        host.interfaces = [unflagged_interface]
-        action.send(:find_ip_or_hostname, host).must_equal unflagged_interface.ip
-
-        provision_interface = FactoryGirl.build(:nic_managed, flags.merge(:provision => true))
-        host.interfaces << provision_interface
-        action.send(:find_ip_or_hostname, host).must_equal provision_interface.ip
-
-        primary_interface = FactoryGirl.build(:nic_managed, flags.merge(:primary => true))
-        host.interfaces << primary_interface
-        # Workaround, execution flag got enabled when adding the interface to the host
-        host.interfaces.last.execution = false
-        action.send(:find_ip_or_hostname, host).must_equal primary_interface.ip
-
-        execution_interface = FactoryGirl.build(:nic_managed, flags.merge(:execution => true))
-        host.interfaces << execution_interface
-        action.send(:find_ip_or_hostname, host).must_equal execution_interface.ip
-      end
-    end
-  end
-end