omf_ec 6.0.2.pre.2 → 6.0.2

data/bin/omf_ec

@@ -23,9 +23,9 @@ flag [:u, :uri]
 desc "Debug XMPP traffic mode (include XMPP debug logging messages under debug mode)."
 switch [:x, :xmpp]
 
-desc "Root certificate file"
-arg_name "cert", :optional
-flag [:root_cert]
+desc "Directory containing root certificates"
+arg_name "directory", :optional
+flag [:root_cert_dir]
 
 desc "Your certificate"
 arg_name "cert", :optional
@@ -40,6 +40,7 @@ arg_name "directory"
 default_value "/tmp"
 flag [:log_file_dir]
 
+# the path given here is relative to the user's home directory
 config_file(".config/omf_ec.yml")
 
 desc "Execute an experiment script"
@@ -196,16 +197,14 @@ on_error do |exception|
 end
 
 pre do |global_options, command, options, args|
+  #opts = OmfCommon.load_yaml(config_file_name) if File.exist?(config_file_name)
+  #opts.delete("commands")
+  #global_options.merge!(opts)
+
   unless global_options[:uri]
     help_now! "Incomplete options. Need communication URI"
   end
 
-
-  # Import private key
-  if global_options[:private_key]
-    OmfCommon::Key.instance.import(global_options[:private_key])
-  end
-
   # Check version
   if options[:check]
     File.open(args[0], 'r') do |f|
@@ -247,10 +246,6 @@ end
 
 def load_exp(exp_path, global_options = {} , options = {}, properties = {})
   begin
-    if global_options[:root_cert] && File.exist?(global_options[:root_cert])
-      root = OmfCommon::Auth::Certificate.create_from_x509(File.read(global_options[:root_cert]))
-    end
-
     if global_options[:cert] && File.exist?(global_options[:cert]) &&
       global_options[:key] && File.exist?(global_options[:key])
 
@@ -273,7 +268,7 @@ def load_exp(exp_path, global_options = {} , options = {}, properties = {})
       }
     }
 
-    opts[:communication][:auth] = { certs: [ root.to_pem_compact ] } if root
+    opts[:communication][:auth] = {} if entity
 
     OmfCommon.init(:development, opts) do |el|
       setup_logging(global_options)
@@ -282,7 +277,7 @@ def load_exp(exp_path, global_options = {} , options = {}, properties = {})
         info "Connected using #{comm.conn_info}"
         info "Start experiment: #{OmfEc.experiment.id}"
 
-        OmfCommon::Auth::CertificateStore.instance.register(root) if root
+        OmfCommon::Auth::CertificateStore.instance.register_default_certs(global_options[:root_cert_dir]) if global_options[:root_cert_dir]
         OmfCommon::Auth::CertificateStore.instance.register(entity, OmfCommon.comm.local_address) if entity
 
         begin

data/example/engine_oedl.rb

@@ -1,15 +1,18 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 # OMF_VERSIONS = 6.0
 #
 
-def_property('name', 'garage', 'Name of garage')
-
-garage = prop.name
+def_property('garage', 'garage', 'Name of garage')
 
 defEvent :engine_created do |state|
-  # state holds list of resources, and automatically updated once OMF inform messages received.
+  # state is an array holds list of resources, and automatically updated once OMF inform messages received.
   state.find_all do |v|
-    v[:type] == 'engine'
-  end.size >= 1
+    v[:type] == 'engine' && !v[:membership].empty?
+  end.size > 0
 end
 
 defEvent :rpm_reached_4000 do |state|
@@ -19,34 +22,34 @@ defEvent :rpm_reached_4000 do |state|
 end
 
 # Define a group and add garages to it.
-defGroup('garages', garage)
+defGroup('garages', prop.garage)
 
 # :ALL_UP is a pre-defined event,
 # triggered when all resources set to be part of groups are available and configured as members of the associated groups.
 onEvent :ALL_UP do
   group('garages') do |g|
-    g.create_resource('primary_engine', type: 'engine', sn: rand(1000))
+    g.create_resource('my_engine', type: 'engine')
 
     onEvent :engine_created do
       info ">>> Accelerating all engines"
-      g.resources[type: 'engine'][name: 'primary_engine'].throttle = 50
+      g.resources[type: 'engine'].throttle = 50
 
-      g.resources[type: 'engine'][name: 'primary_engine'].sn
-      g.resources[type: 'engine'][name: 'primary_engine'].membership
+      # We periodically check engine RPM
+      every 2.second do
+        g.resources[type: 'engine'].rpm
+      end
     end
 
     onEvent :rpm_reached_4000 do
       info ">>> Engine RPM reached 4000"
-
       info ">>> Reduce engine throttle"
       g.resources[type: 'engine'].throttle = 0
+    end
 
-      after 7.seconds do
-        info ">>> Release engines"
-        g.resources[type: 'engine'].release
-
-        done!
-      end
+    after 20.seconds do
+      info ">>> Release engines"
+      g.resources[type: 'engine'].release
+      done!
     end
   end
 end

data/example/engine_test.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 # OMF_VERSIONS = 6.0
 
 def create_engine(garage)
@@ -42,19 +47,18 @@ def on_engine_created(engine)
   end
 
   # Monitor all status information from the engine
-  engine.on_status do |msg|
-    msg.each_property do |name, value|
-      info "#{name} => #{value}"
+  engine.on_inform do |msg|
+    case msg.itype
+    when 'STATUS'
+      msg.each_property do |name, value|
+        info "#{name}: #{value}"
+      end
+    when 'ERROR'
+      error msg[:reason]
+    when 'WARN'
+      warn msg[:reason]
     end
   end
-
-  engine.on_error do |msg|
-    error msg[:reason]
-  end
-
-  engine.on_warn do |msg|
-    warn msg[:reason]
-  end
 end
 
 OmfCommon.comm.subscribe('garage') do |garage|

data/example/test_exp/test00.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 # We can use communicator to interact with XMPP server
 #
 # Find all top level pubsub nodes

data/example/test_exp/test01.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 #
 # Test 1
 #

data/example/test_exp/test02.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 #
 # Test 2
 #

data/example/test_exp/test03.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 #
 # Test 3
 #

data/example/test_exp/test06.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 #
 # Test 6
 #
@@ -62,7 +67,7 @@ def check_outcome
   match2 = match1.grep(/AgentCommands/)
   result1 = (match2.length == 1) ? true : false
   # 2)
-  match1 = lines.grep(/DONE\.OK/)
+  match1 = lines.grep(/EXIT/)
   match2 = match1.grep(/AgentCommands/)
   result2 = (match2.length >= 2) ? true : false
 

data/example/test_exp/test07.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 #
 # Test 7
 #

data/lib/omf_ec/app_definition.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'securerandom'
 
 module OmfEc

data/lib/omf_ec/backward/app_definition.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 module OmfEc
   module Backward
     module AppDefinition
@@ -39,8 +44,25 @@ module OmfEc
         define_parameter(Hash[name,opts])
       end
 
-      def defMetric(name,type)
-        @fields << {:field => name, :type => type}
+      # Define metrics to measure
+      #
+      # @param [String] name of the metric
+      # @param [Symbol] type of the metric data. For all supporting metric data types, refers to http://oml.mytestbed.net/doc/oml/latest/oml2-scaffold.1.html#_mp_defmetric_name_type
+      # @param [Hash] opts additional options
+      #
+      # @option opts [String] :unit unit of measure of the metric
+      # @option opts [String] :description of the metric
+      # @option opts [Float] :precision precision of the metric value
+      # @option opts [Range] :range value range of the metric
+      #
+      # @example OEDL
+      #   app.defMeasurement("power") do |mp|
+      #     mp.defMetric('power', :double, unit: "W", precision: 0.1, description: 'Power')
+      #   end
+      def defMetric(name,type, opts = {})
+        # the third parameter used to be a description string
+        opts = {:description => opts} if opts.class!=Hash
+        @fields << {:field => name, :type => type}.merge(opts)
       end
 
       # XXX: This should be provided by the omf-oml glue.
@@ -48,7 +70,7 @@ module OmfEc
         mp = {:mp => name, :fields => []}
         @fields = []
         # call the block with ourserlves to process its 'defMetric' statements
-        block.call(self) if block 
+        block.call(self) if block
         @fields.each { |f| mp[:fields] << f }
         define_measurement_point(mp)
       end

data/lib/omf_ec/backward/core_ext/array.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 class Array
   def startApplications
     if !self.empty? && self.all? { |v| v.class == OmfEc::Group }

data/lib/omf_ec/backward/default_events.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 module OmfEc
   module Backward
     module DefaultEvents
@@ -9,9 +14,7 @@ module OmfEc
             def_event :ALL_UP do |state|
               all_groups? do |g|
                 plan = g.members.uniq.sort
-                actual = state.find_all do |v|
-                  v[:membership] && v[:membership].include?(g.id)
-                end.map { |v| v[:address] }.sort
+                actual = state.find_all { |v| v.joined?(g.id) }.map { |v| v[:address] }.sort
 
                 debug "Planned: #{g.name}(#{g.id}): #{plan}"
                 debug "Actual: #{g.name}(#{g.id}): #{actual}"
@@ -49,10 +52,7 @@ module OmfEc
             def_event :ALL_INTERFACE_UP do |state|
               all_groups? do |g|
                 plan = g.net_ifs.map { |v| v.conf[:if_name] }.uniq.size * g.members.uniq.size
-                actual = state.find_all do |v|
-                  v[:membership] &&
-                    (v[:membership].include?("#{g.id}_wlan") || v[:membership].include?("#{g.id}_net"))
-                end.size
+                actual = state.count { |v| v.joined?("#{g.id}_wlan", "#{g.id}_net") }
                 plan == actual
               end
             end
@@ -60,13 +60,19 @@ module OmfEc
             def_event :ALL_UP_AND_INSTALLED do |state|
               all_groups? do |g|
                 plan = g.app_contexts.size * g.members.uniq.size
-                actual = state.find_all do |v|
-                  v[:membership] && v[:membership].include?("#{g.id}_application")
-                end.size
+                actual = state.count { |v| v.joined?("#{g.id}_application") }
                 plan == actual
               end
             end
 
+            def_event :ALL_APPS_DONE do |state|
+              all_groups? do |g|
+                plan = (g.execs.size + g.app_contexts.size) * g.members.uniq.size
+                actual = state.count { |v| v.joined?("#{g.id}_application") && v[:event] == 'EXIT' }
+                plan == 0 ? false : plan == actual
+              end
+            end
+
           end
         end
       end

data/lib/omf_ec/backward/dsl.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 module OmfEc
   module Backward
     module DSL

data/lib/omf_ec/backward/exp/testbed.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 def create_app(testbed)
   testbed.create(:application, binary_path: @cmd) do |reply|
     if reply.success?
@@ -6,11 +11,11 @@ def create_app(testbed)
       app.on_subscribed do
         app.configure(state: :running)
 
-        app.on_status  do |m|
+        app.on_inform  do |m|
           case m.itype
           when 'STATUS'
             if m[:status_type] == 'APP_EVENT'
-              after(2) { OmfCommon.comm.disconnect } if m[:event] =~ /DONE.(OK|ERROR)/
+              after(2) { OmfCommon.comm.disconnect } if m[:event] =~ /EXIT/
               info m[:msg] if m[:msg]
             else
               m.each_property do |k, v|

data/lib/omf_ec/backward/group.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'securerandom'
 
 module OmfEc
@@ -12,10 +17,12 @@ module OmfEc
       # Create an application for the group and start it
       #
       def exec(name)
+        self.synchronize do
+          self.execs << name
+        end
         create_resource(name, type: 'application', binary_path: name)
 
         e_uid = SecureRandom.uuid
-
         e_name = "#{self.name}_application_#{name}_created_#{e_uid}"
 
         resource_group_name = "#{self.id}_application"

data/lib/omf_ec/context/app_context.rb

@@ -1,10 +1,16 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 module OmfEc::Context
+  # Holds application configuration
   class AppContext
     attr_accessor :name, :app_def, :param_values, :oml_collections
 
     # Keep track of contexts for each app, i.e. multiple contexts can share
-    # the same app def. This happens for example when a group can have the 
-    # same applications added to it many times, but with different parameter 
+    # the same app def. This happens for example when a group can have the
+    # same applications added to it many times, but with different parameter
     # values for each. Thus we need to distinguish these different context
     @@context_count = Hash.new
 
@@ -61,11 +67,11 @@ module OmfEc::Context
 
     def properties
       # deep copy the properties from the app definition
-      original = Marshal.load(Marshal.dump(app_def.properties)) 
+      original = Marshal.load(Marshal.dump(app_def.properties))
       # now build the properties for this context
       # - use the properties from app definition as the base
-      # - if this context's param_values has a property which also exists in 
-      #   the app def and if that property has an assigned value, then 
+      # - if this context's param_values has a property which also exists in
+      #   the app def and if that property has an assigned value, then
       #   use that value for the properties of this context
       p = original.merge({:type => 'application'})
       @param_values.each do |k,v|
@@ -77,9 +83,9 @@ module OmfEc::Context
         p[:use_oml] = true
         p[:oml][:id] = @name
         p[:oml][:experiment] = OmfEc.experiment.id
-        p[:oml][:collection] = @oml_collections      
+        p[:oml][:collection] = @oml_collections
       end
       p
-    end    
+    end
   end
 end

data/lib/omf_ec/context/def_app_context.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 module OmfEc::Context
   class DefAppContext
     attr_accessor :conf

data/lib/omf_ec/context/group_context.rb

@@ -1,4 +1,10 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 module OmfEc::Context
+  # Holds group configuration
   class GroupContext
     attr_accessor :group
     attr_accessor :guard
@@ -10,11 +16,32 @@ module OmfEc::Context
       self
     end
 
+    # Supports OEDL 6 syntax [] for setting FRCP guard
+    #
+    # @param [Hash] opts option hash which sets constraints
+    #
+    # @example Reduce throttle to zero for  all resources of type 'engine' from group 'A'
+    #
+    #   group('A') do |g|
+    #     g.resources[type: 'engine'].throttle = 0
+    #   end
+    #
     def [](opts = {})
       self.guard.merge!(opts)
       self
     end
 
+    # Calling standard methods or assignments will simply trigger sending a FRCP message
+    #
+    # @example OEDL
+    #   # Will send FRCP CONFIGURE message
+    #   g.resources[type: 'engine'].throttle = 0
+    #
+    #   # Will send FRCP REQUEST message
+    #   g.resources[type: 'engine'].rpm
+    #
+    #   # Will send FRCP RELEASE message
+    #   g.resources[type: 'engine'].release
     def method_missing(name, *args, &block)
       if name =~ /(.+)=/
         self.operation = :configure
@@ -27,6 +54,10 @@ module OmfEc::Context
       send_message(name, *args, &block)
     end
 
+    # Send FRCP message
+    #
+    # @param [String] name of the property
+    # @param [Object] value of the property, for configuring
     def send_message(name, value = nil, &block)
       if self.guard[:type]
         topic = self.group.resource_topic(self.guard[:type])

data/lib/omf_ec/context/net_context.rb

@@ -1,4 +1,10 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 module OmfEc::Context
+  # Holds network related configuration
   class NetContext
     # Wifi frequency channel matching
     FREQUENCY= {
@@ -18,6 +24,11 @@ module OmfEc::Context
       self
     end
 
+    # Property assignment will simply update configuration
+    #
+    # @example OEDL
+    #   node.net.w0.mode = "adhoc"
+    #   node.net.w0.essid = "helloworld"
     def method_missing(name, *args, &block)
       if name =~ /(.+)=/
         net_prop = $1.to_sym
@@ -33,6 +44,7 @@ module OmfEc::Context
       end
     end
 
+    # Interchange channel and frequency value
     def map_channel_freq
       if self.conf[:channel] && self.conf[:frequency].nil?
         self.conf[:frequency] = FREQUENCY[self.conf[:channel].to_s.to_i]

data/lib/omf_ec/context.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'omf_ec/context/group_context'
 require 'omf_ec/context/net_context'
 require 'omf_ec/context/app_context'

data/lib/omf_ec/core_ext/hash.rb

@@ -0,0 +1,11 @@
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
+class Hash
+  def joined?(*group_ids)
+    self[:membership] && group_ids.any? { |g_id| self[:membership].include?(g_id) }
+  end
+end
+

data/lib/omf_ec/dsl.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'active_support/core_ext'
 require 'eventmachine'
 
@@ -148,7 +153,7 @@ module OmfEc
     # Check if any elements in array equals the value provided
     #
     def one_equal(array, value)
-      array.any? ? false : array.all? { |v| v.to_s == value.to_s }
+      !array.any? ? false : array.any? { |v| v.to_s == value.to_s }
     end
 
     # Define an event

data/lib/omf_ec/experiment.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'hashie'
 require 'singleton'
 require 'monitor'
@@ -14,6 +19,7 @@ module OmfEc
     attr_reader :groups, :sub_groups, :state
 
     def initialize
+      super
       @id = Time.now.utc.iso8601
       @state ||= [] #TODO: we need to keep history of all the events and not ovewrite them
       @groups ||= []
@@ -21,7 +27,6 @@ module OmfEc
       @app_definitions ||= Hash.new
       @sub_groups ||= []
       @cmdline_properties ||= Hash.new
-      super
     end
 
     def property
@@ -143,8 +148,8 @@ module OmfEc
       self.synchronize do
         @events.find_all { |v| v[:callbacks] && !v[:callbacks].empty? }.each do |event|
           if event[:trigger].call(@state)
-            info "Event triggered: '#{event[:name]}'"
             @events.delete(event) if event[:consume_event]
+            info "Event triggered: '#{event[:name]}'"
 
             # Last in first serve callbacks
             event[:callbacks].reverse.each do |callback|