berta 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38b7c4c208604f8f2f38e396c03dd8d0950626a9
-  data.tar.gz: 844a95982da959c7be4ba173095a7910c96e21cf
+  metadata.gz: a8df6d853b8b26247ece5370a887b57f983f8680
+  data.tar.gz: 6c643a92a154fd50bbee3e2fd306db34273d89f3
 SHA512:
-  metadata.gz: 7fca088e770e144d0ad3027a54a36f4bf7b9e04a80aecc2533a7244a84ae03b88a4cfadc86fb635793a4463b5b5ef3437d6c6dee1b1d0fe53ea3b8a674a928fc
-  data.tar.gz: 63ea0386912c8a2ee7a6ba3d9d4fa5ea60521510f1614ab03a671c53547145f2bbb9d07f5b9c5268aea3e4a7e8f8a29f91474771df699205de53570f88ecc6de
+  metadata.gz: 5e09339128c099ccbbf4ea5145e9c5f9a870a02a41912f0088a5d3b27f6f4f8df3b4a27a7b3ec0b1d72c9124add90de81f28d5e8c8ee222876d27e8660636860
+  data.tar.gz: fb69818b1b5e4781d8c28bd3fc441e5f5853252a77fc991e36ceb7180d0ab23056eb183cffdddc697518c348b6c859508f38dac4d9d0a53bc50225b6f15251c7

data/lib/berta/utils/filter.rb

@@ -2,12 +2,8 @@ module Berta
   module Utils
     # Base Filter class, filters out invalid states
     class Filter
-      # VM states that take resources
-      RESOURCE_STATES = %w[SUSPENDED POWEROFF CLONING].freeze
-      # Active state has some lcm states that should not expire
-      ACTIVE_STATE = 'ACTIVE'.freeze
-      # LCM states in which active state shouldn't expire
-      NON_RESOURCE_ACTIVE_LCM_STATES = %w[EPILOG SHUTDOWN STOP UNDEPLOY FAILURE].freeze
+      # VM states to ignore
+      IGNORED_STATES = %w[PENDING HOLD].freeze
 
       # Constructs Filter object.
       #
@@ -83,9 +79,7 @@ module Berta
       private
 
       def takes_resources?(vmh)
-        return true if RESOURCE_STATES.any? { |state| vmh.handle.state_str == state }
-        true if vmh.handle.state_str == ACTIVE_STATE &&
-                NON_RESOURCE_ACTIVE_LCM_STATES.none? { |state| vmh.handle.lcm_state_str.include? state }
+        !IGNORED_STATES.include?(vmh.handle.state_str)
       end
 
       def log_filter

data/lib/berta/version.rb

@@ -1,3 +1,3 @@
 module Berta
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berta
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Dusan Baran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler