berta 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90a76ac6f1f4e8ca79a9f1055d048e1388454f93
-  data.tar.gz: 23521719c626908ab390da7bc21220ad4080f930
+  metadata.gz: ddb138a3a440ced8f3cac19a172dc852553bf6d7
+  data.tar.gz: d03578fdc338e243fa153094632a10e08f4e6925
 SHA512:
-  metadata.gz: a0edddd944f03fe24b447ad0ebcee686546080c128492b9e89ec653dda484aae9dc88846eb1bac28c4454e9e2422c161e7e5a16557aaf1e1aa0fc85ea02f56b8
-  data.tar.gz: 9c065dbd4e3336658349e7c1f41d9e7e32d4f7cc3608c465ad8cdc304d1d36c84ef3b43101625d9a3f8195e2770a8c9638c2aeb31418ae08807b5f35f9c45c13
+  metadata.gz: 5d39ec846445b8e28c9431aded6a925de3ecc61fb520e1f959964ee8ad917856761f7186573def0e85b9587d6785f860c7fbd944f2e5e617695965c23e2a627b
+  data.tar.gz: 12b40d29cb3e5549fa9ad8299af378d5b9a9f8b05d4a8eb434b3f76e501237eff5a236c73cdef1588b189ad2478aeda1cb184305981eb9c8e31566540770c859

data/lib/berta/expiration_manager.rb

@@ -34,7 +34,7 @@ module Berta
     # @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
+      return [] 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)

data/lib/berta/service.rb

@@ -66,9 +66,11 @@ module Berta
     # @raise [Berta::Errors::OpenNebula::ResourceStateError]
     # @raise [Berta::Errors::OpenNebula::ResourceRetrievalError]
     def clusters
+      return @cached_clusters if @cached_clusters
       logger.debug 'Fetching clusters'
       cluster_pool = OpenNebula::ClusterPool.new(client)
       Berta::Utils::OpenNebula::Helper.handle_error { cluster_pool.info }
+      @cached_clusters = cluster_pool
       cluster_pool
     end
 

data/lib/berta/version.rb

@@ -1,3 +1,3 @@
 module Berta
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/lib/berta/virtual_machine_handler.rb

@@ -66,7 +66,7 @@ module Berta
       template = ''
       exps.each { |exp| template += exp.template }
       return if template == ''
-      logger.debug "Setting multiple expirations:\n#{template}"
+      logger.debug "Setting multiple expirations on vm with id=#{handle['ID']} :\n#{template}"
       return if Berta::Settings['dry-run']
       Berta::Utils::OpenNebula::Helper.handle_error do
         handle.update(template, true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berta
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Dusan Baran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Berta VM expiration tool