omf_ec 6.1.9.pre.2 → 6.1.9.pre.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4fb7b8aaaec98f0e0002f6bf0acc04ddc7194c0a
+  data.tar.gz: 53e1f7bccb0fffde50263c3e1d960346a64ae541
+SHA512:
+  metadata.gz: d3cbd93c704afc74f0029a6826f8849308670ed0801a71ee6ce75fbff4b6cd6a4c8bc723a9a5e0d8e022979bfc0f79ff92a6f281a7571f90699afe80312bad9e
+  data.tar.gz: 2c0570b792f82fd1db7dc3f24b0de305fcc1a276133f5c0b9be3592edc3019380550e135054f354d9a485f578d66baf2f4ff0fa85deb8f6901ddc7e03a634b65

data/lib/omf_ec/backward/dsl.rb

@@ -19,6 +19,7 @@ module OmfEc
           v5_style(:defGroup, base)
           v5_style(:loadOEDL, base)
           v5_style(:ensureProperty, base)
+          v5_style(:defQuery, base)
         end
 
         def v5_style(name, base)

data/lib/omf_ec/dsl.rb

@@ -325,5 +325,74 @@ module OmfEc
       p.name = name
       block.call(p)
     end
+
+    # Define a query for measurements
+    # This requires that the EC was started with its JobService related
+    # parameters set (e.g. js_url or job_url)
+    # The EC contacts the JobService and:
+    # 1 - request the creation of a Measurement Point corresponding the query 
+    #    parameter of this function.
+    # 2 - read the data generated by that query, and return it. 
+    #
+    # @param query a SQL query 
+    #
+    def def_query(query)
+      raise "No valid URL to connect to the Job Service!" if OmfEc.experiment.job_url.nil?
+      require 'json'
+      require 'net/http'
+      begin
+        # Create a Measurement Point for that Job item
+        unless OmfEc.experiment.job_mps.include?(query)
+          mp = { name: "#{Time.now.to_i}", sql: query }
+          u = URI.parse(OmfEc.experiment.job_url+'/measurement_points')
+          req = Net::HTTP::Post.new(u.path, {'Content-Type' =>'application/json'})
+          req.body = JSON.pretty_generate(mp)
+          res = Net::HTTP.new(u.host, u.port).start {|http| http.request(req) }
+          raise "Could not connect to the service providing measurements\n"+
+                "Response #{res.code} #{res.message}:\n#{res.body}" unless res.kind_of? Net::HTTPSuccess
+          mp = JSON.parse(res.body)
+          raise "No valid URL to connect to the measurement point" if mp['href'].nil?
+          OmfEc.experiment.job_mps[query] = mp['href']
+        end
+        # Read and format data from that Measurement Point
+        u = URI.parse(OmfEc.experiment.job_mps[query]+'/data')
+        res = Net::HTTP.get(u)
+        raise "No valid data from the service providing measurements" if res.nil? || res.empty? || !(res.kind_of? String)
+        resjon = JSON.parse(res)
+        metrics = resjon['schema'].map { |e| e[0] }
+        data = []
+        resjon['data'].each do |a|
+          row = {}
+          a.each_index { |i| row[metrics[i].downcase.to_sym] = a[i] }
+          data << row
+        end
+        return data
+      rescue Exception => ex
+        error "def_query - #{ex}"
+        return nil
+      end
+    end
+
+    # Define a query for measurements, using the Sequel Syntax
+    # Refer to the def_query method above.
+    # In this variant, the query is defined using the Sequel Syntax against a
+    # Measurement Stream which must have been previously defined in the OEDl
+    # experiment (e.g. app.measure('foo') in a addApplication block)
+    #
+    # @param ms_name the name of the existing measurement stream on which to run
+    # this query 
+    #
+    def ms(ms_name)
+      db = Sequel.postgres
+      db.instance_variable_set('@server_version', 90105)
+      if (table_name = OmfEc.experiment.mp_table_names[ms_name])
+        msb = OmfEc::Graph::MSBuilder.new(db[table_name.to_sym])
+      else
+        warn "Measurement point '#{ms_name}' NOT defined"
+      end
+      def_query(msb.sql)
+    end
+
+
   end
 end

data/lib/omf_ec/experiment.rb

@@ -16,7 +16,7 @@ module OmfEc
 
     include MonitorMixin
 
-    attr_accessor :name, :sliceID, :oml_uri, :js_url, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes
+    attr_accessor :name, :sliceID, :oml_uri, :js_url, :job_url, :job_mps, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes
     attr_reader :groups, :sub_groups, :state
 
     # MP only used for injecting metadata
@@ -41,6 +41,9 @@ module OmfEc
       @sub_groups ||= []
       @cmdline_properties ||= Hash.new
       @show_graph = false
+      @js_url = nil
+      @job_url = nil
+      @job_mps = {}
     end
 
     def property
@@ -198,7 +201,7 @@ module OmfEc
     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]
+        event[:periodic_timer].cancel if event[:periodic_timer] && event[:consume_event]
 
         @events.delete(event) if event[:consume_event]
         event_names = ([event[:name]] + event[:aliases]).join(', ')
@@ -233,6 +236,30 @@ module OmfEc
       )
     end
 
+    # If EC is launched with --job-service setup, then it needs to 
+    # create a job entry for this experiment trial
+    # Do nothing if:
+    # - a JobService URL has not been provided, i.e. EC runs without needs to contact JS
+    # - we already have a Job URL, i.e. the job entry has already been created
+    def create_job
+      return unless @job_url.nil?
+      return if @js_url.nil?
+      require 'json'
+      require 'net/http'
+      begin
+        job = { name: self.id }
+        u = URI.parse(@js_url+'/jobs')
+        req = Net::HTTP::Post.new(u.path, {'Content-Type' =>'application/json'})
+        req.body = JSON.pretty_generate(job)
+        res = Net::HTTP.new(u.host, u.port).start {|http| http.request(req) }
+        raise "Could not create a job for this experiment trial\n"+
+              "Response #{res.code} #{res.message}:\n#{res.body}" unless res.kind_of? Net::HTTPSuccess
+        job = JSON.parse(res.body)
+        raise "No valid URL received for the created job for this experiment trial" if job['href'].nil?
+        @job_url = job['href']
+      end
+    end
+
     # Purely for backward compatibility
     class << self
       # Disconnect communicator, try to delete any XMPP affiliations

data/lib/omf_ec/runner.rb

@@ -103,9 +103,14 @@ module OmfEc
             remove_cmd_opts_from_argv("--slice", slice)
           end
 
-          op.on("--job_service URL", "URL to the JobService [optional]") do |url|
+          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)
+            remove_cmd_opts_from_argv("--job-service", url)
+          end
+
+          op.on("--job-url URL", "URL to the Job for this experiment trial [optional]") do |url|
+            OmfEc.experiment.job_url = url
+            remove_cmd_opts_from_argv("--job-url", url)
           end
 
           op.on("--oml_uri URI", "URI for the OML data collection of experiment applications") do |uri|
@@ -287,6 +292,7 @@ module OmfEc
             OmfEc.experiment.log_metadata("exp_path", @oedl_path)
             OmfEc.experiment.log_metadata("ec_pid", "#{Process.pid}")
             OmfEc.experiment.archive_oedl(@oedl_path)
+            OmfEc.experiment.create_job
 
             begin
               load @oedl_path

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.9.pre.2
-  prerelease: 6
+  version: 6.1.9.pre.3
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   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: 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: evented-spec
   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.1.9.pre.2
+        version: 6.1.9.pre.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.9.pre.2
+        version: 6.1.9.pre.3
 - !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
@@ -186,26 +171,34 @@ 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: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OMF experiment controller
-test_files: []
+test_files:
+- test/oedls/empty.oedl
+- 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
+- test/omf_ec/experiment_spec.rb
+- test/omf_ec/group_spec.rb
+- test/omf_ec/runner_spec.rb
+- test/test_helper.rb