omf_ec 6.0.8.pre.4 → 6.0.8.pre.5

data/bin/omf_ec

@@ -53,8 +53,18 @@ flag [:log_config]
 desc "Add some colours to logging"
 switch [:colour]
 
+desc "EC config file"
+arg_name "file"
+flag [:c, :config]
+
+$config_file = ".config/omf_ec.yml"
+ARGV.each_index {|a|
+  if ARGV[a]=="-c" or ARGV[a]=="--config"
+    $config_file = ARGV[a+1] if not ARGV[a+1].nil?
+  end
+}
 # the path given here is relative to the user's home directory
-config_file(".config/omf_ec.yml")
+config_file($config_file)
 
 desc "Execute an experiment script"
 arg_name "path_to_script_file [-- --experiment_property value]"
@@ -184,7 +194,7 @@ desc "Return the status of the nodes"
 command :stat do |c|
   c.desc "use this testbed configuration in OMF 5 EC config file"
   c.arg_name "AGGREGATE"
-  c.flag [:c, :config], :default_value => "default"
+  c.flag [:C], :default_value => "default"
 
   c.desc "comma-separated list of nodes to image"
   c.arg_name "TOPOLOGY"
@@ -194,7 +204,7 @@ command :stat do |c|
   c.switch [:s, :summary]
 
   c.action do |global_options, options, args|
-    @cmd = "omf-5.4 stat -c #{options[:c]} -t #{options[:t]} "
+    @cmd = "omf-5.4 stat -c #{options[:C]} -t #{options[:t]} "
     @cmd += "-s" if options[:s]
     load_exp(@testbed_exp_path, global_options, options)
   end
@@ -283,6 +293,11 @@ def setup_logging(global_options = {})
                                            :pattern => '[%d] %-5l %c: %m\n')))
   end
 
+  if OmfEc.experiment.oml_uri
+    require 'oml4r/logging/oml4r_appender'
+    Logging.logger.root.add_appenders(Logging.appenders.oml4r('oml4r', :appName => 'omf_ec_log', :domain => "#{OmfEc.experiment.id}", :collect => "#{OmfEc.experiment.oml_uri}"))
+  end
+
   OmfCommon.load_logging_config(global_options[:log_config])
 end
 

data/example/test_exp/test01.rb

@@ -17,7 +17,7 @@ onEvent(:ALL_UP) do
   allGroups.exec("/bin/date")
 
   info "TEST - group"
-  group("Actor").exec("/bin/hostname -f")
+  group("Actor").exec("/bin/hostname -A")
 
   Experiment.done
 end

data/lib/omf_ec/context/app_context.rb

@@ -58,12 +58,20 @@ module OmfEc::Context
 
     # For now this follows v5.4 syntax...
     # We have not yet finalised an OML syntax inside OEDL for v6
-    def measure(mp,filters)
-      warn "No OML URI configured, don't know where to send measurements (add option 'oml_uri')" if OmfEc.experiment.oml_uri.nil?
-      collection = {:url => OmfEc.experiment.oml_uri, :streams => [] }
-      stream = { :mp => mp , :filters => [] }.merge(filters)
-      collection[:streams] << stream
-      @oml_collections << collection
+    # TODO: v6 currently does not support OML filters. Formerly in v5.x, these
+    # filters were defined in an optional block.
+    def measure(mp, opts, &block)
+      collect_point = opts.delete(:collect)
+      collect_point ||= OmfEc.experiment.oml_uri 
+      if collect_point.nil?
+        warn "No OML URI configured for measurement collection! "+
+             "(see option 'oml_uri'). Disabling OML Collection for '#{mp}'."
+        return
+      end
+      stream = { :mp => mp , :filters => [] }.merge(opts)
+      index = @oml_collections.find_index { |c| c[:url] == collect_point }
+      @oml_collections << {:url => collect_point, :streams => [stream] } if index.nil?
+      @oml_collections[index][:streams] << stream unless index.nil?
     end
 
     def properties

data/lib/omf_ec.rb

@@ -47,7 +47,7 @@ end
 
     def register_default_callback(topic)
       topic.on_inform do |msg|
-OmfEc::MPReceived.inject(Time.now.to_f, topic.id, msg.mid) if OmfCommon::Measure.enabled?
+        OmfEc::MPReceived.inject(Time.now.to_f, topic.id, msg.mid) if OmfCommon::Measure.enabled?
         case msg.itype.upcase
         when 'CREATION.FAILED'
           warn "RC reports creation.failed: '#{msg[:reason]}'", msg.src

data/test/omf_ec/app_context_spec.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2014 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 'test_helper'
+require 'omf_ec/context/app_context'
+
+describe OmfEc::Context::AppContext do
+  before do
+    OmfEc.experiment.stubs(:app_definitions).returns({'foo_app' => 'foo_def'})
+    @app_context = OmfEc::Context::AppContext.new('foo_app', 'foo_group')
+  end
+
+  describe "when defined with an associated application definition" do
+    it "must be able to create valid configuration hash for OML Collection Measurement Points" do
+      @app_context.measure('ms1', :samples => 1)
+      @app_context.oml_collections.must_equal []
+      @app_context.measure('ms1', :samples => 1, :collect => "foo1")
+      @app_context.oml_collections.must_equal [{:url=>"foo1", :streams=>[{:mp=>"ms1", :filters=>[], :samples=>1}]}]
+      @app_context.oml_collections = []
+      @app_context.measure('ms1', :samples => 1, :collect => "foo1")
+      @app_context.measure('ms2', :interval => 1, :collect => "foo1")
+      @app_context.oml_collections.must_equal [{:url=>"foo1", :streams=>[{:mp=>"ms1", :filters=>[], :samples=>1}, {:mp=>"ms2", :filters=>[], :interval=>1}]}]
+      @app_context.oml_collections = []
+      @app_context.measure('ms1', :samples => 1, :collect => "foo1")
+      @app_context.measure('ms2', :interval => 1, :collect => "foo2")
+      @app_context.oml_collections.must_equal [{:url=>"foo1", :streams=>[{:mp=>"ms1", :filters=>[], :samples=>1}]}, {:url=>"foo2", :streams=>[{:mp=>"ms2", :filters=>[], :interval=>1}]}]
+      OmfEc.experiment.stubs(:oml_uri).returns('foo_url')
+      @app_context.oml_collections = []
+      @app_context.measure('ms1', :samples => 1)
+      @app_context.measure('ms2', :interval => 1)
+      @app_context.oml_collections.must_equal [{:url=>"foo_url", :streams=>[{:mp=>"ms1", :filters=>[], :samples=>1}, {:mp=>"ms2", :filters=>[], :interval=>1}]}]
+      @app_context.oml_collections = []
+      @app_context.measure('ms1', :samples => 1)
+      @app_context.measure('ms2', :interval => 1, :collect => "foo2")
+      @app_context.oml_collections.must_equal [{:url=>"foo_url", :streams=>[{:mp=>"ms1", :filters=>[], :samples=>1}]}, {:url=>"foo2", :streams=>[{:mp=>"ms2", :filters=>[], :interval=>1}]}]
+    end
+
+  end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.8.pre.4
+  version: 6.0.8.pre.5
+  prerelease: 6
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,85 +46,97 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.8.pre.4
+        version: 6.0.8.pre.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.8.pre.4
+        version: 6.0.8.pre.5
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Experiment controller of OMF, a generic framework for controlling and
@@ -165,6 +182,7 @@ files:
 - lib/omf_ec/group.rb
 - lib/omf_ec/version.rb
 - omf_ec.gemspec
+- test/omf_ec/app_context_spec.rb
 - test/omf_ec/context_spec.rb
 - test/omf_ec/dsl_spec.rb
 - test/omf_ec/experiment_property_spec.rb
@@ -174,25 +192,26 @@ files:
 homepage: http://omf.mytestbed.net
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
-rubygems_version: 2.0.7
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OMF experiment controller
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0c8f0366816084708f868b39e9cf0ba8188fc311
-  data.tar.gz: b2bf0c637089196f8996da713770d152f386d6f5
-SHA512:
-  metadata.gz: 7c81d45d25d9bcd907458a7cb34ff0bb2e39ad26341aa6126b3340fc125fb59594bd3420388e670b3df608a23ae2b5297ff62276eba28dc1f3fcdf83b81ebace
-  data.tar.gz: 1383c37c3f7b7522b12b5f57108ba78cba43b035b35e26f9ea85a09f2ee0aa332ccefb6508e9dcfaeaf0dca52218ca3324a990d20dc96932076c72750e7eed5f