diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb
index 510676f..baae6b3 100644
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
@@ -1,59 +1,59 @@
class JobsController < ApplicationController
before_action :fetch_job, only: [:show, :edit, :update, :destroy, :toggle_enable]
before_action :fetch_host, only: [:new, :edit, :show, :create, :update, :toggle_enable]
# GET /jobs
def new
@job = @host.job_templates.new
end
# POST /jobs
def create
@job = @host.job_templates.new(fetch_params)
- if @job.save
+ if @job.save_and_create_restore_job
redirect_to host_path(@host)
else
render :new
end
end
# GET /jobs/1
def show; end
# GET /jobs/1/edit
def edit;end
# PUT /jobs/1
def update
if @job.update_attributes(fetch_params)
redirect_to host_job_path(@host, @job)
else
render :edit
end
end
# DELETE /jobs/1
def destroy
end
# PATCH /hosts/1/jobs/1/enable
def toggle_enable
@job.enabled = !@job.enabled
@job.save
redirect_to host_path(@host)
end
private
def fetch_job
@job = JobTemplate.find(params[:id])
end
def fetch_host
@host = Host.find(params[:host_id])
end
def fetch_params
params.require(:job_template).permit(:name, :fileset_id, :schedule_id)
end
end
diff --git a/app/models/job_template.rb b/app/models/job_template.rb
index 796f595..04a2b15 100644
--- a/app/models/job_template.rb
+++ b/app/models/job_template.rb
@@ -1,58 +1,71 @@
class JobTemplate < ActiveRecord::Base
establish_connection Baas::settings[:local_db]
enum job_type: { backup: 0, restore: 1, verify: 2, admin: 3 }
belongs_to :host
belongs_to :fileset
belongs_to :schedule
validates :name, :fileset_id, presence: true
validates :schedule_id, presence: true, unless: :restore?
before_save :set_job_type
scope :enabled, -> { where(enabled: true) }
# configurable
DEFAULT_OPTIONS = {
storage: :File,
pool: :Default,
messages: :Standard,
priority: 10,
:'Write Bootstrap' => '"/var/lib/bacula/%c.bsr"'
}
def to_bacula_config_array
['Job {'] +
DEFAULT_OPTIONS.map { |k,v| " #{k.capitalize} = #{v}" } +
options_array.map { |x| " #{x}" } +
['}']
end
def priority
DEFAULT_OPTIONS[:priority]
end
def enabled_human
enabled? ? 'yes' : 'no'
end
+ def schedule_human
+ schedule.present? ? schedule.name : '-'
+ end
+
+ def save_and_create_restore_job
+ if save_status = save
+ restore_job = JobTemplate.new(host: host, job_type: :restore,
+ fileset: fileset, name: 'Restore_' + name)
+ restore_job.save
+ end
+ save_status
+ end
+
private
# Sets the default job_type as backup
def set_job_type
self.job_type = :backup if job_type.nil?
end
def options_array
result = restore? ? ['Where = "/tmp/bacula-restores"'] : []
result += [
"Name = \"#{name}\"",
"FileSet = \"#{fileset.name}\"",
"Client = \"#{host.name}\"",
"Type = \"#{job_type.capitalize}\"",
"Schedule = \"#{schedule.name}\""
]
end
end
diff --git a/app/views/jobs/_job_template_details.html.erb b/app/views/jobs/_job_template_details.html.erb
index 6cba013..0280fec 100644
--- a/app/views/jobs/_job_template_details.html.erb
+++ b/app/views/jobs/_job_template_details.html.erb
@@ -1,18 +1,18 @@
<%= link_to job.name, host_job_path(@host, job) %> |
<%= job.job_type %> |
<%= job.fileset.name %> |
<%= job.restore_location %> |
- <%= job.schedule.name %> |
+ <%= job.schedule_human %> |
<%= job.priority %> |
<% if job.enabled? %>
<%= link_to 'Disable', toggle_enable_host_job_path(@host, job), method: :patch,
class: "btn btn-warning", role: "button" %>
<% else %>
<%= link_to 'Enable', toggle_enable_host_job_path(@host, job), method: :patch,
class: "btn btn-info", role: "button" %>
<% end %>
|
diff --git a/spec/controllers/jobs_controller_spec.rb b/spec/controllers/jobs_controller_spec.rb
index 876a3de..c57b2b7 100644
--- a/spec/controllers/jobs_controller_spec.rb
+++ b/spec/controllers/jobs_controller_spec.rb
@@ -1,64 +1,69 @@
require 'spec_helper'
describe JobsController do
let!(:host) { FactoryGirl.create(:host) }
describe 'GET #new' do
before { get :new, host_id: host.id }
it 'initializes a job' do
expect(assigns(:job)).to be
end
it 'renders' do
expect(response).to render_template(:new)
end
end
describe 'POST #create' do
context 'with valid params' do
let(:params) do
{
host_id: host.id,
job_template: FactoryGirl.build(:job_template).attributes.symbolize_keys.
slice(:name, :schedule_id, :fileset_id)
}
end
- it 'creates the job' do
+ it 'creates the jobs (:backup, :restore)' do
expect { post :create, params }.
- to change { JobTemplate.count }.by(1)
+ to change { JobTemplate.count }.by(2)
end
it 'redirects to host' do
post :create, params
expect(response).to redirect_to(host_path(host))
end
+
+ it 'calls save_and_create_restore_job' do
+ JobTemplate.any_instance.should_receive(:save_and_create_restore_job)
+ post :create, params
+ end
end
context 'with invalid params' do
let(:params) do
{
host_id: host.id,
job_template: FactoryGirl.build(:job_template).attributes.symbolize_keys.
slice(:name, :fileset_id)
}
end
it 'initializes a job with errors' do
post :create, params
expect(assigns(:job)).to be
end
it 'does not create the job' do
expect { post :create, params }.
to_not change { JobTemplate.count }
end
it 'renders :new' do
post :create, params
expect(response).to render_template(:new)
end
end
end
end
diff --git a/spec/models/job_template_spec.rb b/spec/models/job_template_spec.rb
index c3d8fe7..75a8561 100644
--- a/spec/models/job_template_spec.rb
+++ b/spec/models/job_template_spec.rb
@@ -1,46 +1,69 @@
require 'spec_helper'
describe JobTemplate do
context 'validates' do
it 'name must be present' do
expect(JobTemplate.new).to have(1).errors_on(:name)
end
it 'fileset_id must be present' do
expect(JobTemplate.new).to have(1).errors_on(:fileset_id)
end
it 'schedule_id must be present' do
expect(JobTemplate.new).to have(1).errors_on(:schedule_id)
end
it 'schedule_id must NOT be present for :restore jobs' do
expect(JobTemplate.new(job_type: :restore)).to have(0).errors_on(:schedule_id)
end
end
describe '#to_bacula_config_array' do
let(:job_template) { FactoryGirl.create(:job_template) }
subject { job_template.to_bacula_config_array }
it 'has a Job structure' do
expect(subject.first).to eq('Job {')
expect(subject.last).to eq('}')
end
JobTemplate::DEFAULT_OPTIONS.each do |k, v|
it "assigns #{k.capitalize} param" do
expect(subject).to include(" #{k.capitalize} = #{v}")
end
end
end
context 'when no job_type is given' do
let(:job_template) { FactoryGirl.create(:job_template) }
it 'sets the job_type to :backup' do
expect(job_template).to be_backup
end
end
+
+ describe '#save_and_create_restore_job' do
+ let(:host) { FactoryGirl.create(:host) }
+ let(:backup_job_template) do
+ FactoryGirl.build(:job_template, job_type: nil, host: host)
+ end
+
+ it 'calls save' do
+ backup_job_template.should_receive(:save)
+ backup_job_template.save_and_create_restore_job
+ end
+
+ it 'creates a restore job for the same host' do
+ expect { backup_job_template.save_and_create_restore_job }.
+ to change { host.job_templates.restore.count }.by(1)
+ end
+
+ it 'creates a restore job for fileset' do
+ backup_job_template.save_and_create_restore_job
+ expect(host.job_templates.restore.pluck(:fileset_id)).
+ to eq([backup_job_template.fileset_id])
+ end
+ end
end