omf_ec 6.1.12 → 6.1.14.pre.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWEyMTUyMzg1NGI2YjMxZDhjZmI0ODQ0MzgzNWIyY2YyZWM5MjUyMQ==
+    N2ZjMDkyMjEwYjQ1MjExY2U3N2MzMGE5MDViYmY4ZTY4MTgxZWMyMA==
   data.tar.gz: !binary |-
-    MmRjZWMyNWRmNzgwNjY2YjljOTRiZGExM2EwYTIwZWY0Zjk3ZjViNQ==
+    YTVlMzQxMThkN2U4MDRjMzY2NWNkZDA5YzQ5NDQ4NTlmY2QyNjgzZg==
 SHA512:
   metadata.gz: !binary |-
-    MzExMWUzNzA5ZmYyNmQyYWU4YzA4YjNhNmZiNTkwMzRkYjU0Yjg2ZTJjMDNl
-    NTdlM2YwZTM3YjcwOGI3ZDNmYmZiZmUyM2JmYmU3NjUyN2Y3YTU0ODA5YTEz
-    YjJhNzJiYmRiNmVmMjc4MzhiYWQwYjcyOTViODhmMjA1NDc2MWM=
+    Yjc0ODM1YmY2OGY3MzhkYTE1MTdiNWU0MjVhNmI2MjQ0MWIwODJlMTBjMzAw
+    ODFiYzhkOTkzYzVhODg3Mzk3YzdkM2FmZjQwZTYzMGMyNGVmYjNlMjdmZjkw
+    YTdmYTYwYzZiYWEyMDNlMmZmOGFmZjc1OWI2OThmYzNkODQzYmM=
   data.tar.gz: !binary |-
-    MTE0OWYzZWM5Zjc2YWUwZjZmYWE0NTQ1YTUxYjliZTE2ZmI4MWE1ZTAwMjcx
-    ODc4NGJjYTNkZTU0OWI1ZDcyZjRjN2QwNzgzYmQ3Y2E5ZjUxYTljZmUyMTMy
-    MzhkZmM3MzI3NDQyODZkZjZlNjdiOWUzZTM4MmUwNmQ5NWRmOWY=
+    YTQzOWUxMTBkY2QxNWE0OGQ1OWIwMDcxYmVjZDI3YjhjZWI0NDRiODBhNjcw
+    ZTg2ODk2NDRhNmI4NWM1NjlkZmUyZGFkMzcyZjNjMTQ4YjQwNWIxMjE1NjFj
+    N2ZmMGNjMjI4ODZmNmM3ZmZkNGMxNzk0YTkyOTQ0NGI2NDc0ZmQ=

data/lib/omf_ec/context/app_context.rb

@@ -47,7 +47,7 @@ module OmfEc::Context
             OmfEc.subscribe_and_monitor(@group.resource_group(:application)) do |topic|
               p = properties
               p[:parameters][key.to_sym][:value] = property_value.value
-              topic.configure(p, { guard: { hrn: @name} } )
+              topic.configure(p, { guard: { hrn: @name}, assert: OmfEc.experiment.assertion } )
             end
           end
         end

data/lib/omf_ec/context/group_context.rb

@@ -77,9 +77,11 @@ module OmfEc::Context
 
       case self.operation
       when :configure
-        topic.configure({ name => value }, { guard: self.guard })
+        topic.configure({ name => value },
+                        { guard: self.guard, assert: OmfEc.experiment.assertion })
       when :request
-        topic.request([:uid, :hrn, name], { guard: self.guard })
+        topic.request([:uid, :hrn, name],
+                      { guard: self.guard, assert: OmfEc.experiment.assertion })
       when :release
         topics_to_release = OmfEc.experiment.state.find_all do |res_state|
           all_equal(self.guard.keys) do |k|
@@ -90,7 +92,7 @@ module OmfEc::Context
         topics_to_release.each do |res_state|
           OmfEc.subscribe_and_monitor(res_state.uid) do |child_topic|
             OmfEc.subscribe_and_monitor(self.group.id) do |group_topic|
-              group_topic.release(child_topic) if child_topic
+              group_topic.release(child_topic, { assert: OmfEc.experiment.assertion }) if child_topic
             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, :ss_url, :job_url, :job_mps, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes
+    attr_accessor :name, :sliceID, :oml_uri, :js_url, :ss_url, :job_url, :job_mps, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes, :assertion
     attr_reader :groups, :sub_groups, :state
 
     # MP only used for injecting metadata
@@ -97,7 +97,7 @@ module OmfEc
           unless planned_groups.empty?
             OmfEc.subscribe_and_monitor(name) do |res|
               info "Config #{name} to join #{planned_groups.map(&:name).join(', ')}"
-              res.configure(membership: planned_groups.map(&:address))
+              res.configure({ membership: planned_groups.map(&:address) }, { assert: OmfEc.experiment.assertion } )
             end
           end
         end
@@ -237,7 +237,7 @@ module OmfEc
       )
     end
 
-    # If EC is launched with --job-service setup, then it needs to 
+    # 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
@@ -312,7 +312,7 @@ module OmfEc
               g.synchronize do
                 g.members[key] = res.address
               end
-              res.configure(membership: g.address, :res_index => OmfEc.experiment.nodes.index(key))
+              res.configure({ membership: g.address, res_index: OmfEc.experiment.nodes.index(key) }, { assert: OmfEc.experiment.assertion })
             end
           end
         end

data/lib/omf_ec/graph/graph_description.rb

@@ -84,6 +84,10 @@ module OmfEc::Graph
       @caption = text
     end
 
+    def opts(additional_opts = {})
+      @opts = additional_opts
+    end
+
     def _report
       _report_meta
       info "REPORT:START: #{@name}"
@@ -100,6 +104,7 @@ module OmfEc::Graph
         info "REPORT:AXIS: #{URI.encode(@axis.to_json)}"
       end
       info "REPORT:CAPTION: #{URI.encode(@caption)}" if @caption
+      info "REPORT:OPTS: #{URI.encode(@opts.to_json)}" if @opts
       info "REPORT:STOP"
     end
 
@@ -119,6 +124,9 @@ module OmfEc::Graph
       if @axis
         h[:axis] = @axis
       end
+
+      h[:opts] = @opts if @opts
+
       descr = h.to_json
       OmfEc.experiment.log_metadata(@name, descr, :graph)
     end

data/lib/omf_ec/group.rb

@@ -70,6 +70,12 @@ module OmfEc
     # Resources to be added could be a list of resources, groups, or the mixture of both.
     def add_resource(*names)
       names.flatten!
+
+      # When names is array of resource hash
+      if !names.empty? && names[0].kind_of?(Hash)
+        names.map! { |v| v['omf_id'] if v['type'] == 'node' }.compact!
+      end
+
       synchronize do
         # Recording membership first, used for ALL_UP event
         names.each do |name|
@@ -107,7 +113,8 @@ module OmfEc
           associate_resource_topic(opts[:type].to_s, res_group)
           # Send create message to group
           r_type = opts.delete(:type)
-          @topic.create(r_type, opts.merge(membership: resource_group_name))
+          @topic.create(r_type, opts.merge(membership: resource_group_name),
+                        assert: OmfEc.experiment.assertion)
         end
       end
     end

data/lib/omf_ec/runner.rb

@@ -4,6 +4,7 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License
 
 require 'hashie'
+require 'omf_common/auth/assertion'
 
 module OmfEc
   class Runner
@@ -91,6 +92,11 @@ module OmfEc
             remove_cmd_opts_from_argv("--key", key)
           end
 
+          op.on("--assertion PATH_TO_ASSERTION_FILE", "Assertion") do |assertion|
+            @cmd_opts[:assertion] = assertion
+            remove_cmd_opts_from_argv("--assertion", assertion)
+          end
+
           op.on("--name", "--experiment EXPERIMENT_NAME", "Experiment name") do |e_name|
             @cmd_opts[:experiment_name] = e_name
             OmfEc.experiment.name = e_name
@@ -208,6 +214,24 @@ module OmfEc
       OmfEc.experiment.oml_uri = @config_opts[:oml_uri] if @config_opts[:oml_uri]
       OmfEc.experiment.show_graph = @config_opts['show-graph']
 
+      # Parse assertion JSON if provided
+      #
+      # It is specified in config file as JSON string but
+      # OmfCommon.load_yaml will turn it to hash (mash)
+      #
+      # OR provided via command line as path to the assertion JSON file
+      #
+      if @config_opts['assertion']
+        case @config_opts['assertion']
+        when Hash
+          assert = @config_opts['assertion'].to_json
+        when String
+          assert = File.read(File.expand_path(@config_opts['assertion']))
+        end
+
+        OmfEc.experiment.assertion = OmfCommon::Auth::Assertion.parse(assert)
+      end
+
       # Instrument EC
       if @config_opts[:inst_oml_uri] && @config_opts[:inst_oml_id] && @config_opts[:inst_oml_domain]
         instrument_ec = OML4R::init(nil, {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.12
+  version: 6.1.14.pre.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.12
+        version: 6.1.14.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.12
+        version: 6.1.14.pre.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -183,22 +183,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
-rubygems_version: 2.1.10
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: OMF experiment controller
-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
+test_files: []