omf_ec 6.0.8.pre.5 → 6.1.0

data/bin/omf_ec

@@ -295,7 +295,7 @@ def setup_logging(global_options = {})
 
   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}"))
+    Logging.logger.root.add_appenders(Logging.appenders.oml4r('oml4r', :appName => 'omf_ec', :domain => "#{OmfEc.experiment.id}", :collect => "#{OmfEc.experiment.oml_uri}"))
   end
 
   OmfCommon.load_logging_config(global_options[:log_config])
@@ -303,7 +303,6 @@ end
 
 def load_exp(exp_path, global_options = {} , options = {}, properties = {})
   begin
-
     if options[:inst_oml_uri] && options[:inst_oml_id] && options[:inst_oml_domain]
       require 'oml4r'
       instrument_ec = OML4R::init(nil, { collect: options[:inst_oml_uri], nodeID: options[:inst_oml_id], domain: options[:inst_oml_domain] , appName: File.basename($PROGRAM_NAME)} )
@@ -331,7 +330,7 @@ def load_exp(exp_path, global_options = {} , options = {}, properties = {})
       setup_logging(global_options)
 
       OmfCommon.comm.on_connected do |comm|
-        info "OMF Experiment Controller #{OmfEc::VERSION}"
+        info "OMF Experiment Controller #{OmfEc::VERSION} - Start"
         info "Connected using #{comm.conn_info}"
         info "Execute: #{exp_path}"
         info "Properties: #{OmfEc.experiment.cmdline_properties}"
@@ -347,11 +346,16 @@ def load_exp(exp_path, global_options = {} , options = {}, properties = {})
           OmfCommon::Auth::CertificateStore.instance.register(ec_cert)
         end
 
+        OmfEc.experiment.log_metadata("ec_version", "#{OmfEc::VERSION}")
+        OmfEc.experiment.log_metadata("exp_path", exp_path)
+        OmfEc.experiment.log_metadata("ec_pid", "#{Process.pid}")
+
         begin
           include OmfEc::Backward::DefaultEvents
           load exp_path
           OmfEc::Experiment.start
         rescue => e
+          OmfEc.experiment.log_metadata("state", "error")
           error e.message
           error e.backtrace.join("\n")
         end

data/lib/omf_ec/dsl.rb

@@ -124,8 +124,9 @@ module OmfEc
     # @param name of property
     # @param default_value for this property
     # @param description short text description of this property
+    # @param type of property
     #
-    def def_property(name, default_value, description = nil)
+    def def_property(name, default_value, description = nil, type = nil)
       OmfEc.experiment.add_property(name, default_value, description)
     end
 

data/lib/omf_ec/experiment.rb

@@ -18,6 +18,16 @@ module OmfEc
     attr_accessor :name, :oml_uri, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes
     attr_reader :groups, :sub_groups, :state
 
+    # MP only used for injecting metadata
+    class MetaData < OML4R::MPBase
+      name :meta_data
+
+      # TODO: Should we use the meta data functionality - not sure if it is working right now
+      param :domain, type: :string
+      param :key, type: :string
+      param :value, type: :string
+    end
+
     def initialize
       super
       @id = Time.now.utc.iso8601(3)
@@ -171,6 +181,11 @@ module OmfEc
       end
     end
 
+    def log_metadata(key, value, domain = 'sys')
+      #MetaData.inject_metadata(key.to_s, value.to_s)
+      MetaData.inject(domain.to_s, key.to_s, value.to_s)
+    end
+
     # Purely for backward compatibility
     class << self
       # Disconnect communicator, try to delete any XMPP affiliations
@@ -186,11 +201,15 @@ module OmfEc
             g.resources[type: 'wlan'].release unless g.net_ifs.find_all { |v| v.conf[:type] == 'wlan' }.empty?
           end
 
-          OmfCommon.el.after(5) do
-            OmfCommon.comm.disconnect
-            OmfCommon.eventloop.stop
+          OmfCommon.el.after(4) do
+            info "OMF Experiment Controller #{OmfEc::VERSION} - Exit."
+            OmfCommon.el.after(1) do
+              OmfCommon.comm.disconnect
+              OmfCommon.eventloop.stop
+            end
           end
         end
+        OmfEc.experiment.log_metadata("state", "finished")
       end
 
       def disconnect
@@ -204,6 +223,7 @@ module OmfEc
 
       def start
         info "Experiment: #{OmfEc.experiment.id} starts"
+        OmfEc.experiment.log_metadata("state", "running")
 
         allGroups do |g|
           g.members.each do |key, value|

data/lib/omf_ec/experiment_property.rb

@@ -160,11 +160,16 @@ module OmfEc
       @value = value
       info "#{name} = #{value.inspect} (#{value.class})"
       @change_observers.each { |proc| proc.call(value) }
+      OmfEc.experiment.log_metadata(name, value, :prop)
     end
 
     # Implicit conversion to String (required for + operator)
     def to_str() @value.to_s end
 
+    # More convenient conversion 
+    def to_f() @value.to_f end
+    def to_i() @value.to_i end
+
     # Explicit conversion to String
     alias_method :to_s, :to_str
 

data/lib/omf_ec/graph/graph_description.rb

@@ -70,6 +70,7 @@ module OmfEc::Graph
     end
 
     def _report
+      _report_meta
       info "REPORT:START: #{@name}"
       info "REPORT:TYPE: #{@gtype}"
       info "REPORT:POSTFIX: #{URI.encode(@postfix)}" if @postfix
@@ -86,6 +87,26 @@ module OmfEc::Graph
       info "REPORT:STOP"
     end
 
+    def _report_meta
+      h = {
+        type: @gtype,
+        mapping: @mapping,
+        caption: @caption
+      }
+      h[:postfix] = @postfix if @postfix
+      dss = h[:dss] = {}
+      @ms.each do |ctxt, a|
+        a.each do |ms|
+          dss[ctxt] = ms.sql
+        end
+      end
+      if @axis
+        h[:axis] = @axis
+      end
+      descr = h.to_json
+      OmfEc.experiment.log_metadata(@name, descr, :graph)
+    end
+
     protected
 
     def initialize(name)

data/omf_ec.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("../../omf_common/lib", __FILE__)
 require "omf_ec/version"
 
 Gem::Specification.new do |s|

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.8.pre.5
-  prerelease: 6
+  version: 6.1.0
+  prerelease: 
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.8.pre.5
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.8.pre.5
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -205,12 +205,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: omf_ec
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: OMF experiment controller