foreman_remote_execution 0.3.0 → 0.3.1

data/test/functional/api/v2/job_templates_controller_test.rb

@@ -69,6 +69,21 @@ module Api
                      :job_template => {:name => ''}
         assert_response :unprocessable_entity
       end
+
+      test 'should export template' do
+        get :export, :id => @template.to_param
+        assert_equal @response.body, @template.to_erb
+        assert_response :success
+      end
+
+      test 'should import template' do
+        new_name = @template.name = "#{@template.name}_renamed"
+        erb_data = @template.to_erb
+        post :import, :template => erb_data
+        assert_response :success
+        assert JobTemplate.find_by_name(new_name)
+      end
     end
+
   end
 end

data/test/unit/actions/run_host_job_test.rb

@@ -0,0 +1,50 @@
+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

data/test/unit/concerns/exportable_test.rb

@@ -0,0 +1,88 @@
+require 'test_plugin_helper'
+
+module ForemanRemoteExecution
+  class ExportableTest < ActiveSupport::TestCase
+    class SampleModel
+      include ::ForemanRemoteExecution::Exportable
+
+      attr_accessor :name, :attrs, :subnet, :mac, :password, :subnet
+      attr_exportable :name, :attrs, :mac, :subnet, :mac => ->(m) { m.mac.upcase if m.mac },
+                                                    :custom_attr => ->(m) { 'hello world' }
+
+      def attributes
+        {
+          'name' => name,
+          'attrs' => attrs,
+          'mac' => mac,
+          'password' => password,
+          'subnet' => subnet
+        }
+      end
+    end
+
+    class SampleSubnet
+      include ::ForemanRemoteExecution::Exportable
+
+      attr_accessor :name, :network
+      attr_exportable :name, :network
+
+      def attributes
+        {
+          'name' => name,
+          'network' => network
+        }
+      end
+    end
+
+    def setup
+      @subnet = SampleSubnet.new
+      @subnet.name = 'pxe'
+      @subnet.network = '192.168.122.0'
+
+      @sample = SampleModel.new
+      @sample.name = 'name'
+      @sample.attrs = {'nested' => 'hash'}
+      @sample.subnet = @subnet
+      @sample.mac = 'aa:bb:cc:dd:ee:ff'
+      @sample.password = 'password'
+    end
+
+    test '#to_export includes all specified attributes' do
+      assert_equal %w(name attrs mac subnet custom_attr), @sample.to_export.keys
+    end
+
+    test '#to_export does not include all attributes' do
+      assert_not_include @sample.to_export.keys, 'password'
+    end
+
+    test '#to_export calls the lambda' do
+      export = @sample.to_export
+      assert_equal('AA:BB:CC:DD:EE:FF', export['mac'])
+      assert_equal(export['custom_attr'], 'hello world')
+    end
+
+    test '#to_export values are exported recursively' do
+      export = @sample.to_export
+      assert_equal('pxe', export['subnet']['name'])
+      assert_equal('192.168.122.0', export['subnet']['network'])
+    end
+
+    test '#to_export nested hashes are primitive' do
+      @sample.attrs = {:foo => 'bar', :baz => 'qux'}.with_indifferent_access
+      export = @sample.to_export
+      assert_instance_of Hash, export['attrs']
+    end
+
+    test '#to_export includes blank values' do
+      @sample.attrs = {}
+      export = @sample.to_export
+      assert_instance_of Hash, export['attrs']
+    end
+
+    test '#to_export(false) does not include blank values' do
+      @sample.attrs = {}
+      export = @sample.to_export(false)
+      assert_nil export['attrs']
+    end
+  end
+end

data/test/unit/job_invocation_composer_test.rb

@@ -433,7 +433,7 @@ describe JobInvocationComposer do
 
         describe 'with concurrency control set' do
           let(:params) do
-            { :job_invocation => { :providers => { :ssh => ssh_params }, :concurrency_level => "5", :time_span => "60" } }.with_indifferent_access
+            { :job_invocation => { :providers => { :ssh => ssh_params }, :concurrency_level => '5', :time_span => '60' } }.with_indifferent_access
           end
 
           it 'accepts the concurrency options' do

data/test/unit/job_invocation_test.rb

@@ -63,16 +63,14 @@ describe JobInvocation do
 
     describe 'descriptions' do
       it 'generates description from input values' do
-        job_invocation.expects(:save!)
         job_invocation.description_format = '%{job_category} - %{foo}'
-        job_invocation.generate_description!
+        job_invocation.generate_description
         job_invocation.description.must_equal "#{job_invocation.job_category} - #{@input_value.value}"
       end
 
       it 'handles missing keys correctly' do
-        job_invocation.expects(:save!)
         job_invocation.description_format = '%{job_category} - %{missing_key}'
-        job_invocation.generate_description!
+        job_invocation.generate_description
         job_invocation.description.must_equal "#{job_invocation.job_category} - %{missing_key}"
       end
 
@@ -80,10 +78,9 @@ describe JobInvocation do
         column_limit = 255
         expected_result = 'a' * column_limit
         JobInvocation.columns_hash['description'].expects(:limit).returns(column_limit)
-        job_invocation.expects(:save!)
         job_invocation.description_format = '%{job_category}'
         job_invocation.job_category = 'a' * 1000
-        job_invocation.generate_description!
+        job_invocation.generate_description
         job_invocation.description.must_equal expected_result
       end
     end

data/test/unit/job_template_test.rb

@@ -217,12 +217,44 @@ describe JobTemplate do
     end
 
     it 'syncs content' do
-      synced_template.template.must_match(/\s+ping -c <%= input\('count'\) %> <%= input\('hostname'\) %>\s+/m)
+      synced_template.template.must_match(/ping -c <%= input\('count'\) %> <%= input\('hostname'\) %>/m)
     end
 
     it 'syncs input sets' do
       synced_template.foreign_input_sets.first.target_template.must_equal included
-      synced_template.template_inputs_with_foreign.map(&:name).must_equal ["hostname", "count"]
+      synced_template.template_inputs_with_foreign.map(&:name).must_equal ['hostname', 'count']
+    end
+  end
+
+  context 'template export' do
+    let(:exportable_template) do
+      FactoryGirl.create(:job_template, :with_input)
+    end
+
+    let(:erb) do
+      exportable_template.to_erb
+    end
+
+    it 'exports name' do
+      erb.must_match(/^name: #{exportable_template.name}$/)
+    end
+
+    it 'includes template inputs' do
+      erb.must_match(/^template_inputs:$/)
+    end
+
+    it 'includes template contents' do
+      erb.must_include exportable_template.template
+    end
+
+    it 'is importable' do
+      erb
+      old_name = exportable_template.name
+      exportable_template.update_attributes(:name => "#{old_name}_renamed")
+
+      imported = JobTemplate.import!(erb)
+      imported.name.must_equal old_name
+      imported.template_inputs.first.to_export.must_equal exportable_template.template_inputs.first.to_export
     end
   end
 

data/test/unit/proxy_load_balancer_test.rb

@@ -8,15 +8,17 @@ describe ProxyLoadBalancer do
   end
 
   it 'load balances' do
-    proxies = FactoryGirl.create_list(:smart_proxy, 3, :ssh)
-    not_yet_seen = proxies.dup
+    count = 3
+    ProxyAPI::ForemanDynflow::DynflowProxy.any_instance.expects(:tasks_count).raises.then.times(count - 1).returns(0)
+    proxies = FactoryGirl.create_list(:smart_proxy, count, :ssh)
 
-    3.times do
-      found = load_balancer.next(proxies)
-      not_yet_seen.delete(found)
+    available = proxies.reduce([]) do |found, _|
+      found << load_balancer.next(proxies)
     end
 
-    not_yet_seen.must_be_empty
+    available.count.must_equal count
+    available.uniq.count.must_equal count - 1
+    load_balancer.offline.count.must_equal 1
   end
 
   it 'returns nil for if no proxy is available' do

data/test/unit/template_input_test.rb

@@ -3,6 +3,21 @@ require 'test_plugin_helper'
 describe TemplateInput do
   let(:template_input) { FactoryGirl.build(:template_input) }
 
+  context 'export' do
+    before do
+      template_input.input_type = 'user'
+      template_input.options = "foo\nbar\nbaz"
+    end
+
+    it 'exports type' do
+      template_input.to_export['input_type'].must_equal template_input.input_type
+    end
+
+    it 'exports options' do
+      template_input.to_export['options'].must_equal template_input.options
+    end
+  end
+
   context 'user input' do
     before { template_input.input_type = 'user' }
     it { assert template_input.user_template_input? }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -136,9 +136,11 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/execution_interface.js
+- app/assets/javascripts/job_templates.js
 - app/assets/javascripts/template_input.js
 - app/assets/javascripts/template_invocation.js
 - app/assets/stylesheets/job_invocations.css.scss
+- app/assets/stylesheets/modal_window.css.scss
 - app/assets/stylesheets/template_invocation.css.scss
 - app/controllers/api/v2/foreign_input_sets_controller.rb
 - app/controllers/api/v2/job_invocations_controller.rb
@@ -161,6 +163,7 @@ files:
 - app/mailers/.gitkeep
 - app/models/concerns/foreman_remote_execution/bookmark_extensions.rb
 - app/models/concerns/foreman_remote_execution/errors_flattener.rb
+- app/models/concerns/foreman_remote_execution/exportable.rb
 - app/models/concerns/foreman_remote_execution/foreman_tasks_task_extensions.rb
 - app/models/concerns/foreman_remote_execution/foreman_tasks_triggering_extensions.rb
 - app/models/concerns/foreman_remote_execution/host_extensions.rb
@@ -234,6 +237,7 @@ files:
 - app/views/job_invocations/show.js.erb
 - app/views/job_templates/_custom_tab_headers.html.erb
 - app/views/job_templates/_custom_tabs.html.erb
+- app/views/job_templates/_import_job_template_modal.html.erb
 - app/views/job_templates/edit.html.erb
 - app/views/job_templates/index.html.erb
 - app/views/job_templates/new.html.erb
@@ -335,8 +339,15 @@ files:
 - lib/tasks/foreman_remote_execution_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/de/LC_MESSAGES/foreman_remote_execution.mo
+- locale/de/foreman_remote_execution.po
+- locale/en/LC_MESSAGES/foreman_remote_execution.mo
 - locale/en/foreman_remote_execution.po
+- locale/en_GB/LC_MESSAGES/foreman_remote_execution.mo
+- locale/en_GB/foreman_remote_execution.po
 - locale/foreman_remote_execution.pot
+- locale/fr/LC_MESSAGES/foreman_remote_execution.mo
+- locale/fr/foreman_remote_execution.po
 - locale/gemspec.rb
 - test/factories/foreman_remote_execution_factories.rb
 - test/functional/api/v2/foreign_input_sets_controller_test.rb
@@ -345,8 +356,10 @@ 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/actions/run_proxy_command_test.rb
+- test/unit/concerns/exportable_test.rb
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/concerns/nic_extensions_test.rb
 - test/unit/execution_task_status_mapper_test.rb
@@ -393,8 +406,10 @@ 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/actions/run_proxy_command_test.rb
+- test/unit/concerns/exportable_test.rb
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/concerns/nic_extensions_test.rb
 - test/unit/execution_task_status_mapper_test.rb