omf_ec 6.1.2.pre.2 → 6.1.2.pre.3

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'rake/testtask'
 require "bundler/gem_tasks"
 

data/example/engine_oedl.rb

@@ -22,20 +22,23 @@ defEvent :rpm_reached_4000 do |state|
 end
 
 # Define a group and add garages to it.
-defGroup('garages', prop.garage)
+defGroup('garages', prop.garage, include_childern: true)
 
 # :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('my_engine', type: 'engine')
+    #g.request("child_resources")
+    g.engines.request(:rpm)
+
+    g.create_engine('my_engine') do #, type: 'engine')
 
     onEvent :engine_created do
       info ">>> Accelerating all engines"
       g.resources[type: 'engine'].throttle = 50
-
       # We periodically check engine RPM
       every 2.second do
+        g.engines.request(:rpm)
         g.resources[type: 'engine'].rpm
       end
     end

data/lib/omf_ec/backward/default_events.rb

@@ -26,18 +26,20 @@ module OmfEc
             end
 
             def all_interfaces_ready?(state)
+              results = []
               all_groups? do |g|
                 plan = g.net_ifs.map { |v| v.conf[:if_name] }.uniq.size * g.members.values.uniq.size
-                actual = state.count { |v| v.joined?(g.address("wlan"), g.address("net")) }
-                plan == 0 ? false : plan == actual
+                actual = state.count { |v| v.joined?(g.address("wlan"), g.address("net")) && v[:state] == 'UP' }
+                results << (plan == actual) unless (plan == 0)
               end
+              !results.include?(false)
             end
 
             def all_apps_ready?(state)
               results = []
               all_groups? do |g|
                 plan = g.app_contexts.size * g.members.values.uniq.size
-                actual = state.count { |v| v.joined?(g.address("application")) } 
+                actual = state.count { |v| v.joined?(g.address("application")) }
                 results << (plan == actual) unless (plan == 0)
               end
               !results.include?(false)

data/lib/omf_ec/runner.rb

@@ -152,7 +152,7 @@ module OmfEc
     end
 
     def remove_cmd_opts_from_argv(*args)
-      args.each { |v| @argv.delete(v) }
+      args.each { |v| @argv.slice!(@argv.index(v)) if @argv.index(v) }
     end
 
     def setup_experiment
@@ -174,6 +174,12 @@ module OmfEc
 
       remove_cmd_opts_from_argv("exec")
 
+      @argv.in_groups_of(2) do |arg_g|
+        if arg_g[0] =~ /^--(.+)/ && !arg_g[1].nil?
+          remove_cmd_opts_from_argv(*arg_g)
+        end
+      end
+
       @oedl_path = @argv[0] && File.expand_path(@argv[0])
 
       if @oedl_path.nil? || !File.exist?(@oedl_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.2.pre.2
+  version: 6.1.2.pre.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-07 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.2.pre.2
+        version: 6.1.2.pre.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2.pre.2
+        version: 6.1.2.pre.3
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
-rubygems_version: 1.8.28
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: OMF experiment controller