foreman_snapshot_management 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1f7ac4fa53eca310f5b7effafa4fca21cfdf0ce1f97981892165dfa9ebc1f19
-  data.tar.gz: 1440f1529c9d5c02428dac9371f1d02faca2ea6c95064e51c4efa900bed5126a
+  metadata.gz: 886556b702d0ee48f89794fe453ae6b31cdb8ecef76cede5588dd96adf5b768d
+  data.tar.gz: f0bd937adb826954d90f69242de16b7c45a12331c8b658e11ec97cceb4ba269d
 SHA512:
-  metadata.gz: 41df800a5a9d08c2dac58f5bc1319840dbdaa39ee1e4cf79ef71677645cc9d64cee3de0cf310d49e0d16ba9fc41a820ae42bf31f848398d040610b42ecd88649
-  data.tar.gz: ca5116f54a696fbe6062d05369747a02898a283276252ae118884b075ac01fe05a3864cbf583f2cfcf6b57801283e278ac4c0949f9bf0c5ae918262cf6a7468f
+  metadata.gz: a1f36c17c1a4a9b4b1ca01b0cbfc19bd2f7b6f2d10a84bcb3bdff11ed6e872a6a5e9efbaa4f3233dd7fe5e6535700fed9bf77cd0c6c2ddff7eacf3b808496bba
+  data.tar.gz: a1f9a9aa7b141fc4840a07d2fa38c12cbc48097fc7f8106a4926d22a72d0cf88cfdbeb0d8ffdec8dca52fe72dc7b5c0d3c74937329c239a210c8bde837ee14dd

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.24            | >= 1.7.0       |
+| 1.23            | >= 1.7.0       |
 | 1.22            | >= 1.6.0       |
 | 1.21            | >= 1.5.0       |
 | 1.20            | >= 1.5.0       |

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

@@ -12,8 +12,22 @@ module Api
 
       api :GET, '/hosts/:host_id/snapshots', N_('List all snapshots')
       param :host_id, :identifier_dottable, :required => true
+      param_group :search_and_pagination, ::Api::V2::BaseController
+      meta :search => [{ :name => 'name', :type => 'string' }]
       def index
-        @snapshots = resource_scope_for_index
+        if params[:search]
+          search = params[:search].match(/^\s*name\s*=\s*(\w+)\s*$/) || params[:search].match(/^\s*name\s*=\s*\"([^"]+)\"\s*$/)
+          raise "Field '#{params[:search]}' not recognized for searching!" unless search
+
+          snapshot = resource_class.find_for_host_by_name(@nested_obj, search[1])
+          @snapshots = if snapshot
+                         [snapshot].paginate(paginate_options)
+                       else
+                         []
+                       end
+        else
+          @snapshots = resource_scope_for_index
+        end
       end
 
       api :GET, '/hosts/:host_id/snapshots/:id', 'Show a snapshot'
@@ -45,7 +59,7 @@ module Api
       param_group :snapshot
 
       def update
-        process_response @snapshot.update_attributes(snapshot_params)
+        process_response @snapshot.update(snapshot_params)
       end
 
       api :DELETE, '/hosts/:host_id/snapshots/:id', N_('Delete a snapshot')

data/app/controllers/foreman_snapshot_management/snapshots_controller.rb

@@ -66,7 +66,7 @@ module ForemanSnapshotManagement
     #
     # This method renames a Snapshot from a given host.
     def update
-      if @snapshot.update_attributes(snapshot_params)
+      if @snapshot.update(snapshot_params)
         render json: { name: @snapshot.name, description: @snapshot.description }
       else
         msg = _('Failed to update Snapshot: %s') % @snapshot.errors.full_messages.to_sentence
@@ -89,7 +89,7 @@ module ForemanSnapshotManagement
           errors << [h.name, s.errors.full_messages.to_sentence]
         end
       end
-      error _('Error occurred while creating Snapshot for<br /><dl>%s</dl>') % errors.map { |e| "<dt>#{e[0]}</dt><dd>#{e[1]}</dd>" }.join('<br />') unless errors.empty?
+      error _('Error occurred while creating Snapshot for:%s') % "<br /><dl>#{errors.map { |e| "<dt>#{e[0]}</dt><dd>#{e[1]}</dd>" }.join('<br />')}</dl>" unless errors.empty?
       if snapshots_created.positive?
         msg = _('Created %{snapshots} for %{num} %{hosts}') % {
           snapshots: n_('Snapshot', 'Snapshots', snapshots_created),
@@ -143,10 +143,10 @@ module ForemanSnapshotManagement
       end
 
       @hosts
-    rescue StandardError => error
-      message = _('Something went wrong while selecting hosts - %s') % error
+    rescue StandardError => e
+      message = _('Something went wrong while selecting hosts - %s') % e
       error(message)
-      Foreman::Logging.exception(message, error)
+      Foreman::Logging.exception(message, e)
       redirect_to hosts_path
       false
     end

data/app/models/foreman_snapshot_management/snapshot.rb

@@ -5,6 +5,7 @@ require 'date'
 module ForemanSnapshotManagement
   class Snapshot
     extend ActiveModel::Callbacks
+    extend ActiveModel::Naming
     include ActiveModel::Conversion
     include ActiveModel::Model
     include ActiveModel::Dirty
@@ -16,40 +17,35 @@ module ForemanSnapshotManagement
     attr_reader :name, :description, :include_ram, :host_id
     define_attribute_methods :name, :description, :include_ram
 
-    def self.all_for_host(host)
-      host.compute_resource.get_snapshots(host.uuid).map do |raw_snapshot|
-        new_from_vmware(host, raw_snapshot)
-      end
+    def self.model_name
+      Struct.new(:name, :klass, :singular, :plural, :element,
+                 :human, :collection, :param_key, :i18n_key, :route_key, :singular_route_key).new(
+                   'ForemanSnapshotManagement::Snapshot', ForemanSnapshotManagement::Snapshot,
+                   'foreman_snapshot_management_snapshot', 'foreman_snapshot_management_snapshots',
+                   'snapshot', 'Snapshot', 'foreman_snapshot_management/snapshots',
+                   'snapshot', :'foreman_snapshot_management/snapshot', 'foreman_snapshot_management_snapshots',
+                   'foreman_snapshot_management_snapshot'
+                 )
     end
 
-    def self.find_for_host(host, id)
-      raw_snapshot = host.compute_resource.get_snapshot(host.uuid, id)
-      new_from_vmware(host, raw_snapshot) if raw_snapshot
+    def self.new_for_host(host)
+      host.compute_resource.new_snapshot(host)
     end
 
-    def self.new_from_vmware(host, raw_snapshot, opts = {})
-      new(
-        host: host,
-        id: raw_snapshot.ref,
-        raw_snapshot: raw_snapshot,
-        name: raw_snapshot.name,
-        description: raw_snapshot.description,
-        parent: opts[:parent],
-        create_time: raw_snapshot.create_time
-      )
+    def self.all_for_host(host)
+      host.compute_resource.get_snapshots(host)
     end
 
-    def children
-      return [] unless raw_snapshot
+    def self.find_for_host(host, id)
+      host.compute_resource.get_snapshot(host, id)
+    end
 
-      child_snapshots = raw_snapshot.child_snapshots.flat_map do |child_snapshot|
-        self.class.new_from_vmware(host, child_snapshot, parent: self)
-      end
-      child_snapshots + child_snapshots.flat_map(&:children)
+    def self.find_for_host_by_name(host, name)
+      host.compute_resource.get_snapshot_by_name(host, name)
     end
 
     def inspect
-      "#<#{self.class}:0x#{self.__id__.to_s(16)} name=#{name} id=#{id} description=#{description} host_id=#{host_id} parent=#{parent.try(:id)} children=#{children.map(&:id).inspect}>"
+      "#<#{self.class}:0x#{self.__id__.to_s(16)} name=#{name} id=#{id} description=#{description} host_id=#{host_id} parent=#{parent.try(:id)}>"
     end
 
     def to_s
@@ -111,7 +107,7 @@ module ForemanSnapshotManagement
       end
     end
 
-    def update_attributes(new_attributes)
+    def update(new_attributes)
       assign_attributes(new_attributes)
       save if changed?
     end
@@ -122,7 +118,7 @@ module ForemanSnapshotManagement
         handle_snapshot_errors do
           host.audit_comment = "Create snapshot #{name}"
           host.save!
-          host.compute_resource.create_snapshot(host.uuid, name, description, include_ram)
+          host.compute_resource.create_snapshot(host, name, description, include_ram)
           changes_applied
         end
       end
@@ -144,7 +140,7 @@ module ForemanSnapshotManagement
         result = handle_snapshot_errors do
           host.audit_comment = "Destroy snapshot #{name}"
           host.save!
-          result = host.compute_resource.remove_snapshot(raw_snapshot, false)
+          result = host.compute_resource.remove_snapshot(raw_snapshot)
         end
         @id = nil
         result

data/app/models/foreman_snapshot_management/vmware_extensions.rb

@@ -10,8 +10,8 @@ module ForemanSnapshotManagement
     # Create a Snapshot.
     #
     # This method creates a Snapshot with a given name and optional description.
-    def create_snapshot(uuid, name, description, include_ram = false)
-      task = client.vm_take_snapshot('instance_uuid' => uuid, 'name' => name, 'description' => description, 'memory' => include_ram)
+    def create_snapshot(host, name, description, include_ram = false)
+      task = client.vm_take_snapshot('instance_uuid' => host.uuid, 'name' => name, 'description' => description, 'memory' => include_ram)
       task_successful?(task)
     rescue RbVmomi::Fault => e
       Foreman::Logging.exception('Error creating VMWare Snapshot', e)
@@ -21,7 +21,7 @@ module ForemanSnapshotManagement
     # Remove Snapshot
     #
     # This method removes a Snapshot from a given host.
-    def remove_snapshot(snapshot, remove_children)
+    def remove_snapshot(snapshot, remove_children = false)
       task = client.remove_snapshot('snapshot' => snapshot, 'removeChildren' => remove_children)
       task_successful?(task)
     rescue RbVmomi::Fault => e
@@ -54,23 +54,50 @@ module ForemanSnapshotManagement
     # Get Snapshot
     #
     # This methods returns a specific Snapshot for a given host.
-    def get_snapshot(server_id, snapshot_id)
-      snapshot = client.snapshots(server_id: server_id).get(snapshot_id)
-      # Workaround for https://github.com/fog/fog-vsphere/commit/d808255cd19c3d43d3227825f1e0d72d3f6ee6b9
-      # Remove, when fog-vshpere 1.11 lands in foreman
-      snapshot = snapshot.get_child(snapshot_id) while snapshot && snapshot.ref != snapshot_id
-      snapshot
+    def get_snapshot(host, snapshot_id)
+      raw_snapshot = client.snapshots(server_id: host.uuid).get(snapshot_id)
+      raw_to_snapshot(host, raw_snapshot)
+    end
+
+    # Get Snapshot by name
+    #
+    # This method returns a specific Snapshot for a given host.
+    def get_snapshot_by_name(host, name)
+      raw_snapshot = nil
+      client.snapshots(server_id: host.uuid).all(recursive: true).each do |snapshot|
+        if name == snapshot.name
+          raw_snapshot = snapshot
+          break
+        end
+      end
+      raw_to_snapshot(host, raw_snapshot)
     end
 
     # Get Snapshots
     #
-    # This methods returns Snapshots from a given host.
-    def get_snapshots(server_id)
-      client.snapshots(server_id: server_id).all(recursive: true)
+    # This methods returns Snapshots for a given host.
+    def get_snapshots(host)
+      client.snapshots(server_id: host.uuid).all(recursive: true).map do |raw_snapshot|
+        raw_to_snapshot(host, raw_snapshot)
+      end
     end
 
     private
 
+    def raw_to_snapshot(host, raw_snapshot, opts = {})
+      if raw_snapshot
+        Snapshot.new(
+          host: host,
+          id: raw_snapshot.ref,
+          raw_snapshot: raw_snapshot,
+          name: raw_snapshot.name,
+          description: raw_snapshot.description,
+          parent: opts[:parent],
+          create_time: raw_snapshot.create_time
+        )
+      end
+    end
+
     def task_successful?(task)
       task['task_state'] == 'success' || task['state'] == 'success'
     end

data/app/views/api/v2/snapshots/main.json.rabl

@@ -7,5 +7,5 @@ extends 'api/v2/snapshots/base'
 attributes :description
 
 node(:created_at, &:create_time)
-node(:parent_id) { |snapshot| snapshot.parent.try(:id) }
-node(:children_ids) { |snapshot| snapshot.children.map(&:id) }
+node(:parent_id) { |snapshot| snapshot.try(:parent).try(:id) }
+node(:children_ids) { |snapshot| snapshot.try(:children).try(:map, &:id) }

data/lib/foreman_snapshot_management/engine.rb

@@ -22,7 +22,7 @@ module ForemanSnapshotManagement
           }, :resource_type => 'Host'
 
           permission :create_snapshots, {
-            :'foreman_snapshot_management/snapshots' => [:create],
+            :'foreman_snapshot_management/snapshots' => [:create, :select_multiple_host, :create_multiple_host],
             :'api/v2/snapshots' => [:create]
           }, :resource_type => 'Host'
 
@@ -81,13 +81,13 @@ module ForemanSnapshotManagement
     config.to_prepare do
       begin
         # Load Foreman extensions
-        ::Foreman::Model::Vmware.send(:prepend, ForemanSnapshotManagement::VmwareExtensions)
-        ::HostsHelper.send(:prepend, ForemanSnapshotManagement::HostsHelperExtension)
+        ::Foreman::Model::Vmware.prepend(ForemanSnapshotManagement::VmwareExtensions)
+        ::HostsHelper.prepend(ForemanSnapshotManagement::HostsHelperExtension)
 
         # Load Fog extensions
         if Foreman::Model::Vmware.available?
-          ForemanSnapshotManagement.fog_vsphere_namespace::Real.send(:prepend, FogExtensions::Vsphere::Snapshots::Real)
-          ForemanSnapshotManagement.fog_vsphere_namespace::Mock.send(:prepend, FogExtensions::Vsphere::Snapshots::Mock)
+          ForemanSnapshotManagement.fog_vsphere_namespace::Real.prepend(FogExtensions::Vsphere::Snapshots::Real)
+          ForemanSnapshotManagement.fog_vsphere_namespace::Mock.prepend(FogExtensions::Vsphere::Snapshots::Mock)
         end
       rescue StandardError => e
         Rails.logger.warn "ForemanSnapshotManagement: skipping engine hook (#{e})"

data/lib/foreman_snapshot_management/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanSnapshotManagement
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
 end

data/locale/de/foreman_snapshot_management.po

@@ -0,0 +1,136 @@
+# German translations for foreman_snapshot_management package.
+# Copyright (C) 2019 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_snapshot_management package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: foreman_snapshot_management 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-10-22 14:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"\n"
+
+msgid "Action"
+msgstr ""
+
+msgid "Are you sure to delete this Snapshot?"
+msgstr ""
+
+msgid "Are you sure to revert this Snapshot?"
+msgstr ""
+
+msgid "Create"
+msgstr ""
+
+msgid "Create Snapshot"
+msgstr ""
+
+msgid "Create a snapshot"
+msgstr ""
+
+msgid "Created %{snapshots} for %{num} %{hosts}"
+msgstr ""
+
+msgid "Delete a snapshot"
+msgstr ""
+
+msgid "Deleting..."
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Description of this snapshot"
+msgstr ""
+
+msgid "Error occurred while creating Snapshot for:%s"
+msgstr ""
+
+msgid "Error occurred while creating Snapshot: %s"
+msgstr ""
+
+msgid "Error occurred while removing Snapshot: %s"
+msgstr ""
+
+msgid "Error occurred while rolling back VM: %s"
+msgstr ""
+
+msgid "Failed to update Snapshot: %s"
+msgstr ""
+
+msgid "Foreman-plugin to manage snapshots in a vSphere environment."
+msgstr ""
+
+msgid "Include RAM"
+msgstr ""
+
+msgid "List all snapshots"
+msgstr ""
+
+msgid "Loading Snapshots information ..."
+msgstr ""
+
+msgid "Name of this snapshot"
+msgstr ""
+
+msgid "No capable hosts found."
+msgstr ""
+
+msgid "No capable hosts selected"
+msgstr ""
+
+msgid "No hosts were found with that id, name or query filter"
+msgstr ""
+
+msgid "Revert Host to a snapshot"
+msgstr ""
+
+msgid "Reverting..."
+msgstr ""
+
+msgid "Rollback"
+msgstr ""
+
+msgid "Snapshot"
+msgid_plural "Snapshots"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Snapshots"
+msgstr ""
+
+msgid "Something went wrong while selecting hosts - %s"
+msgstr ""
+
+msgid "Unable to create VMWare Snapshot"
+msgstr ""
+
+msgid "Unable to remove VMWare Snapshot"
+msgstr ""
+
+msgid "Unable to revert VMWare Snapshot"
+msgstr ""
+
+msgid "Unable to update VMWare Snapshot"
+msgstr ""
+
+msgid "Update a snapshot"
+msgstr ""
+
+msgid "VM successfully rolled back."
+msgstr ""
+
+msgid "Whether to include the RAM state in the snapshot"
+msgstr ""
+
+msgid "host"
+msgid_plural "hosts"
+msgstr[0] ""
+msgstr[1] ""

data/locale/en/foreman_snapshot_management.po

@@ -2,12 +2,10 @@
 #
 # This file is distributed under the same license as foreman_snapshot_management.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-20 08:46+0100\n"
 "PO-Revision-Date: 2014-08-20 08:54+0100\n"
 "Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
 "Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
@@ -17,3 +15,120 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Action"
+msgstr ""
+
+msgid "Are you sure to delete this Snapshot?"
+msgstr ""
+
+msgid "Are you sure to revert this Snapshot?"
+msgstr ""
+
+msgid "Create"
+msgstr ""
+
+msgid "Create Snapshot"
+msgstr ""
+
+msgid "Create a snapshot"
+msgstr ""
+
+msgid "Created %{snapshots} for %{num} %{hosts}"
+msgstr ""
+
+msgid "Delete a snapshot"
+msgstr ""
+
+msgid "Deleting..."
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Description of this snapshot"
+msgstr ""
+
+msgid "Error occurred while creating Snapshot for:%s"
+msgstr ""
+
+msgid "Error occurred while creating Snapshot: %s"
+msgstr ""
+
+msgid "Error occurred while removing Snapshot: %s"
+msgstr ""
+
+msgid "Error occurred while rolling back VM: %s"
+msgstr ""
+
+msgid "Failed to update Snapshot: %s"
+msgstr ""
+
+msgid "Foreman-plugin to manage snapshots in a vSphere environment."
+msgstr ""
+
+msgid "Include RAM"
+msgstr ""
+
+msgid "List all snapshots"
+msgstr ""
+
+msgid "Loading Snapshots information ..."
+msgstr ""
+
+msgid "Name of this snapshot"
+msgstr ""
+
+msgid "No capable hosts found."
+msgstr ""
+
+msgid "No capable hosts selected"
+msgstr ""
+
+msgid "No hosts were found with that id, name or query filter"
+msgstr ""
+
+msgid "Revert Host to a snapshot"
+msgstr ""
+
+msgid "Reverting..."
+msgstr ""
+
+msgid "Rollback"
+msgstr ""
+
+msgid "Snapshot"
+msgid_plural "Snapshots"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Snapshots"
+msgstr ""
+
+msgid "Something went wrong while selecting hosts - %s"
+msgstr ""
+
+msgid "Unable to create VMWare Snapshot"
+msgstr ""
+
+msgid "Unable to remove VMWare Snapshot"
+msgstr ""
+
+msgid "Unable to revert VMWare Snapshot"
+msgstr ""
+
+msgid "Unable to update VMWare Snapshot"
+msgstr ""
+
+msgid "Update a snapshot"
+msgstr ""
+
+msgid "VM successfully rolled back."
+msgstr ""
+
+msgid "Whether to include the RAM state in the snapshot"
+msgstr ""
+
+msgid "host"
+msgid_plural "hosts"
+msgstr[0] ""
+msgstr[1] ""

data/locale/foreman_snapshot_management.pot

@@ -1,19 +1,182 @@
-# foreman_snapshot_management
-#
-# This file is distributed under the same license as foreman_snapshot_management.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_snapshot_management package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: version 0.0.1\n"
+"Project-Id-Version: foreman_snapshot_management 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-20 08:46+0100\n"
-"PO-Revision-Date: 2014-08-20 08:46+0100\n"
-"Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
-"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
+"POT-Creation-Date: 2019-10-22 13:22+0000\n"
+"PO-Revision-Date: 2019-10-22 13:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../app/controllers/api/v2/snapshots_controller.rb:13
+msgid "List all snapshots"
+msgstr ""
+
+#: ../app/controllers/api/v2/snapshots_controller.rb:27
+msgid "Name of this snapshot"
+msgstr ""
+
+#: ../app/controllers/api/v2/snapshots_controller.rb:28
+msgid "Description of this snapshot"
+msgstr ""
+
+#: ../app/controllers/api/v2/snapshots_controller.rb:32
+msgid "Create a snapshot"
+msgstr ""
+
+#: ../app/controllers/api/v2/snapshots_controller.rb:34
+msgid "Whether to include the RAM state in the snapshot"
+msgstr ""
+
+#: ../app/controllers/api/v2/snapshots_controller.rb:42
+msgid "Update a snapshot"
+msgstr ""
+
+#: ../app/controllers/api/v2/snapshots_controller.rb:51
+msgid "Delete a snapshot"
+msgstr ""
+
+#: ../app/controllers/api/v2/snapshots_controller.rb:59
+msgid "Revert Host to a snapshot"
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:36
+msgid "Error occurred while creating Snapshot: %s"
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:48
+msgid "Error occurred while removing Snapshot: %s"
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:58
+msgid "VM successfully rolled back."
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:60
+msgid "Error occurred while rolling back VM: %s"
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:72
+msgid "Failed to update Snapshot: %s"
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:92
+msgid "Error occurred while creating Snapshot for:%s"
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:94
+msgid "Created %{snapshots} for %{num} %{hosts}"
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:95
+#: ../app/models/foreman_snapshot_management/snapshot.rb:56
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:5
+#: ../app/views/foreman_snapshot_management/snapshots/select_multiple_host.html.erb:8
+msgid "Snapshot"
+msgid_plural "Snapshots"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:97
+msgid "host"
+msgid_plural "hosts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:140
+msgid "No hosts were found with that id, name or query filter"
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:147
+msgid "Something went wrong while selecting hosts - %s"
+msgstr ""
+
+#: ../app/controllers/foreman_snapshot_management/snapshots_controller.rb:166
+msgid "No capable hosts found."
+msgstr ""
+
+#:
+#: ../app/helpers/concerns/foreman_snapshot_management/hosts_helper_extension.rb:6
+msgid "Create Snapshot"
+msgstr ""
+
+#: ../app/models/foreman_snapshot_management/vmware_extensions.rb:18
+msgid "Unable to create VMWare Snapshot"
+msgstr ""
+
+#: ../app/models/foreman_snapshot_management/vmware_extensions.rb:29
+msgid "Unable to remove VMWare Snapshot"
+msgstr ""
+
+#: ../app/models/foreman_snapshot_management/vmware_extensions.rb:40
+msgid "Unable to revert VMWare Snapshot"
+msgstr ""
+
+#: ../app/models/foreman_snapshot_management/vmware_extensions.rb:51
+msgid "Unable to update VMWare Snapshot"
+msgstr ""
+
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:6
+#: ../app/views/foreman_snapshot_management/snapshots/select_multiple_host.html.erb:11
+msgid "Description"
+msgstr ""
+
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:7
+#: ../app/views/foreman_snapshot_management/snapshots/select_multiple_host.html.erb:14
+msgid "Include RAM"
+msgstr ""
+
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:8
+msgid "Action"
+msgstr ""
+
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:24
+msgid "Create"
+msgstr ""
+
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:49
+msgid "Rollback"
+msgstr ""
+
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:49
+msgid "Are you sure to revert this Snapshot?"
+msgstr ""
+
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:49
+msgid "Reverting..."
+msgstr ""
+
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:50
+msgid "Are you sure to delete this Snapshot?"
+msgstr ""
+
+#: ../app/views/foreman_snapshot_management/snapshots/_index.html.erb:50
+msgid "Deleting..."
+msgstr ""
+
+#:
+#: ../app/views/foreman_snapshot_management/snapshots/select_multiple_host.html.erb:4
+msgid "No capable hosts selected"
+msgstr ""
+
+#: ../app/views/hosts/_snapshots_tab.html.erb:5
+msgid "Loading Snapshots information ..."
+msgstr ""
+
+#: ../lib/foreman_snapshot_management/engine.rb:57
+msgid "Snapshots"
+msgstr ""
+
+#: gemspec.rb:4
+msgid "Foreman-plugin to manage snapshots in a vSphere environment."
+msgstr ""

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

@@ -3,11 +3,11 @@
 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(: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', :locations => [tax_location], organizations: [tax_organization])
-    ComputeResource.find_by_id(cr.id)
+    ComputeResource.find_by(id: cr.id)
   end
   let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }
   let(:host) { FactoryBot.create(:host, :managed, :compute_resource => compute_resource, :uuid => uuid) }
@@ -20,8 +20,23 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
     assert_response :success
     assert_not_nil assigns(:snapshots)
     body = ActiveSupport::JSON.decode(@response.body)
-    refute_empty body
-    refute_empty body['results']
+    assert_not_empty body
+    assert_not_empty body['results']
+  end
+
+  test 'should search snapshot' do
+    get :index, params: { :host_id => host.to_param, :search => 'name= clean' }
+    assert_response :success
+    assert_not_nil assigns(:snapshots)
+    body = ActiveSupport::JSON.decode(@response.body)
+    assert_not_empty body
+    assert_not_empty body['results']
+    assert body['results'].count == 1
+  end
+
+  test 'should refute search snapshot' do
+    get :index, params: { :host_id => host.to_param, :search => 'name != clean' }
+    assert_response :internal_server_error
   end
 
   test 'should show snapshot' do
@@ -29,7 +44,7 @@ class Api::V2::SnapshotsControllerTest < ActionController::TestCase
     assert_not_nil assigns(:snapshot)
     assert_response :success
     body = ActiveSupport::JSON.decode(@response.body)
-    refute_empty body
+    assert_not_empty body
   end
 
   test 'should 404 for unknown snapshot' do

data/test/controllers/foreman_snapshot_management/snapshots_controller_test.rb

@@ -4,11 +4,11 @@ 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(: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', :locations => [tax_location], organizations: [tax_organization])
-      ComputeResource.find_by_id(cr.id)
+      ComputeResource.find_by(id: cr.id)
     end
     let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }
     let(:uuid2) { 'a7169e20-74d3-4367-afc2-d355716e7555' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_snapshot_management
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -28,16 +28,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.75.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.75.0
 description: Foreman-plugin to manage snapshots in a vSphere environment.
 email:
 - info@atix.de
@@ -74,6 +74,8 @@ files:
 - lib/foreman_snapshot_management/version.rb
 - lib/tasks/foreman_snapshot_management_tasks.rake
 - locale/Makefile
+- locale/de/foreman_snapshot_management.po
+- locale/en/foreman_snapshot_management.edit.po
 - locale/en/foreman_snapshot_management.po
 - locale/foreman_snapshot_management.pot
 - locale/gemspec.rb