foreman_snapshot_management 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 398453ebe0f63f659d1431bc72ffb86f7f911d2d34798ee705e31ecb6d9a6258
-  data.tar.gz: 1b87ef1a4f9b1ee6801a6e92374bafdbbe5e186bbe7631c0eb77a0eefec00863
+  metadata.gz: d57bbba1e33d99aefa82a4af43d69810abd02fee0bd56a971083a6d83950bf5f
+  data.tar.gz: f79a6a83310c1b0ee3f05ea2204cded44d690df624773ad642e88a9a323f372a
 SHA512:
-  metadata.gz: 99977335ef42eec7289476e3571206d3542551d22731e2e72dff9027d6aff81aaffb665e692a83cd3674ae422670322b90577531202772e29f305af8914e2c8a
-  data.tar.gz: fb935d293dd020528086ec7b55d6226ee8a401b08d0dd94ee73268a00e032200fc48e94f074d13cfed38baed97f516137320beeb20135d4b66d097026d666809
+  metadata.gz: 40e538d6c79a89036baa265408dbeecd99ce7fcb2c4cb9693e1bc92111001f592e8ea13d003028160b366ce2332702e0c51fedb2c07ec2a6ecbaab99622d5d91
+  data.tar.gz: a1c2345211c2d5eb3a2a6d63c74ca952d74351e014ad0f3b1957afcf6a5ba8dc3d3b9ddac69bd52344eeee235676f732f654d7bebfb46d9b69a655b0c904297f

data/README.md

@@ -20,6 +20,8 @@ See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wi
 
 | Foreman Version | Plugin Version |
 | --------------- | -------------- |
+| 1.19            | >= 1.5.0       |
+| 1.18            | >= 1.5.0       |
 | 1.17            | >= 1.5.0       |
 
 ## Contributing

data/app/controllers/api/v2/snapshots_controller.rb

@@ -8,7 +8,7 @@ module Api
       before_action :check_snapshot_capability
       before_action :find_resource, :only => %w[show update destroy revert]
 
-      api :GET, 'hosts/:host_id/snapshots/', N_('List all snapshots')
+      api :GET, '/hosts/:host_id/snapshots', N_('List all snapshots')
       param :host_id, :identifier_dottable, :required => true
       def index
         @snapshots = resource_scope_for_index
@@ -27,17 +27,17 @@ module Api
         end
       end
 
-      api :POST, '/hosts/:host_id/snapshots/', N_('Create a snapshot')
+      api :POST, '/hosts/:host_id/snapshots', N_('Create a snapshot')
       param :host_id, :identifier_dottable, :required => true
       param :include_ram, :bool, :default_value => false, :desc => N_('Whether to include the RAM state in the snapshot')
       param_group :snapshot, :as => :create
 
       def create
         @snapshot = resource_class.new(snapshot_params.to_h.merge(host: @nested_obj).merge(include_ram: params[:include_ram]))
-        process_response @snapshot.save
+        process_response @snapshot.create
       end
 
-      api :PUT, '/hosts/:host_id/snapshots/:id/', N_('Update a snapshot')
+      api :PUT, '/hosts/:host_id/snapshots/:id', N_('Update a snapshot')
       param :host_id, :identifier_dottable, :required => true
       param :id, :identifier_dottable, :required => true
       param_group :snapshot

data/app/models/foreman_snapshot_management/snapshot.rb

@@ -159,6 +159,7 @@ module ForemanSnapshotManagement
 
     def handle_snapshot_errors
       yield
+      true
     rescue Foreman::WrappedException => e
       errors.add(:base, e.wrapped_exception.message)
       false

data/config/routes.rb

@@ -8,7 +8,9 @@ Rails.application.routes.draw do
         resources :hosts, :only => [] do
           constraints(:id => /[^\/]+/) do
             resources :snapshots, except: [:new, :edit] do
-              put :revert, :on => :collection
+              member do
+                put :revert
+              end
             end
           end
         end

data/lib/foreman_snapshot_management/version.rb

@@ -1,3 +1,3 @@
 module ForemanSnapshotManagement
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

data/test/controllers/api/v2/snapshots_test.rb

@@ -1,8 +1,10 @@
 require 'test_helper'
 
 class Api::V2::SnapshotsControllerTest < ActionController::TestCase
+  let(:tax_location) { Location.find_by_name('Location 1') }
+  let(:tax_organization) { Organization.find_by_name('Organization 1') }
   let(:compute_resource) do
-    cr = FactoryBot.create(:compute_resource, :vmware, :uuid => 'Solutions')
+    cr = FactoryBot.create(:compute_resource, :vmware, :uuid => 'Solutions', :locations => [tax_location], organizations: [tax_organization])
     ComputeResource.find_by_id(cr.id)
   end
   let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }

data/test/controllers/foreman_snapshot_management/snapshots_controller_test.rb

@@ -2,8 +2,10 @@ require 'test_helper'
 
 module ForemanSnapshotManagement
   class SnapshotsControllerTest < ActionController::TestCase
+    let(:tax_location) { Location.find_by_name('Location 1') }
+    let(:tax_organization) { Organization.find_by_name('Organization 1') }
     let(:compute_resource) do
-      cr = FactoryBot.create(:compute_resource, :vmware, :uuid => 'Solutions')
+      cr = FactoryBot.create(:compute_resource, :vmware, :uuid => 'Solutions', :locations => [tax_location], organizations: [tax_organization])
       ComputeResource.find_by_id(cr.id)
     end
     let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_snapshot_management
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -96,7 +96,7 @@ files:
 - test/controllers/api/v2/snapshots_test.rb
 - test/controllers/foreman_snapshot_management/snapshots_controller_test.rb
 - test/test_plugin_helper.rb
-homepage: http://www.orcharhino.com
+homepage: https://www.orcharhino.com
 licenses: []
 metadata: {}
 post_install_message: