omf_ec 6.0.7.1 → 6.0.8.pre.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b35340c3fde964edf505401ceeaf2aa6bd4bbc26
-  data.tar.gz: a6270d75c002b94eca26ded2038e12e49ebfc291
-SHA512:
-  metadata.gz: 63bb6972c62085a4d1e24ab030dde5cd3c156322752b8afa77268bae6b78ff85822cba2d8946bebf960e36f9fc39481c54d9ddb6912e77a5c64703db45ea45b8
-  data.tar.gz: 7cb143e77406ef4cf5243f9a094c468a86edb51a36fc5ac17ac58db74f2afcf927cfda9f52750548e7db94bb5e391e8316c55ef51e0b0bc9f7b2a283ab25d84f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmRmNjg3NjEwYzNkMWJlODQ3MWYyYTMzYmUwYzc1YWRkZjhmMWZiNg==
+  data.tar.gz: !binary |-
+    ZjgxMTE4NGZhODc1NGEzNWJlNDgwMjM3NTIxN2EwMGViZjQ2M2NmNw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZWFlMjZmZjdlOWM5M2QzYzhiZDE2NzNmN2M5ZDY1ZDMyNjNkMjdjZDRhZmQ4
+    Y2NiM2U3OWE5YjQ2OTkzM2I1ZjgzZjg5YzJmMzhhNTc5MjcwNWU2ZjYwYWQ2
+    YTgwYmIwOWM5ZDUyYTI1ZmVhMmI1YTA1MzYzYTBjM2IxZWM2MDY=
+  data.tar.gz: !binary |-
+    YmNhZGJmMzZkYTNlZjkxZTI4YTdmYmVmNTgyZTg1YWQwOTQ2ZmIzZGVjMDdk
+    N2Y5NTlmNDM0N2FkYmU1ODM1YmU2ZGU5MmNkNjUxYWU4M2JhYTAwNzc1NWQz
+    NDNhMDI4ZWQwZjFmNWEwMzdiNTBhYzA5M2M3ZWFjZmQ1MDI3MzY=

data/bin/omf_ec

@@ -54,10 +54,22 @@ command :exec do |c|
   c.arg_name "experiment_name"
   c.flag [:e, :experiment]
 
-  c.desc "Default OML URI to use for collecting measurements"
+  c.desc "OML URI to use for collecting the experiment's measurements"
   c.arg_name "uri"
   c.flag [:oml_uri]
 
+  c.desc "OML URI to use for EC Instrumentation"
+  c.arg_name "uri"
+  c.flag [:inst_oml_uri]
+
+  c.desc "OML ID to use for EC Instrumentation"
+  c.arg_name "id"
+  c.flag [:inst_oml_id]
+
+  c.desc "OML Domain to use for EC Instrumentation"
+  c.arg_name "domain"
+  c.flag [:inst_oml_domain]
+
   c.desc "Check script version (you need to define OMF_VERSIONS in your script"
   c.switch "version_check"
 
@@ -252,11 +264,11 @@ end
 
 def load_exp(exp_path, global_options = {} , options = {}, properties = {})
   begin
-    if global_options[:cert] && File.exist?(File.expand_path(global_options[:cert])) &&
-      global_options[:key] && File.exist?(File.expand_path(global_options[:key]))
 
-      entity = OmfCommon::Auth::Certificate.create_from_x509(File.read(File.expand_path(global_options[:cert])),
-                                                             File.read(File.expand_path(global_options[:key])))
+    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)} )
+      OmfCommon::Measure.enable if instrument_ec
     end
 
     opts = {
@@ -274,7 +286,7 @@ def load_exp(exp_path, global_options = {} , options = {}, properties = {})
       }
     }
 
-    opts[:communication][:auth] = {} if entity
+    opts[:communication][:auth] = { authenticate: true } if global_options[:cert]
 
     OmfCommon.init(:development, opts) do |el|
 
@@ -286,8 +298,14 @@ def load_exp(exp_path, global_options = {} , options = {}, properties = {})
         info "Execute: #{exp_path}"
         info "Properties: #{OmfEc.experiment.cmdline_properties}"
 
-        OmfCommon::Auth::CertificateStore.instance.register_default_certs(File.expand_path(global_options[:root_cert_dir])) if global_options[:root_cert_dir]
-        OmfCommon::Auth::CertificateStore.instance.register(entity, OmfCommon.comm.local_address) if entity
+        ec_cert = OmfCommon.load_credentials(
+          root_cert_dir: global_options[:root_cert_dir],
+          entity_cert: global_options[:cert],
+          entity_key: global_options[:key]
+        )
+
+        ec_cert.resource_id = OmfCommon.comm.local_address
+        OmfCommon::Auth::CertificateStore.instance.register(ec_cert)
 
         begin
           include OmfEc::Backward::DefaultEvents

data/lib/omf_ec/backward/core_ext/array.rb

@@ -10,6 +10,18 @@ class Array
     end
   end
 
+  def startApplication(app_name)
+    if !self.empty? && self.all? { |v| v.class == OmfEc::Group }
+      self.each { |g| g.startApplication(app_name) }
+    end
+  end
+
+  def startApplication(app_name)
+    if !self.empty? && self.all? { |v| v.class == OmfEc::Group }
+      self.each { |g| g.startApplication(app_name) }
+    end
+  end
+
   def stopApplications
     if !self.empty? && self.all? { |v| v.class == OmfEc::Group }
       self.each { |g| g.stopApplications }

data/lib/omf_ec/backward/default_events.rb

@@ -14,7 +14,7 @@ module OmfEc
             def_event :ALL_NODES_UP do |state|
               all_groups? do |g|
                 plan = g.members.values.uniq.sort
-                actual = state.find_all { |v| v.joined?(g.address) }.map { |v| v[:address] }.sort
+                actual = state.find_all { |v| v.joined?(g.address) }.map { |v| v[:address].to_s }.sort
 
                 debug "Planned: #{g.name}(#{g.address}): #{plan}"
                 debug "Actual: #{g.name}(#{g.address}): #{actual}"
@@ -22,6 +22,7 @@ module OmfEc
                 if plan.empty? && actual.empty?
                   warn "Group '#{g.name}' is empty"
                 end
+
                 plan.empty? ? true : plan == actual
               end
             end

data/lib/omf_ec/backward/group.rb

@@ -36,6 +36,22 @@ module OmfEc
         end
       end
 
+      def startApplication(app_name)
+        if self.app_contexts.find { |v| v.name == app_name }
+          resources[type: 'application', name: app_name].state = :running
+        else
+          warn "No application with name '#{app_name}' defined in group #{self.name}. Nothing to start"
+        end
+      end
+
+      def startApplication(app_name)
+        if self.app_contexts.find { |v| v.name == app_name }
+          resources[type: 'application', name: app_name].state = :running
+        else
+          warn "No application with name '#{app_name}' defined in group #{self.name}. Nothing to start"
+        end
+      end
+
       def startApplications
         if self.app_contexts.empty?
           warn "No applications defined in group #{self.name}. Nothing to start"

data/lib/omf_ec/experiment.rb

@@ -140,7 +140,7 @@ module OmfEc
 
     # Unique experiment id
     def id
-      @name.nil? ? @id : "#{@name}-#{@id}"
+      @name.nil? ? @id : @name
     end
 
     # Parsing user defined events, checking conditions against internal state, and execute callbacks if triggered

data/lib/omf_ec/group.rb

@@ -41,7 +41,7 @@ module OmfEc
 
     def address(suffix = nil)
       t_id = suffix ? "#{self.id}_#{suffix.to_s}" : self.id
-      "#{OmfCommon.comm.conn_info[:proto]}://#{t_id}@#{OmfCommon.comm.conn_info[:domain]}"
+      OmfCommon.comm.string_to_address(t_id)
     end
 
     def associate_topic(topic)

data/lib/omf_ec/version.rb

@@ -3,6 +3,8 @@
 # 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 'omf_common/version'
+
 module OmfEc
-  VERSION = "6.0.7.1"
+  VERSION = OmfCommon.version_of('omf_ec')
 end

data/lib/omf_ec.rb

@@ -19,6 +19,16 @@ require "omf_ec/context"
 require "omf_ec/dsl"
 
 module OmfEc
+
+# OML Measurement Point (MP)
+# This MP is for measurements about messages received by the Resource Proxy
+class OmfEc::MPReceived < OML4R::MPBase
+  name :ec_received
+  param :time, :type => :double # Time (s) when this message was received
+  param :topic, :type => :string # Pubsub topic where this message came from
+  param :mid, :type => :string # Unique ID this message
+end
+
   class << self
     # Experiment instance
     #
@@ -36,7 +46,8 @@ module OmfEc
 
     def register_default_callback(topic)
       topic.on_inform do |msg|
-        case msg.itype
+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
           debug msg, msg.src

data/omf_ec.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry"
   s.add_development_dependency "mocha"
 
-  s.add_runtime_dependency "omf_common", "= 6.0.7.1"
-  s.add_runtime_dependency "gli", "~> 2.5.3"
+  s.add_runtime_dependency "omf_common", "= #{OmfCommon::VERSION}"
+  s.add_runtime_dependency "gli"
 end

data/test/omf_ec/experiment_spec.rb

@@ -15,7 +15,7 @@ describe OmfEc::Experiment do
     @experiment.id.wont_be_nil
 
     @experiment.name = 'bob'
-    @experiment.id.must_match /bob-/
+    @experiment.id.must_match /bob/
   end
 
   it "must be able to add event" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.7.1
+  version: 6.0.8.pre.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -42,42 +42,42 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.7.1
+        version: 6.0.8.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.7.1
+        version: 6.0.8.pre.1
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: '0'
 description: Experiment controller of OMF, a generic framework for controlling and
   managing networking testbeds.
 email:
@@ -165,24 +165,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       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.0.6
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: OMF experiment controller
-test_files:
-- 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/test_helper.rb
+test_files: []