foreman_remote_execution 1.2.2 → 1.3.0

data/locale/zh_CN/foreman_remote_execution.po

@@ -97,8 +97,8 @@ msgstr "并发等级"
 msgid "Control concurrency level and distribution over time"
 msgstr "控制并行等级及分配时间"
 
-msgid "Could not use any proxy. Consider configuring %{global_proxy} or %{fallback_proxy} in settings"
-msgstr "无法使用任何代理服务器。可考虑在设置中配置 %{global_proxy} 或者 %{fallback_proxy}。"
+msgid "Could not use any proxy. Consider configuring %{global_proxy}, %{fallback_proxy} or %{no_proxy} in settings"
+msgstr ""
 
 msgid "Could not use any template used in the job invocation"
 msgstr "无法使用在任务调用中使用的任意模板"
@@ -118,9 +118,6 @@ msgstr "创建重复任务"
 msgid "Create a template input"
 msgstr "创建模板输入"
 
-msgid "Create architecture"
-msgstr "生成架构"
-
 msgid "Default user to use for SSH.  You may override per host by setting a parameter called remote_execution_ssh_user."
 msgstr "SSH 默认使用的用户。可设置 remote_execution_ssh_user 调用的参数替换每台主机设置。"
 
@@ -136,9 +133,6 @@ msgstr "删除任务模板"
 msgid "Delete a template input"
 msgstr "删除模板输入"
 
-msgid "Delete architecture"
-msgstr "删除架构"
-
 msgid "Description"
 msgstr "描述"
 
@@ -211,9 +205,6 @@ msgstr "已失败"
 msgid "Failed rendering template: %s"
 msgstr "修改模板失败：%s"
 
-msgid "Failed to initialize command"
-msgstr "初始化命令失败"
-
 msgid "Feature input %{input_name} not defined in template %{template_name}"
 msgstr "模板 %{template_name} 的功能输入 %{input_name} "
 
@@ -262,9 +253,6 @@ msgstr ""
 msgid "Indicates that the action should be cancelled if it cannot be started before this time."
 msgstr "表示如果在这个时间之前无法启动该操作，则应将其取消。"
 
-msgid "Initialization error: %s"
-msgstr "初始化出错：%s"
-
 msgid "Input"
 msgstr "输入"
 
@@ -391,9 +379,6 @@ msgstr "尚未完成任何执行"
 msgid "No hosts found."
 msgstr "未找到任何主机。"
 
-msgid "No output"
-msgstr "无输出结果"
-
 msgid "No template mapped to feature %{feature_name}"
 msgstr "没有与功能 %{feature_name} 映射的模板"
 
@@ -418,6 +403,12 @@ msgstr "等待处理"
 msgid "Perform no more executions after this time"
 msgstr "这个时间后不再执行任何操作"
 
+msgid "Playbook execution failed"
+msgstr ""
+
+msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
+msgstr ""
+
 msgid "Preview"
 msgstr "预览"
 
@@ -511,9 +502,6 @@ msgstr "将该任务调度为在将来的某个时间开始"
 msgid "Schedule the job to start at a later time"
 msgstr "将该任务调度为于稍后开始"
 
-msgid "Script execution failed"
-msgstr "脚本执行失败"
-
 msgid "Scroll to bottom"
 msgstr "滚动到底部"
 
@@ -699,9 +687,6 @@ msgstr "更新任务模板"
 msgid "Update a template input"
 msgstr "更新模板输入"
 
-msgid "Update architecture"
-msgstr "更新架构"
-
 msgid "Use default description template"
 msgstr "使用默认描述模板"
 
@@ -735,6 +720,11 @@ msgstr "应由什么用户运行此脚本（使用类似 sudo 的机制）。"
 msgid "What user should be used to run the script (using sudo-like mechanisms). Defaults to a template parameter or global setting."
 msgstr "应由什么用户运行此脚本（使用类似 sudo 的机制）。默认为模板参数或全局设置。"
 
+msgid ""
+"When enabled, the remote execution will try to run the commands directly, when no\n"
+"                     proxy with remote execution feature is configured for the host."
+msgstr ""
+
 msgid "Whether it should be allowed to override the effective user from the invocation form."
 msgstr "是否应允许使用调用形式替代有效用户。"
 

data/locale/zh_TW/foreman_remote_execution.po

@@ -97,8 +97,8 @@ msgstr "同步等級"
 msgid "Control concurrency level and distribution over time"
 msgstr "隨時間控制週期等級並散佈"
 
-msgid "Could not use any proxy. Consider configuring %{global_proxy} or %{fallback_proxy} in settings"
-msgstr "無法使用任何代理伺服器。請考慮配置設定中的 %{global_proxy} 或 %{fallback_proxy}"
+msgid "Could not use any proxy. Consider configuring %{global_proxy}, %{fallback_proxy} or %{no_proxy} in settings"
+msgstr ""
 
 msgid "Could not use any template used in the job invocation"
 msgstr "無法使用任何用於這工作祈願的範本"
@@ -118,9 +118,6 @@ msgstr "建立週期性工作"
 msgid "Create a template input"
 msgstr "建立範本輸入"
 
-msgid "Create architecture"
-msgstr "建立架構"
-
 msgid "Default user to use for SSH.  You may override per host by setting a parameter called remote_execution_ssh_user."
 msgstr "使用 SSH 的預設使用者。您可以透過設定參數呼叫 remote_execution_ssh_user 來覆寫每台主機的設定。"
 
@@ -136,9 +133,6 @@ msgstr "刪除工作範本"
 msgid "Delete a template input"
 msgstr "刪除範本輸入"
 
-msgid "Delete architecture"
-msgstr "刪除架構"
-
 msgid "Description"
 msgstr "說明"
 
@@ -211,9 +205,6 @@ msgstr "已失敗"
 msgid "Failed rendering template: %s"
 msgstr "無法生成範本：%s"
 
-msgid "Failed to initialize command"
-msgstr "無法初始化指令"
-
 msgid "Feature input %{input_name} not defined in template %{template_name}"
 msgstr "未知的輸入 %{input_name} 未定義於範本 %{template_name}"
 
@@ -262,9 +253,6 @@ msgstr ""
 msgid "Indicates that the action should be cancelled if it cannot be started before this time."
 msgstr "這表示如果不能在這時間之前開始，就應該取消動作。"
 
-msgid "Initialization error: %s"
-msgstr "初始化錯誤：%s"
-
 msgid "Input"
 msgstr "輸入"
 
@@ -391,9 +379,6 @@ msgstr "尚無執行完成"
 msgid "No hosts found."
 msgstr "找不到主機。"
 
-msgid "No output"
-msgstr "沒有輸出"
-
 msgid "No template mapped to feature %{feature_name}"
 msgstr "沒有範本定義至功能 %{feature_name}"
 
@@ -418,6 +403,12 @@ msgstr "等待處理中"
 msgid "Perform no more executions after this time"
 msgstr "此時間之後不再進行任何執行"
 
+msgid "Playbook execution failed"
+msgstr ""
+
+msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
+msgstr ""
+
 msgid "Preview"
 msgstr "預覽"
 
@@ -511,9 +502,6 @@ msgstr "排程工作至未來時間"
 msgid "Schedule the job to start at a later time"
 msgstr "排程工作至晚一點的時間"
 
-msgid "Script execution failed"
-msgstr "執行 script 失敗"
-
 msgid "Scroll to bottom"
 msgstr "捲動至底端"
 
@@ -699,9 +687,6 @@ msgstr "更新工作範本"
 msgid "Update a template input"
 msgstr "更新範本輸入"
 
-msgid "Update architecture"
-msgstr "更新架構"
-
 msgid "Use default description template"
 msgstr "使用預設的描述範本"
 
@@ -735,6 +720,11 @@ msgstr "哪位使用者該用來執行此 script（使用類似 sudo 機制）"
 msgid "What user should be used to run the script (using sudo-like mechanisms). Defaults to a template parameter or global setting."
 msgstr "哪位使用者該用來執行此 script（使用類似 sudo 機制）。預設值設為範本參數或全域設定。"
 
+msgid ""
+"When enabled, the remote execution will try to run the commands directly, when no\n"
+"                     proxy with remote execution feature is configured for the host."
+msgstr ""
+
 msgid "Whether it should be allowed to override the effective user from the invocation form."
 msgstr "是否允許從祈願清單覆寫有效使用者。"
 

data/test/benchmark/run_hosts_job_benchmark.rb

@@ -0,0 +1,70 @@
+require "benchmark/benchmark_helper"
+require 'dynflow/testing'
+
+# Add plugin to FactoryGirl's paths
+FactoryGirl.definition_file_paths << File.expand_path('../../factories', __FILE__)
+FactoryGirl.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
+FactoryGirl.reload
+
+module Actions
+  module RemoteExecution
+    class RunHostsJob < Actions::ActionWithSubPlans
+      # stub function that calls other actions.
+      def trigger(*args)
+        nil
+      end
+    end
+  end
+end
+
+module Support
+  class DummyDynflowAction < Dynflow::Action
+  end
+end
+
+def generate_hosts(total)
+  FactoryGirl.create_list(:host, total, :comment => "benchmark-#{Foreman.uuid}")
+end
+
+Rails.logger.level = Logger::ERROR
+
+class ActionTester
+  include Dynflow::Testing::Factories
+
+  def initialize(task)
+    @task = task
+  end
+
+  def run_action(*args)
+    action = create_action(Actions::RemoteExecution::RunHostsJob)
+    @task.update_attributes(:external_id => action.execution_plan_id)
+    plan_action(action, *args)
+  end
+end
+
+puts 'generating admin user'
+admin = FactoryGirl.build(:user, :admin)
+admin.save(:validate => false)
+User.current = admin
+targeting = FactoryGirl.create(:targeting, :search_query => "comment = benchmark-#{Foreman.uuid}", :user => User.current)
+template_invocation = FactoryGirl.build(:template_invocation, :job_invocation => nil)
+job_invocation = FactoryGirl.build(:job_invocation, :targeting => targeting, :pattern_template_invocations => [template_invocation]).tap do |invocation|
+  invocation.targeting = targeting
+  invocation.save
+end
+
+task = FactoryGirl.create(:dynflow_task, :external_id => '1')
+tester = ActionTester.new(task)
+
+puts 'generating hosts'
+generate_hosts(1000)
+puts 'starting benchmarking'
+foreman_benchmark do
+  Benchmark.ips do |x|
+    x.config(:time => 10, :warmup => 0)
+
+    x.report("rex-run-hosts-job") do
+      tester.run_action(job_invocation)
+    end
+  end
+end

data/test/benchmark/targeting_benchmark.rb

@@ -0,0 +1,31 @@
+require "benchmark/benchmark_helper"
+require 'dynflow/testing'
+
+# Add plugin to FactoryGirl's paths
+FactoryGirl.definition_file_paths << File.expand_path('../../factories', __FILE__)
+FactoryGirl.reload
+
+def generate_hosts(total)
+  FactoryGirl.create_list(:host, total, :comment => "benchmark-#{Foreman.uuid}")
+end
+
+Rails.logger.level = Logger::ERROR
+
+puts 'generating hosts'
+generate_hosts(1000)
+puts 'generating admin user'
+admin = FactoryGirl.build(:user, :admin)
+admin.save(:validate => false)
+User.current = admin
+
+puts 'starting benchmarking'
+foreman_benchmark do
+  Benchmark.ips do |x|
+    x.config(:time => 10, :warmup => 0)
+
+    x.report("rex-targeting-resolve-hosts") do
+      targeting = FactoryGirl.create(:targeting, :search_query => "comment = benchmark-#{Foreman.uuid}", :user => User.current)
+      targeting.resolve_hosts!
+    end
+  end
+end

data/test/factories/foreman_remote_execution_factories.rb

@@ -5,6 +5,9 @@ FactoryGirl.define do
     sequence(:job_category) { |n| "job name #{n}" }
     f.template 'id'
     f.provider_type 'SSH'
+    organizations { [Organization.find_by_name('Organization 1')] } if SETTINGS[:organizations_enabled]
+    locations { [Location.find_by_name('Location 1')] } if SETTINGS[:locations_enabled]
+
 
     trait :with_input do
       after(:build) do |template, evaluator|

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

@@ -91,7 +91,7 @@ module Api
         erb_data = @template.to_erb
         post :import, :template => erb_data
         assert_response :success
-        assert JobTemplate.find_by_name(new_name)
+        assert JobTemplate.unscoped.find_by_name(new_name)
       end
     end
 

data/test/unit/actions/run_hosts_job_test.rb

@@ -43,6 +43,7 @@ module ForemanRemoteExecution
     end
 
     it 'triggers the RunHostJob actions on the resolved hosts in run phase' do
+      planned.expects(:output).returns(:planned_count => 0)
       planned.expects(:trigger).with() { |*args| args[0] == Actions::RemoteExecution::RunHostJob }
       planned.create_sub_plans
     end

data/test/unit/concerns/host_extensions_test.rb

@@ -40,10 +40,7 @@ describe ForemanRemoteExecution::HostExtensions do
 
     it 'has ssh keys in the parameters even when no user specified' do
       # this is a case, when using the helper in provisioning templates
-      FactoryGirl.create(:smart_proxy, :ssh) do |proxy|
-        proxy.organizations << host.organization
-        proxy.locations << host.location
-      end
+      FactoryGirl.create(:smart_proxy, :ssh)
       host.interfaces.first.subnet.remote_execution_proxies.clear
       User.current = nil
       host.remote_execution_ssh_keys.must_include sshkey

data/test/unit/job_invocation_test.rb

@@ -45,6 +45,10 @@ describe JobInvocation do
 
     before do
       input = job_invocation.pattern_template_invocations.first.template.template_inputs.create!(:name => 'foo', :required => true, :input_type => 'user')
+      input2 = job_invocation.pattern_template_invocations.first.template.template_inputs.create!(:name => 'bar', :required => true, :input_type => 'user')
+      FactoryGirl.create(:template_invocation_input_value,
+                         :template_invocation => job_invocation.pattern_template_invocations.first,
+                         :template_input => input2)
       @input_value = FactoryGirl.create(:template_invocation_input_value,
                                         :template_invocation => job_invocation.pattern_template_invocations.first,
                                         :template_input => input)
@@ -101,6 +105,18 @@ describe JobInvocation do
 
   context 'with task' do
     let(:task) { ForemanTasks::Task.new }
+    let(:progress_report_without_sub_tasks) do
+      {
+        :error     => 0,
+        :warning   => 0,
+        :total     => 0,
+        :success   => 0,
+        :cancelled => 0,
+        :failed    => 0,
+        :pending   => 0,
+        :progress  => 0
+      }
+    end
     before { job_invocation.task = task }
 
     context 'which is scheduled' do
@@ -109,6 +125,7 @@ describe JobInvocation do
       specify { job_invocation.status.must_equal HostStatus::ExecutionStatus::QUEUED }
       specify { job_invocation.queued?.must_equal true }
       specify { job_invocation.progress.must_equal 0 }
+      specify { job_invocation.progress_report.must_equal progress_report_without_sub_tasks }
     end
 
     context 'with succeeded task' do
@@ -119,7 +136,17 @@ describe JobInvocation do
 
       specify { job_invocation.status.must_equal HostStatus::ExecutionStatus::OK }
       specify { job_invocation.queued?.must_equal false }
-      specify { job_invocation.progress.must_equal 100 }
+
+      it 'calculates the progress correctly' do
+        sub_tasks = [ForemanTasks::Task.new]
+        job_invocation.targeting.expects(:resolved?).returns(true)
+        job_invocation.targeting.expects(:hosts).returns([1])
+        sub_tasks.expects(:where).with(:result => %w(success warning error)).returns(sub_tasks)
+        job_invocation.stubs(:sub_tasks).returns(sub_tasks)
+
+        job_invocation.progress.must_equal 100
+      end
     end
   end
+
 end

data/test/unit/remote_execution_feature_test.rb

@@ -42,5 +42,45 @@ describe RemoteExecutionFeature do
 
       composer.targeting.search_query.must_equal "name = #{host.name}"
     end
+
+    it "updates the feature when attributes change" do
+      updated_feature = RemoteExecutionFeature.register(install_feature.label, N_('Katello: Install package'),
+                                                        :description => 'New description',
+                                                        :provided_inputs => ['package', 'force'])
+      updated_feature.reload
+      updated_feature.id.must_equal(install_feature.id)
+      updated_feature.description.must_equal 'New description'
+      updated_feature.provided_input_names.must_equal ['package', 'force']
+    end
+  end
+
+  describe '.register' do
+    it "creates a feature if it's missing" do
+      feature = RemoteExecutionFeature.register('new_feature_that_does_not_exist', 'name')
+      feature.must_be :persisted?
+      feature.label.must_equal 'new_feature_that_does_not_exist'
+      feature.name.must_equal 'name'
+      refute feature.host_action_button
+    end
+
+    it "creates a feature with host action flag" do
+      feature = RemoteExecutionFeature.register('new_feature_that_does_not_exist_button', 'name', :host_action_button => true)
+      feature.must_be :persisted?
+      assert feature.host_action_button
+    end
+
+    it "created feature with host action flag can be found using named scope" do
+      feature = RemoteExecutionFeature.register('new_feature_that_does_not_exist_button', 'name', :host_action_button => true)
+      assert_includes RemoteExecutionFeature.with_host_action_button, feature
+    end
+
+
+    it "updates a feature if it exists" do
+      existing = FactoryGirl.create(:remote_execution_feature, :name => 'existing_feature_withou_action_button')
+      feature = RemoteExecutionFeature.register(existing.label, existing.name, :host_action_button => true)
+      feature.must_be :persisted?
+      existing.reload
+      assert existing.host_action_button
+    end
   end
 end