foreman_remote_execution 0.1.2 → 0.2.1

data/test/unit/job_invocation_test.rb

@@ -5,41 +5,55 @@ describe JobInvocation do
   let(:job_invocation) { FactoryGirl.build(:job_invocation) }
   let(:template) { FactoryGirl.create(:job_template, :with_input) }
 
-  context 'Search for job invocations' do
+  context 'search for job invocations' do
     before do
       job_invocation.save
     end
 
     it 'is able to perform search through job invocations' do
-      found_jobs = JobInvocation.search_for(%{job_name = "#{job_invocation.job_name}"}).paginate(:page => 1).with_task.order('job_invocations.id DESC')
+      found_jobs = JobInvocation.search_for(%{job_category = "#{job_invocation.job_category}"}).paginate(:page => 1).with_task.order('job_invocations.id DESC')
       found_jobs.must_equal [job_invocation]
     end
   end
 
-  context 'Able to be created' do
+  context 'able to be created' do
     it { assert job_invocation.save }
   end
 
-  context 'Requires targeting' do
+  context 'requires targeting' do
     before { job_invocation.targeting = nil }
 
     it { refute_valid job_invocation }
   end
 
+  context 'can delete a host' do
+    let(:host) do
+      FactoryGirl.create(:host)
+    end
+
+    it 'can remove a host' do
+      job_invocation.template_invocations.build(:host_id => host.id, :template_id => template.id)
+      job_invocation.save!
+      host.destroy
+      job_invocation.reload
+      job_invocation.template_invocations.must_be_empty
+    end
+  end
+
   context 'has template invocations with input values' do
     let(:job_invocation) { FactoryGirl.create(:job_invocation, :with_template) }
 
     before do
-      input = job_invocation.template_invocations.first.template.template_inputs.create!(:name => 'foo', :required => true, :input_type => 'user')
+      input = job_invocation.pattern_template_invocations.first.template.template_inputs.create!(:name => 'foo', :required => true, :input_type => 'user')
       @input_value = FactoryGirl.create(:template_invocation_input_value,
-                                        :template_invocation =>  job_invocation.template_invocations.first,
-                                        :template_input      => input)
+                                        :template_invocation => job_invocation.pattern_template_invocations.first,
+                                        :template_input => input)
       job_invocation.reload
-      job_invocation.template_invocations.first.reload
+      job_invocation.pattern_template_invocations.first.reload
     end
 
-    it { refute job_invocation.reload.template_invocations.empty? }
-    it { refute job_invocation.reload.template_invocations.first.input_values.empty? }
+    it { refute job_invocation.reload.pattern_template_invocations.empty? }
+    it { refute job_invocation.reload.pattern_template_invocations.first.input_values.empty? }
 
     it 'validates required inputs have values' do
       assert job_invocation.valid?
@@ -50,27 +64,65 @@ describe JobInvocation do
     describe 'descriptions' do
       it 'generates description from input values' do
         job_invocation.expects(:save!)
-        job_invocation.description_format = '%{job_name} - %{foo}'
+        job_invocation.description_format = '%{job_category} - %{foo}'
         job_invocation.generate_description!
-        job_invocation.description.must_equal "#{job_invocation.job_name} - #{@input_value.value}"
+        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_name} - %{missing_key}'
+        job_invocation.description_format = '%{job_category} - %{missing_key}'
+        job_invocation.generate_description!
+        job_invocation.description.must_equal "#{job_invocation.job_category} - %{missing_key}"
+      end
+
+      it 'truncates generated description to 255 characters' 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.description.must_equal "#{job_invocation.job_name} - %{missing_key}"
+        job_invocation.description.must_equal expected_result
       end
     end
   end
 
   context 'future execution' do
-
     it 'can report host count' do
       job_invocation.total_hosts_count.must_equal 'N/A'
       job_invocation.targeting.expects(:resolved_at).returns(Time.now)
       job_invocation.total_hosts_count.must_equal 0
     end
 
+    # task does not exist
+    specify { job_invocation.status.must_equal HostStatus::ExecutionStatus::QUEUED }
+    specify { job_invocation.status_label.must_equal HostStatus::ExecutionStatus::STATUS_NAMES[HostStatus::ExecutionStatus::QUEUED] }
+    specify { job_invocation.progress.must_equal 0 }
+  end
+
+  context 'with task' do
+    let(:task) { ForemanTasks::Task.new }
+    before { job_invocation.task = task }
+
+    context 'which is scheduled' do
+      before { task.state = 'scheduled' }
+
+      specify { job_invocation.status.must_equal HostStatus::ExecutionStatus::QUEUED }
+      specify { job_invocation.queued?.must_equal true }
+      specify { job_invocation.progress.must_equal 0 }
+    end
+
+    context 'with succeeded task' do
+      before do
+        task.state = 'stopped'
+        task.result = 'success'
+      end
+
+      specify { job_invocation.status.must_equal HostStatus::ExecutionStatus::OK }
+      specify { job_invocation.queued?.must_equal false }
+      specify { job_invocation.progress.must_equal 100 }
+    end
   end
 end

data/test/unit/job_template_effective_user_test.rb

@@ -1,7 +1,7 @@
 require 'test_plugin_helper'
 
 describe JobTemplateEffectiveUser do
-  let(:job_template) { FactoryGirl.build(:job_template, :job_name => '') }
+  let(:job_template) { FactoryGirl.build(:job_template, :job_category => '') }
   let(:effective_user) { job_template.effective_user }
 
   before do
@@ -33,7 +33,7 @@ describe JobTemplateEffectiveUser do
     end
 
     it 'returns a default value when no value is specified for the user' do
-      effective_user.value = ""
+      effective_user.value = ''
       Setting[:remote_execution_effective_user] = 'myuser'
       effective_user.compute_value.must_equal 'myuser'
     end

data/test/unit/job_template_test.rb

@@ -2,21 +2,35 @@ require 'test_plugin_helper'
 
 describe JobTemplate do
   context 'when creating a template' do
-    let(:job_template) { FactoryGirl.build(:job_template, :job_name => '') }
+    let(:job_template) { FactoryGirl.build(:job_template, :job_category => '') }
+    let(:template_with_inputs) do
+      FactoryGirl.build(:job_template, :template => 'test').tap do |template|
+        template.template_inputs << FactoryGirl.build(:template_input, :name => 'command', :input_type => 'user')
+        template.save!
+      end
+    end
 
-    it 'needs a job_name' do
+    it 'needs a job_category' do
       refute job_template.valid?
     end
 
-    it 'does not need a job_name if it is a snippet' do
+    it 'does not need a job_category if it is a snippet' do
       job_template.snippet = true
       assert job_template.valid?
     end
+
+    it 'validates the inputs are uniq in the template' do
+      job_template.job_category = 'Miscellaneous'
+      job_template.foreign_input_sets << FactoryGirl.build(:foreign_input_set, :target_template => template_with_inputs)
+      job_template.foreign_input_sets << FactoryGirl.build(:foreign_input_set, :target_template => template_with_inputs)
+      refute job_template.valid?
+      job_template.errors.full_messages.first.must_include 'Duplicated inputs detected: ["command"]'
+    end
   end
 
   context 'description format' do
-    let(:template_with_description) { FactoryGirl.build(:job_template, :with_description_format, :job_name => 'test job') }
-    let(:template) { FactoryGirl.build(:job_template, :with_input, :job_name => 'test job') }
+    let(:template_with_description) { FactoryGirl.build(:job_template, :with_description_format, :job_category => 'test job') }
+    let(:template) { FactoryGirl.build(:job_template, :with_input, :job_category => 'test job') }
     let(:minimal_template) { FactoryGirl.build(:job_template) }
 
     it 'uses the description_format attribute if set' do
@@ -24,14 +38,14 @@ describe JobTemplate do
     end
 
     it 'uses the job name as description_format if not set or blank and has no inputs' do
-      minimal_template.generate_description_format.must_equal '%{job_name}'
+      minimal_template.generate_description_format.must_equal '%{job_category}'
       minimal_template.description_format = ''
-      minimal_template.generate_description_format.must_equal '%{job_name}'
+      minimal_template.generate_description_format.must_equal '%{job_category}'
     end
 
     it 'generates the description_format if not set or blank and has inputs' do
       input_name = template.template_inputs.first.name
-      expected_result = %Q(%{job_name} with inputs #{input_name}="%{#{input_name}}")
+      expected_result = %Q(%{job_category} with inputs #{input_name}="%{#{input_name}}")
       template.generate_description_format.must_equal expected_result
       template.description_format = ''
       template.generate_description_format.must_equal expected_result
@@ -58,8 +72,8 @@ describe JobTemplate do
       <%#
       kind: job_template
       name: Service Restart
-      job_name: Service Restart
-      provider_type: Ssh
+      job_category: Service Restart
+      provider_type: SSH
       template_inputs:
       - name: service_name
         input_type: user
@@ -91,13 +105,23 @@ describe JobTemplate do
 
   context 'there is existing template invocation of a job template' do
     let(:job_invocation) { FactoryGirl.create(:job_invocation, :with_template) }
-    let(:job_template) { job_invocation.template_invocations.first.template }
+    let(:job_template) { job_invocation.pattern_template_invocations.first.template }
 
     describe 'job template deletion' do
       it 'succeeds' do
-        job_template.template_invocations.wont_be_empty
+        job_template.pattern_template_invocations.wont_be_empty
         assert job_template.destroy
       end
     end
   end
+
+  context 'template locked' do
+    it 'inputs cannot be changed' do
+      job_template = FactoryGirl.create(:job_template, :with_input, :locked => true)
+      Foreman.expects(:in_rake?).returns(false).at_least_once
+      assert_valid job_template
+      job_template.template_inputs.first.name = 'something else'
+      refute_valid job_template
+    end
+  end
 end

data/test/unit/remote_execution_provider_test.rb

@@ -5,10 +5,10 @@ describe RemoteExecutionProvider do
     let(:providers) { RemoteExecutionProvider.providers }
     it { providers.must_be_kind_of HashWithIndifferentAccess }
     it 'makes providers accessible using symbol' do
-      providers[:Ssh].must_equal SSHExecutionProvider
+      providers[:SSH].must_equal SSHExecutionProvider
     end
     it 'makes providers accessible using string' do
-      providers['Ssh'].must_equal SSHExecutionProvider
+      providers['SSH'].must_equal SSHExecutionProvider
     end
   end
 
@@ -24,11 +24,11 @@ describe RemoteExecutionProvider do
 
   describe '.provider_for' do
     it 'accepts symbols' do
-      RemoteExecutionProvider.provider_for(:Ssh).must_equal SSHExecutionProvider
+      RemoteExecutionProvider.provider_for(:SSH).must_equal SSHExecutionProvider
     end
 
     it 'accepts strings' do
-      RemoteExecutionProvider.provider_for('Ssh').must_equal SSHExecutionProvider
+      RemoteExecutionProvider.provider_for('SSH').must_equal SSHExecutionProvider
     end
   end
 
@@ -44,7 +44,7 @@ describe RemoteExecutionProvider do
     context 'provider is registetered under :custom symbol' do
       before { RemoteExecutionProvider.register(:Custom, String) }
 
-      it { provider_names.must_include 'Ssh' }
+      it { provider_names.must_include 'SSH' }
       it { provider_names.must_include 'Custom' }
     end
   end
@@ -55,7 +55,7 @@ describe RemoteExecutionProvider do
     end
 
     let(:job_invocation) { FactoryGirl.create(:job_invocation, :with_template) }
-    let(:template_invocation) { job_invocation.template_invocations.first }
+    let(:template_invocation) { job_invocation.pattern_template_invocations.first }
     let(:host) { FactoryGirl.create(:host) }
     let(:proxy_options) { SSHExecutionProvider.proxy_command_options(template_invocation, host) }
 

data/test/unit/targeting_test.rb

@@ -6,7 +6,7 @@ describe Targeting do
   let(:host) { FactoryGirl.create(:host) }
 
   before do
-    bookmark.query = "name = bar"
+    bookmark.query = 'name = bar'
   end
 
   describe '#resolved?' do
@@ -23,7 +23,7 @@ describe Targeting do
   end
 
   context 'able to be created with search term' do
-    before { targeting.search_query = "name = foo" }
+    before { targeting.search_query = 'name = foo' }
     it { assert targeting.save }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: 0.7.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: 0.7.11
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +140,7 @@ files:
 - app/assets/javascripts/template_invocation.js
 - app/assets/stylesheets/job_invocations.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
 - app/controllers/api/v2/job_templates_controller.rb
 - app/controllers/api/v2/template_inputs_controller.rb
@@ -161,6 +148,7 @@ files:
 - app/controllers/job_templates_controller.rb
 - app/controllers/template_invocations_controller.rb
 - app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb
+- app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb
 - app/helpers/remote_execution_helper.rb
 - app/lib/actions/middleware/bind_job_invocation.rb
 - app/lib/actions/remote_execution/helpers/live_output.rb
@@ -179,8 +167,8 @@ files:
 - app/models/concerns/foreman_remote_execution/subnet_extensions.rb
 - app/models/concerns/foreman_remote_execution/taxonomy_extensions.rb
 - app/models/concerns/foreman_remote_execution/template_extensions.rb
-- app/models/concerns/foreman_remote_execution/template_relations.rb
 - app/models/concerns/foreman_remote_execution/user_extensions.rb
+- app/models/foreign_input_set.rb
 - app/models/host_status/execution_status.rb
 - app/models/input_template_renderer.rb
 - app/models/job_invocation.rb
@@ -203,6 +191,11 @@ files:
 - app/overrides/foreman/subnets/_rex_tab_pane.html.erb
 - app/overrides/subnet_proxies.rb
 - app/services/proxy_load_balancer.rb
+- app/views/api/v2/foreign_input_sets/base.json.rabl
+- app/views/api/v2/foreign_input_sets/create.json.rabl
+- app/views/api/v2/foreign_input_sets/index.json.rabl
+- app/views/api/v2/foreign_input_sets/main.json.rabl
+- app/views/api/v2/foreign_input_sets/show.json.rabl
 - app/views/api/v2/job_invocations/base.json.rabl
 - app/views/api/v2/job_invocations/create.json.rabl
 - app/views/api/v2/job_invocations/index.json.rabl
@@ -222,9 +215,10 @@ files:
 - app/views/dashboard/.gitkeep
 - app/views/job_invocation_task_groups/_job_invocation_task_group.html.erb
 - app/views/job_invocation_task_groups/_job_invocation_task_groups.html.erb
+- app/views/job_invocations/_description_fields.html.erb
 - app/views/job_invocations/_form.html.erb
 - app/views/job_invocations/_host_actions_td.html.erb
-- app/views/job_invocations/_host_provider_td.html.erb
+- app/views/job_invocations/_host_name_td.html.erb
 - app/views/job_invocations/_host_status_td.html.erb
 - app/views/job_invocations/_preview_hosts_list.html.erb
 - app/views/job_invocations/_preview_hosts_modal.html.erb
@@ -237,10 +231,10 @@ 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/auto_complete_job_name.json.erb
 - app/views/job_templates/edit.html.erb
 - app/views/job_templates/index.html.erb
 - app/views/job_templates/new.html.erb
+- app/views/template_inputs/_foreign_input_set_form.html.erb
 - app/views/template_inputs/_form.html.erb
 - app/views/template_invocations/_output_line_set.html.erb
 - app/views/template_invocations/_refresh.js.erb
@@ -272,9 +266,17 @@ files:
 - db/migrate/20151203100824_add_description_to_job_invocation.rb
 - db/migrate/20151215114631_add_host_id_to_template_invocation.rb
 - db/migrate/20151217092555_migrate_to_task_groups.rb
+- db/migrate/20160108134600_create_template_input_sets.rb
+- db/migrate/20160108141144_make_job_name_default_to_something.rb
+- db/migrate/20160111113032_upcase_ssh_feature.rb
+- db/migrate/20160113161916_add_run_host_job_task_id_to_template_invocation.rb
+- db/migrate/20160113162007_expand_all_template_invocations.rb
+- db/migrate/20160114120200_rename_job_categories.rb
+- db/migrate/20160114125628_rename_job_name_to_job_category.rb
 - db/seeds.d/60-ssh_proxy_feature.rb
 - db/seeds.d/70-job_templates.rb
 - db/seeds.d/80-provision_templates.rb
+- db/seeds.d/90-bookmarks.rb
 - doc/.bin/.gitkeep
 - doc/.gitignore
 - doc/Gemfile
@@ -322,6 +324,7 @@ files:
 - locale/foreman_remote_execution.pot
 - locale/gemspec.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
 - test/functional/api/v2/job_templates_controller_test.rb
 - test/functional/api/v2/template_inputs_controller_test.rb
@@ -330,6 +333,7 @@ files:
 - test/unit/actions/run_proxy_command_test.rb
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/concerns/nic_extensions_test.rb
+- test/unit/execution_task_status_mapper_test.rb
 - test/unit/input_template_renderer_test.rb
 - test/unit/job_invocation_composer_test.rb
 - test/unit/job_invocation_test.rb
@@ -366,6 +370,7 @@ summary: A plugin bringing remote execution to the Foreman, completing the confi
   management functionality with remote management functionality.
 test_files:
 - 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
 - test/functional/api/v2/job_templates_controller_test.rb
 - test/functional/api/v2/template_inputs_controller_test.rb
@@ -374,6 +379,7 @@ test_files:
 - test/unit/actions/run_proxy_command_test.rb
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/concerns/nic_extensions_test.rb
+- test/unit/execution_task_status_mapper_test.rb
 - test/unit/input_template_renderer_test.rb
 - test/unit/job_invocation_composer_test.rb
 - test/unit/job_invocation_test.rb