berta 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c35df5b38eb1ec48f721aab12ab14ae6006f32d
-  data.tar.gz: 205b376e2b57fb9738880bdd47817b4933135f04
+  metadata.gz: b4e81e829b874c07ff7ab8ae0226238d5baa52b4
+  data.tar.gz: 99b0e83b23f5213db848f45403b8c901071a6c8b
 SHA512:
-  metadata.gz: 9500f02e7755d6eab251cb337bf397cb9979f685fc13b736d433756289c3a5da0ba358cd4731f7e58eef955144f93aff8c8598f5e59cceba148a168cb472811a
-  data.tar.gz: 3581efd6664b2f26394e7e0bc752c22c01d7e983ea5d113e026044a3df7d65186e34dc305d992ad5accbe1720f75edd8ae110647b6fa795ffa0c77780b6ba466
+  metadata.gz: 13a6e7deea100c608d490391b4f3f3377f1771139399f7917c074c4d2faea12e5c905923568b68855c3bbe6718338e1d5c50b9d8a3db8adb2cd68c0e7b644062
+  data.tar.gz: df347f0d85a29be79b8c5152e5c13c9ed9de2a3201a3add8c7ebde8f34aad4888705fa146b40d62ba17d38e2b949851e1b12116940459a8372848bc4aaef079d

data/README.md

@@ -5,6 +5,7 @@
 [![Code Climate](https://codeclimate.com/github/dudoslav/berta/badges/gpa.svg)](https://codeclimate.com/github/dudoslav/berta)
 [![Inline docs](http://inch-ci.org/github/dudoslav/berta.svg?branch=master)](http://inch-ci.org/github/dudoslav/berta)
 [![Dependency Status](https://gemnasium.com/badges/github.com/dudoslav/berta.svg)](https://gemnasium.com/github.com/dudoslav/berta)
+[![Gem Version](https://badge.fury.io/rb/berta.svg)](https://badge.fury.io/rb/berta)
 
 Berta cleans cloud from unused vms. She sets expiration to all virtual machines
 and when expiration is close she will notify owners. Berta is developed as ruby gem.
@@ -23,7 +24,7 @@ From source:
 
 ```bash
 git clone git://github.com/dudoslav/berta.git
-cd cloudkeeper
+cd berta
 gem install bundler
 bundle install
 ```
@@ -33,7 +34,7 @@ bundle install
 Config files can be located in:
 * `~/.berta/berta.yml`
 * `/etc/berta/berta.yml`
-* `PATH_TO_GEM_DIR/config/cloudkeeper.yml`
+* `PATH_TO_GEM_DIR/config/berta.yml`
 
 ### Execution
 

data/berta.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'berta'
-  s.version = '1.0.0'
+  s.version = '1.1.0'
   s.summary = 'Berta VM expiration tool'
   s.description = 'Berta will check all VMs on OpenNebula cloud for expiration date'
   s.authors = ['Dusan Baran']

data/lib/berta/expiration_manager.rb

@@ -8,35 +8,36 @@ module Berta
     #   to update expiration on.
     def update_expirations(vms)
       vms.each do |vm|
-        remove_invalid_expirations(vm)
-        add_default_expiration(vm)
+        begin
+          vm.update_expirations(add_default_expiration(vm, remove_invalid_expirations(vm.expirations)))
+        rescue Berta::Errors::BackendError => e
+          logger.error "#{e.message}\n\tOn vm with id #{vm.handle['ID']}"
+        end
       end
     end
 
-    # Removes invalid expirations on vm. That are schelude actions
-    # with expiration time later than expiration offset.
+    # Removes invalid expirations from array of expirations.
+    # Invalid expirations are expirations that are planned
+    # later than expiration offset value.
     #
-    # @param vm [Berta::VirtualMachineHandler] Virtual machine to
-    #   remove invalid expirations on.
-    def remove_invalid_expirations(vm)
-      exps = vm.expirations
+    # @param exps [Array<Berta::Entities::Expiration>] Expirations to filter
+    # @return [Array<Berta::Entities::Expiration>] Filtered expirations
+    def remove_invalid_expirations(exps)
       exps.keep_if(&:in_expiration_interval?)
-      vm.update_expirations(exps) if exps.length != vm.expirations.length
-    rescue Berta::Errors::BackendError => e
-      logger.error "#{e.message}\n\tOn vm with id #{vm.handle['ID']}"
     end
 
-    # Adds default expiration if no valid expiration with
-    # right expiration action is set.
+    # Adds default vm expiration into given array of expirations
+    # assuming that array of expirations are expirations of given vm.
+    # If vm already has default expiration nothing will be changed.
     #
-    # @param vm [Berta::VirtualMachineHandler] Virtual machine
-    #   to set default expiration on.
-    def add_default_expiration(vm)
-      return if vm.default_expiration
-      vm.add_expiration(Time.now.to_i + Berta::Settings.expiration_offset,
-                        Berta::Settings.expiration.action)
-    rescue Berta::Errors::BackendError => e
-      logger.error "#{e.message}\n\tOn vm with id #{vm.handle['ID']}"
+    # @param vm [Berta::VirtualMachineHandler] VM with or without default expiration
+    # @param exps [Array<Berta::Entities::Expiration>] VMs expirations to modify
+    # @return Expirations with default expiration
+    def add_default_expiration(vm, exps)
+      return exps if vm.default_expiration
+      exps << Berta::Entities::Expiration.new(vm.next_expiration_id,
+                                              Time.now.to_i + Berta::Settings.expiration_offset,
+                                              Berta::Settings.expiration.action)
     end
   end
 end

data/lib/berta/virtual_machine_handler.rb

@@ -1,6 +1,8 @@
 module Berta
   # Class for Berta operations on virtual machines
   class VirtualMachineHandler
+    NOTIFIED_FLAG = 'BERTA_NOTIFIED'.freeze
+
     attr_reader :handle
 
     # Constructs Virtual machine handler from given vm.
@@ -22,10 +24,11 @@ module Berta
     # @raise [Berta::Errors::OpenNebula::ResourceStateError]
     # @raise [Berta::Errors::OpenNebula::ResourceRetrievalError]
     def update_notified
-      logger.debug "Setting notified flag of #{handle['ID']} to #{Time.now.to_i}"
+      notify_time = Time.now
+      logger.debug "Setting notified flag of VM with id #{handle['ID']} to #{notify_time}"
       return if Berta::Settings['dry-run']
       Berta::Utils::OpenNebula::Helper.handle_error do
-        handle.update("NOTIFIED = #{Time.now.to_i}", true)
+        handle.update("#{NOTIFIED_FLAG} = #{notify_time.to_i}", true)
         handle.info
       end
     end
@@ -36,7 +39,7 @@ module Berta
     # @return [Numeric] Time when notified was set else nil.
     #   Time is in UNIX epoch time format.
     def notified
-      time = handle['USER_TEMPLATE/NOTIFIED']
+      time = handle["USER_TEMPLATE/#{NOTIFIED_FLAG}"]
       time.to_i if time
     end
 
@@ -54,23 +57,6 @@ module Berta
       expiration.in_notification_interval?
     end
 
-    # Adds schelude action to virtual machine. This command
-    # modifies USER_TEMPLATE of virtual machine. But does
-    # not delete old variables is USER_TEMPLATE.
-    #
-    # @note This method modifies OpenNebula database
-    # @param time [Numeric] Time when to notify user
-    # @param action [String] Action to perform on expiration
-    def add_expiration(time, action)
-      logger.debug "Setting expiration date of #{handle['ID']} to #{action} on #{time} with id #{next_sched_action_id}"
-      return if Berta::Settings['dry-run']
-      new_expiration = \
-        Berta::Entities::Expiration.new(next_sched_action_id,
-                                        time,
-                                        action)
-      update_expirations(expirations << new_expiration)
-    end
-
     # Sets array of expirations to vm, rewrites all old ones.
     # Receiving empty array wont change anything.
     #
@@ -79,6 +65,7 @@ module Berta
     def update_expirations(exps)
       template = ''
       exps.each { |exp| template += exp.template }
+      return if template == ''
       logger.debug "Setting multiple expirations:\n#{template}"
       return if Berta::Settings['dry-run']
       Berta::Utils::OpenNebula::Helper.handle_error do
@@ -109,9 +96,8 @@ module Berta
         .min { |exp| exp.time.to_i }
     end
 
-    private
-
-    def next_sched_action_id
+    # TODO
+    def next_expiration_id
       elems = handle.retrieve_elements('USER_TEMPLATE/SCHED_ACTION/ID')
       return 0 unless elems
       elems.to_a.max.to_i + 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berta
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Dusan Baran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler