omf_ec 6.1.8 → 6.1.9.pre.2

data/lib/omf_ec/backward/default_events.rb

@@ -39,7 +39,7 @@ module OmfEc
               results = []
               all_groups? do |g|
                 plan = g.app_contexts.size * g.members.values.uniq.size
-                actual = state.count { |v| v.joined?(g.address("application")) && v[:state] == "stopped" }
+                actual = state.count { |v| v.joined?(g.address("application")) && v[:state] == "created" }
                 results << (plan == actual) unless (plan == 0)
               end
               !results.include?(false)

data/lib/omf_ec/context/app_context.rb

@@ -88,7 +88,7 @@ module OmfEc::Context
       # - 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', state: 'stopped'})
+      p = original.merge({type: 'application', state: 'created'})
       @param_values.each do |k,v|
         if p[:parameters].key?(k)
           p[:parameters][k][:value] = v.kind_of?(OmfEc::ExperimentProperty) ? v.value : v

data/lib/omf_ec/dsl.rb

@@ -189,9 +189,14 @@ module OmfEc
     end
 
     # Define an event
-    def def_event(name, &trigger)
+    #
+    # @param [Symbol] name of the event
+    #
+    # @param [Hash] opts additional options
+    # @option opts [Fixnum] :every indicates non-reactive style event checking, i.e. trigger will be evaluated periodically with :every as interval
+    def def_event(name, opts = {}, &trigger)
       raise ArgumentError, 'Need a trigger callback' if trigger.nil?
-      OmfEc.experiment.add_event(name, trigger)
+      OmfEc.experiment.add_event(name, opts, trigger)
     end
 
     # Create an alias name of an event

data/lib/omf_ec/experiment.rb

@@ -16,7 +16,7 @@ module OmfEc
 
     include MonitorMixin
 
-    attr_accessor :name, :oml_uri, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes
+    attr_accessor :name, :sliceID, :oml_uri, :js_url, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes
     attr_reader :groups, :sub_groups, :state
 
     # MP only used for injecting metadata
@@ -32,6 +32,7 @@ module OmfEc
     def initialize
       super
       @id = Time.now.utc.iso8601(3)
+      @sliceID = nil
       @state ||= [] #TODO: we need to keep history of all the events and not ovewrite them
       @groups ||= []
       @nodes ||= []
@@ -144,11 +145,21 @@ module OmfEc
       @events.find { |v| v[:name] == name || v[:aliases].include?(name) }
     end
 
-    def add_event(name, trigger)
+    def add_event(name, opts, trigger)
       self.synchronize do
         warn "Event '#{name}' has already been defined. Overwriting it now." if event(name)
         @events.delete_if { |e| e[:name] == name }
-        @events << { name: name, trigger: trigger, aliases: [] }
+        @events << { name: name, trigger: trigger, aliases: [] }.merge(opts)
+        add_periodic_event(event(name)) if opts[:every]
+      end
+    end
+
+    def clear_events
+      self.synchronize do
+        @events.each do |e|
+          e[:periodic_timer].cancel if e[:periodic_timer]
+        end
+        @events = []
       end
     end
 
@@ -162,20 +173,40 @@ module OmfEc
       instance.id
     end
 
+    # Unique slice id (Class method)
+    def self.sliceID
+      instance.sliceID
+    end
+
     # Parsing user defined events, checking conditions against internal state, and execute callbacks if triggered
     def process_events
       self.synchronize do
-        @events.find_all { |v| v[:callbacks] && !v[:callbacks].empty? }.each do |event|
-          if event[:trigger].call(@state)
-            @events.delete(event) if event[:consume_event]
-            event_names = ([event[:name]] + event[:aliases]).join(', ')
-            info "Event triggered: '#{event_names}'"
-
-            # Last in first serve callbacks
-            event[:callbacks].reverse.each do |callback|
-              callback.call
-            end
-          end
+        @events.find_all { |v| v[:every].nil? }.each do |event|
+          eval_trigger(event)
+        end
+      end
+    end
+
+    def add_periodic_event(event)
+      event[:periodic_timer] = OmfCommon.el.every(event[:every]) do
+        self.synchronize do
+          eval_trigger(event)
+        end
+      end
+    end
+
+    def eval_trigger(event)
+      if event[:callbacks] && !event[:callbacks].empty? && event[:trigger].call(@state)
+        # Periodic check event
+        event[:periodic_timer].cancel if event[:periodic_timer]
+
+        @events.delete(event) if event[:consume_event]
+        event_names = ([event[:name]] + event[:aliases]).join(', ')
+        info "Event triggered: '#{event_names}'"
+
+        # Last in first serve callbacks
+        event[:callbacks].reverse.each do |callback|
+          callback.call
         end
       end
     end
@@ -210,6 +241,9 @@ module OmfEc
         info "Release applications and network interfaces"
         info "Exit in 15 seconds..."
 
+        # Make sure that all defined events are removed
+        OmfEc.experiment.clear_events
+
         OmfCommon.el.after(10) do
           allGroups do |g|
             g.resources[type: 'application'].release unless g.app_contexts.empty?
@@ -240,6 +274,7 @@ module OmfEc
 
       def start
         info "Experiment: #{OmfEc.experiment.id} starts"
+        info "Slice: #{OmfEc.experiment.sliceID}" unless OmfEc.experiment.sliceID.nil?
         OmfEc.experiment.log_metadata("state", "running")
 
         allGroups do |g|

data/lib/omf_ec/graph/graph_description.rb

@@ -45,6 +45,21 @@ module OmfEc::Graph
       msb
     end
 
+    # Define the measurement stream to be visualized in
+    # the graph through a raw SQL query string.
+    # The optional 'context' parameter defines
+    # the context in which the stream is used in the graph. This
+    # is necessary for graphs, such as 'networks' which need
+    # more than one MS to describe the visualization.
+    #
+    # @param sql
+    # @param context
+    #
+    def sql(raw_sql, context = :default)
+      @ms[context] = raw_sql
+      raw_sql
+    end
+
     # Defines the mapping of columns in the measurement tuples to properties
     # of the visualization.
     #
@@ -76,7 +91,8 @@ module OmfEc::Graph
       info "REPORT:POSTFIX: #{URI.encode(@postfix)}" if @postfix
       @ms.each do |ctxt, a|
         a.each do |ms|
-          info "REPORT:MS:#{ctxt}: #{URI.encode(ms.sql)}"
+          sql = ms.is_a?(String) ? ms : ms.sql
+          info "REPORT:MS:#{ctxt}: #{URI.encode(sql)}"
         end
       end
       info "REPORT:MAPPING: #{URI.encode(@mapping.to_json)}"

data/lib/omf_ec/group.rb

@@ -5,8 +5,10 @@
 
 require 'securerandom'
 require 'monitor'
+require 'omf_ec/group_ext'
 
 module OmfEc
+
   # Group instance used in experiment script
   #
   # @!attribute name [String] name of the resource
@@ -16,9 +18,12 @@ module OmfEc
   # @!attribute apps [Array] holding applications to be added to group
   class Group
     include MonitorMixin
+    extend GroupExt
 
     attr_accessor :name, :id, :net_ifs, :members, :app_contexts, :execs
-    attr_reader :topic
+    attr_reader :topic, :g_aliases
+
+    fwd_method_to_aliases :startApplications, :stopApplications, :startApplication
 
     # @param [String] name name of the group
     # @param [Hash] opts
@@ -31,6 +36,8 @@ module OmfEc
       self.members = {}
       self.app_contexts = []
       self.execs = []
+      # To record group 2 group relationship
+      @g_aliases = []
 
       @resource_topics = {}
 
@@ -68,6 +75,7 @@ module OmfEc
         names.each do |name|
           if (g = OmfEc.experiment.group(name))# resource to add is a group
             @members.merge!(g.members)
+            @g_aliases << g
           else
             OmfEc.experiment.nodes << name unless OmfEc.experiment.nodes.include?(name)
             @members[name] = nil
@@ -127,6 +135,94 @@ module OmfEc
 
     alias_method :prototype, :addPrototype
 
-    include OmfEc::Backward::Group
+    def resource_group(type)
+      "#{self.id}_#{type.to_s}"
+    end
+
+    # Create an application for the group and start it
+    #
+    def exec(command)
+      name = SecureRandom.uuid
+
+      self.synchronize do
+        self.execs << name
+      end
+      create_resource(name, type: 'application', binary_path: command)
+
+      e_name = "#{self.name}_application_#{name}_created"
+
+      resource_group_name = self.address("application")
+
+      def_event e_name do |state|
+        state.find_all { |v| v[:hrn] == name && v[:membership] && v[:membership].include?(resource_group_name)}.size >= self.members.values.sort.uniq.size
+      end
+
+      on_event e_name do
+        resources[type: 'application', name: name].state = :running
+      end
+    end
+
+    # Start ONE application by name
+    def startApplication(app_name)
+      if self.app_contexts.find { |v| v.name == app_name }
+        resources[type: 'application', name: app_name].state = :running
+      else
+        warn "No application with name '#{app_name}' defined in group #{self.name}. Nothing to start"
+      end
+    end
+
+    # Start ALL applications in the group
+    def startApplications
+      if self.app_contexts.empty?
+        warn "No applications defined in group #{self.name}. Nothing to start"
+      else
+        resources[type: 'application'].state = :running
+      end
+    end
+
+    # Stop ALL applications in the group
+    def stopApplications
+      if self.app_contexts.empty?
+        warn "No applications defined in group #{self.name}. Nothing to stop"
+      else
+        resources[type: 'application'].state = :stopped
+      end
+    end
+
+    def addApplication(name, location = nil, &block)
+      app_cxt = OmfEc::Context::AppContext.new(name,location,self)
+      block.call(app_cxt) if block
+      self.app_contexts << app_cxt
+    end
+
+    # @example
+    #   group('actor', 'node1', 'node2') do |g|
+    #     g.net.w0.ip = '0.0.0.0'
+    #     g.net.e0.ip = '0.0.0.1'
+    #   end
+    def net
+      self.net_ifs ||= []
+      self
+    end
+
+    def method_missing(name, *args, &block)
+      if name =~ /w(\d+)/
+        net = self.net_ifs.find { |v| v.conf[:if_name] == "wlan#{$1}" }
+        if net.nil?
+          net = OmfEc::Context::NetContext.new(:type => 'wlan', :if_name => "wlan#{$1}", :index => $1)
+          self.net_ifs << net
+        end
+        net
+      elsif name =~ /e(\d+)/
+        net = self.net_ifs.find { |v| v.conf[:if_name] == "eth#{$1}" }
+        if net.nil?
+          net = OmfEc::Context::NetContext.new(:type => 'net', :if_name => "eth#{$1}", :index => $1)
+          self.net_ifs << net
+        end
+        net
+      else
+        super
+      end
+    end
   end
 end

data/lib/omf_ec/group_ext.rb

@@ -0,0 +1,19 @@
+module OmfEc
+  module GroupExt
+    @@methods_to_fwd = []
+
+    def fwd_method_to_aliases(*m)
+      @@methods_to_fwd += m.flatten
+    end
+
+    def method_added(m)
+      if @@methods_to_fwd.delete(m)
+        alias_method "#{m}_without_fwd_to_aliases", m
+        define_method m do |*args, &block|
+          method("#{m}_without_fwd_to_aliases").call(*args, &block)
+          self.g_aliases.each { |g| g.send(m, *args, &block) }
+        end
+      end
+    end
+  end
+end

data/lib/omf_ec/runner.rb

@@ -97,11 +97,17 @@ module OmfEc
             remove_cmd_opts_from_argv("--name", "--experiment", e_name)
           end
 
-          op.on("--slice SLICE_NAME", "Slice name [Deprecated]") do |slice|
+          op.on("--slice SLICE_NAME", "Slice name [optional]") do |slice|
             @cmd_opts[:slice] = slice
+            OmfEc.experiment.sliceID = slice
             remove_cmd_opts_from_argv("--slice", slice)
           end
 
+          op.on("--job_service URL", "URL to the JobService [optional]") do |url|
+            OmfEc.experiment.js_url = url
+            remove_cmd_opts_from_argv("--job_service", url)
+          end
+
           op.on("--oml_uri URI", "URI for the OML data collection of experiment applications") do |uri|
             @cmd_opts[:oml_uri] = uri
             remove_cmd_opts_from_argv("--oml_uri", uri)

data/lib/omf_ec.rb

@@ -6,7 +6,6 @@
 require "omf_common"
 require 'omf_ec/core_ext/hash'
 require 'omf_ec/backward/dsl'
-require 'omf_ec/backward/group'
 require 'omf_ec/backward/app_definition'
 require 'omf_ec/backward/default_events'
 require 'omf_ec/backward/core_ext/array'

data/test/omf_ec/experiment_spec.rb

@@ -20,7 +20,7 @@ describe OmfEc::Experiment do
 
   it "must be able to add event" do
     trigger = proc { 1 }
-    @experiment.add_event('bob', trigger)
+    @experiment.add_event('bob', {}, trigger)
     @experiment.event('bob')[:name].must_equal "bob"
     @experiment.event('bob')[:trigger].call.must_equal 1
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.8
-  prerelease: 
+  version: 6.1.9.pre.2
+  prerelease: 6
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.8
+        version: 6.1.9.pre.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.8
+        version: 6.1.9.pre.2
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,6 @@ files:
 - lib/omf_ec/backward/default_events.rb
 - lib/omf_ec/backward/dsl.rb
 - lib/omf_ec/backward/exp/testbed.rb
-- lib/omf_ec/backward/group.rb
 - lib/omf_ec/backward/timeout_resources.rb
 - lib/omf_ec/context.rb
 - lib/omf_ec/context/app_context.rb
@@ -168,6 +167,7 @@ files:
 - lib/omf_ec/graph.rb
 - lib/omf_ec/graph/graph_description.rb
 - lib/omf_ec/group.rb
+- lib/omf_ec/group_ext.rb
 - lib/omf_ec/parameter.rb
 - lib/omf_ec/property.rb
 - lib/omf_ec/prototype.rb
@@ -199,12 +199,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3601576826864806014
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
 rubygems_version: 1.8.23

data/lib/omf_ec/backward/group.rb

@@ -1,110 +0,0 @@
-# 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
-  module Backward
-    module Group
-      # The following are ODEL 5 methods
-
-      def resource_group(type)
-        "#{self.id}_#{type.to_s}"
-      end
-
-      # Create an application for the group and start it
-      #
-      def exec(command)
-        name = SecureRandom.uuid
-
-        self.synchronize do
-          self.execs << name
-        end
-        create_resource(name, type: 'application', binary_path: command)
-
-        e_name = "#{self.name}_application_#{name}_created"
-
-        resource_group_name = self.address("application")
-
-        def_event e_name do |state|
-          state.find_all { |v| v[:hrn] == name && v[:membership] && v[:membership].include?(resource_group_name)}.size >= self.members.values.sort.uniq.size
-        end
-
-        on_event e_name do
-          resources[type: 'application', name: name].state = :running
-        end
-      end
-
-      def startApplication(app_name)
-        if self.app_contexts.find { |v| v.name == app_name }
-          resources[type: 'application', name: app_name].state = :running
-        else
-          warn "No application with name '#{app_name}' defined in group #{self.name}. Nothing to start"
-        end
-      end
-
-      def startApplication(app_name)
-        if self.app_contexts.find { |v| v.name == app_name }
-          resources[type: 'application', name: app_name].state = :running
-        else
-          warn "No application with name '#{app_name}' defined in group #{self.name}. Nothing to start"
-        end
-      end
-
-      def startApplications
-        if self.app_contexts.empty?
-          warn "No applications defined in group #{self.name}. Nothing to start"
-        else
-          resources[type: 'application'].state = :running
-        end
-      end
-
-      def stopApplications
-        if self.app_contexts.empty?
-          warn "No applications defined in group #{self.name}. Nothing to stop"
-        else
-          resources[type: 'application'].state = :stopped
-        end
-      end
-
-      def addApplication(name, location = nil, &block)
-        app_cxt = OmfEc::Context::AppContext.new(name,location,self)
-        block.call(app_cxt) if block
-        self.app_contexts << app_cxt
-      end
-
-      # @example
-      #   group('actor', 'node1', 'node2') do |g|
-      #     g.net.w0.ip = '0.0.0.0'
-      #     g.net.e0.ip = '0.0.0.1'
-      #   end
-      def net
-        self.net_ifs ||= []
-        self
-      end
-
-      def method_missing(name, *args, &block)
-        if name =~ /w(\d+)/
-          net = self.net_ifs.find { |v| v.conf[:if_name] == "wlan#{$1}" }
-          if net.nil?
-            net = OmfEc::Context::NetContext.new(:type => 'wlan', :if_name => "wlan#{$1}", :index => $1)
-            self.net_ifs << net
-          end
-          net
-        elsif name =~ /e(\d+)/
-          net = self.net_ifs.find { |v| v.conf[:if_name] == "eth#{$1}" }
-          if net.nil?
-            net = OmfEc::Context::NetContext.new(:type => 'net', :if_name => "eth#{$1}", :index => $1)
-            self.net_ifs << net
-          end
-          net
-        else
-          super
-        end
-      end
-
-    end
-  end
-end