nifty 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bb90e66cb5a6b7793a52fd759d51383d80351f3
-  data.tar.gz: 7b415c03cf167b1484b264b543d99d1838c6d73c
+  metadata.gz: a37f362a5274415d81b8d55bf69284e1f34d88c0
+  data.tar.gz: b07d5c991ab1c91d8fae23d1295787983e776f80
 SHA512:
-  metadata.gz: b23e146c4e2390dbc4d7052180dedd77b5e3d08fcdf4b679faff9b87b7567705d36a79401c632329a7346af2a79e5bd959e00b19eb2bee968a7356b25715d103
-  data.tar.gz: 8b00582017c6899d7cf96497e0d7785683431b0347224d1a370511c70d06537b24ca4d0a41def9f54f4b00b5ce6a691280a453ba3669b2f80552ed0bf5a5854b
+  metadata.gz: ab2a37a5fe4643d3149263db7c9feac04c069b8ae8d615d2ff85cf47efff4b8d6daef1a58d20a7aa2d51860be78a1fa13f05588d45d37393c69ca68591fe27b1
+  data.tar.gz: c721a2292eec5c0148ea0967d77ebe23a2e5d513363cd1830abbc216bb344a96421c70c51bcde0225f8ea13094ccdc29807c29f984b54b59d04bd5bda5942b14

data/config/nifty.yml

@@ -18,6 +18,7 @@ production:
     disk-expiration: true # Will expire old disks before the new one is registered
     permissions: "640" # UNIX-like image and template permissions in OpenNebula, MUST be a string
     groups: # Array of groups. If set, groups in appliance descriptor will be ignored and these groups will be used instead
+    users: # Handle only images/templates of specified users
   logging:
     level: ERROR # Logging level
     file: /var/log/nifty/nifty.log # File to write log to. To turn off file logging leave this field empty.

data/lib/nifty/backends/opennebula.rb

@@ -71,6 +71,10 @@ class Nifty::Backends::Opennebula < Nifty::Backend
         :groups => {
           :type => :array,
           :desc => 'Names of groups appliances will be registred to in OpenNebula'
+        },
+        :users => {
+          :type => :array,
+          :desc => 'Handle only images/templates of specified users'
         }
       }
     end

data/lib/nifty/backends/utils/opennebula/image_handler.rb

@@ -28,9 +28,11 @@ class Nifty::Backends::Utils::Opennebula::ImageHandler < Nifty::Backends::Utils:
   #
   # @param [String] appliance_id
   # @return [Array] array of images
-  def images(appliance_id)
+  def images(appliance_id, users = [])
     reload!
 
+    return pool.find_all { |image| image["TEMPLATE/#{ATTRIBUTE_APPLIANCE_ID}"] == appliance_id && users.include?(image['UNAME']) } unless users.blank?
+
     pool.find_all { |image| image["TEMPLATE/#{ATTRIBUTE_APPLIANCE_ID}"] == appliance_id }
   end
 
@@ -49,9 +51,11 @@ class Nifty::Backends::Utils::Opennebula::ImageHandler < Nifty::Backends::Utils:
     pool.find_all { |image| image["TEMPLATE/#{ATTRIBUTE_APPLIANCE_ID}"].nil? && image["TEMPLATE/#{Nifty::Backends::Opennebula::VMCATCHER_APPLIANCE_ID}"] }
   end
 
-  def images_by_version(version)
+  def images_by_version(version, users = [])
     reload!
 
+    return pool.find_all { |image| image["TEMPLATE/#{ATTRIBUTE_APPLIANCE_VERSION}"] == version && users.include?(image['UNAME']) } unless users.blank?
+
     pool.find_all { |image| image["TEMPLATE/#{ATTRIBUTE_APPLIANCE_VERSION}"] == version }
   end
 

data/lib/nifty/backends/utils/opennebula/template_handler.rb

@@ -20,9 +20,11 @@ class Nifty::Backends::Utils::Opennebula::TemplateHandler < Nifty::Backends::Uti
   #
   # @param [String] appliance_id
   # @return [Array] array of templates
-  def templates(appliance_id)
+  def templates(appliance_id, users = [])
     reload!
 
+    return pool.find_all { |template| template["TEMPLATE/#{ATTRIBUTE_APPLIANCE_ID}"] == appliance_id && users.include?(template['UNAME']) } unless users.blank?
+
     pool.find_all { |template| template["TEMPLATE/#{ATTRIBUTE_APPLIANCE_ID}"] == appliance_id }
   end
 

data/lib/nifty/events/opennebula/utils/events_common.rb

@@ -7,9 +7,9 @@ module Nifty::Events::Opennebula::Utils::EventsCommon
   # @param [Cloud::Appliance::Descriptor::Appliance] appliance
   # @param [Hash] parameters
   def expire_appliance(template_handler, image_handler, appliance, parameters)
-    delete_appliance(template_handler, appliance.identifier)
-    outdate_disks(image_handler, appliance.identifier)
-    expire_disks(image_handler, appliance, parameters[:"disk-expiration"])
+    delete_appliance(template_handler, appliance.identifier, parameters[:users])
+    outdate_disks(image_handler, appliance.identifier, parameters[:users])
+    expire_disks(image_handler, appliance, parameters[:"disk-expiration"], parameters[:users])
   end
 
   # Returns OpenNebula groups specified in appliance
@@ -37,8 +37,8 @@ module Nifty::Events::Opennebula::Utils::EventsCommon
   #
   # @param [Nifty::Backends::Utils::Opennebula::ImageHandler] image_handler
   # @param [String] appliance_id
-  def outdate_disks(image_handler, appliance_id)
-    registered_disks = image_handler.images(appliance_id)
+  def outdate_disks(image_handler, appliance_id, users)
+    registered_disks = image_handler.images(appliance_id, users)
     logger.debug('Outdating registered disks...')
     registered_disks.each { |disk| image_handler.outdate_image(disk) }
   end
@@ -49,8 +49,8 @@ module Nifty::Events::Opennebula::Utils::EventsCommon
   # @param [Nifty::Backends::Utils::Opennebula::ImageHandler] image_handler
   # @param [Cloud::Appliance::Descriptor::Appliance] appliance
   # @param [TrueClass,FalseClass] disk_expiration whether expire all disks or just outdated ones
-  def expire_disks(image_handler, appliance, disk_expiration)
-    registered_disks = disk_expiration ? image_handler.images(appliance.identifier) : image_handler.images_by_version(appliance.version)
+  def expire_disks(image_handler, appliance, disk_expiration, users)
+    registered_disks = disk_expiration ? image_handler.images(appliance.identifier, users) : image_handler.images_by_version(appliance.version, users)
     logger.debug('Expiring registered disks...')
     registered_disks.each do |disk|
       image_handler.expire_image(disk)
@@ -63,8 +63,8 @@ module Nifty::Events::Opennebula::Utils::EventsCommon
   #
   # @param [Nifty::Backends::Utils::Opennebula::TemplateHandler] template_handler
   # @param [String] appliance_id
-  def delete_appliance(template_handler, appliance_id)
-    registered_appliances = template_handler.templates(appliance_id)
+  def delete_appliance(template_handler, appliance_id, users)
+    registered_appliances = template_handler.templates(appliance_id, users)
     logger.debug('Deleting registered templates...')
     registered_appliances.each { |template| template_handler.delete_template template }
   end

data/lib/nifty/version.rb

@@ -1,3 +1,3 @@
 module Nifty
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nifty
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler