omf_ec 6.0.1 → 6.0.2.pre.1

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in omf_ec.gemspec
 gemspec
+
+group :test do
+  gem 'rake'
+end

data/bin/omf_ec

@@ -23,9 +23,17 @@ flag [:u, :uri]
 desc "Debug XMPP traffic mode (include XMPP debug logging messages under debug mode)."
 switch [:x, :xmpp]
 
-desc "Private key file"
+desc "Root certificate file"
+arg_name "cert", :optional
+flag [:root_cert]
+
+desc "Your certificate"
+arg_name "cert", :optional
+flag [:cert]
+
+desc "Your private key"
 arg_name "key", :optional
-flag [:private_key]
+flag [:key]
 
 desc "Log file directory"
 arg_name "directory"
@@ -52,8 +60,8 @@ command :exec do |c|
     help_now! "Missing experiment script" if args[0].nil?
     help_now! "Experiment script not found" unless File.exist?(args[0])
 
-    # User-provided command line values for Experiment Properties cannot be 
-    # set here as the propertties have not been defined yet by the experiment. 
+    # User-provided command line values for Experiment Properties cannot be
+    # set here as the propertties have not been defined yet by the experiment.
     # Thus just pass them to the experiment, which will be responsible
     # for setting them later
     properties = {}
@@ -239,11 +247,22 @@ end
 
 def load_exp(exp_path, global_options = {} , options = {}, properties = {})
   begin
+    if global_options[:root_cert] && File.exist?(global_options[:root_cert])
+      root = OmfCommon::Auth::Certificate.create_from_x509(File.read(global_options[:root_cert]))
+    end
+
+    if global_options[:cert] && File.exist?(global_options[:cert]) &&
+      global_options[:key] && File.exist?(global_options[:key])
+
+      entity = OmfCommon::Auth::Certificate.create_from_x509(File.read(global_options[:cert]),
+                                                             File.read(global_options[:key]))
+    end
+
     opts = {
       communication: { url: global_options[:uri] },
       eventloop: { type: :em },
       logging: {
-        level: global_options[:debug] ? 'debug' : 'info',
+        level: { default: global_options[:debug] ? 'debug' : 'info' },
         appenders: {
           stdout: {
             date_pattern: '%H:%M:%S',
@@ -254,13 +273,18 @@ def load_exp(exp_path, global_options = {} , options = {}, properties = {})
       }
     }
 
+    opts[:communication][:auth] = { certs: [ root.to_pem_compact ] } if root
+
     OmfCommon.init(:development, opts) do |el|
       setup_logging(global_options)
 
       OmfCommon.comm.on_connected do |comm|
-        info "Connected"
+        info "Connected using #{comm.conn_info}"
         info "Start experiment: #{OmfEc.experiment.id}"
 
+        OmfCommon::Auth::CertificateStore.instance.register(root) if root
+        OmfCommon::Auth::CertificateStore.instance.register(entity, OmfCommon.comm.local_address) if entity
+
         begin
           include OmfEc::Backward::DefaultEvents
           load exp_path
@@ -269,7 +293,6 @@ def load_exp(exp_path, global_options = {} , options = {}, properties = {})
           error e.backtrace.join("\n")
         end
 
-        #comm.on_interrupted { Experiment.done }
         comm.on_interrupted { comm.disconnect }
       end
     end

data/lib/omf_ec.rb

@@ -29,41 +29,36 @@ module OmfEc
     end
 
     def register_default_callback(topic)
-      topic.on_creation_failed do |msg|
-        warn "RC reports creation.failed: '#{msg[:reason]}'"
-        debug msg
-      end
-
-      topic.on_error do |msg|
-        warn "RC reports error: '#{msg[:reason]}'"
-        debug msg
-      end
-
-      topic.on_warn do |msg|
-        warn "RC reports warning: '#{msg[:reason]}'"
-        debug msg
-      end
+      topic.on_inform do |msg|
+        case msg.itype
+        when 'CREATION.FAILED'
+          warn "RC reports creation.failed: '#{msg[:reason]}'"
+          debug msg
+        when 'ERROR'
+          warn "RC reports error: '#{msg[:reason]}'"
+          debug msg
+        when 'WARN'
+          warn "RC reports warning: '#{msg[:reason]}'"
+          debug msg
+        when 'CREATION.OK'
+          debug "Received CREATION.OK via #{topic.id}"
+          info "Resource #{msg[:res_id]} #{msg.resource.address} created"
 
-      topic.on_creation_ok do |msg|
-        debug "Received CREATION.OK via #{topic.id}"
-        info "Resource #{msg[:res_id]} created"
+          OmfEc.experiment.add_or_update_resource_state(msg.resource.address, msg.properties)
 
-        OmfEc.experiment.add_or_update_resource_state(msg[:uid], msg.properties)
+          OmfEc.experiment.process_events
+        when 'STATUS'
+          props = []
+          msg.each_property { |k, v| props << "#{k}: #{v}" }
+          debug "#{topic.id} >> inform: #{props.join(", ")}"
 
-        OmfEc.experiment.process_events
-      end
-
-      topic.on_status do |msg|
-        props = []
-        msg.each_property { |k, v| props << "#{k}: #{v}" }
-        debug "#{topic.id} >> inform: #{props.join(", ")}"
+          if msg[:status_type] == 'APP_EVENT'
+            info "APP_EVENT #{msg[:event]} from app #{msg[:app]} - msg: #{msg[:msg]}"
+          end
 
-        if msg[:status_type] == 'APP_EVENT'
-          info "APP_EVENT #{msg[:event]} from app #{msg[:app]} - msg: #{msg[:msg]}"
+          OmfEc.experiment.add_or_update_resource_state(msg.src, msg.properties)
+          OmfEc.experiment.process_events
         end
-
-        OmfEc.experiment.add_or_update_resource_state(msg[:uid], msg.properties)
-        OmfEc.experiment.process_events
       end
     end
 

data/lib/omf_ec/app_definition.rb

@@ -8,7 +8,7 @@ module OmfEc
 
     # TODO: eventually this call would mirror all the properties of the App Proxy
     # right now we just have name, binary_path, parameters
-    attr_accessor :name, :properties 
+    attr_accessor :name, :properties
 
     # @param [String] name name of the application to define
     def initialize(name)
@@ -17,23 +17,23 @@ module OmfEc
     end
 
     # Add new parameter(s) to this Application Definition
-    # 
+    #
     # @param [Hash] params a hash with the parameters to add
     #
     def define_parameter(params)
-      @properties[:parameters] = Hashie::Mash.new unless @properties.key?(:parameters) 
+      @properties[:parameters] = Hashie::Mash.new unless @properties.key?(:parameters)
       if params.kind_of? Hash
         @properties[:parameters].merge!(params)
       else
         error "Cannot define parameter for app '#{self.name}'! Parameter "+
           "not passed as a Hash ('#{params.inspect}')"
-      end 
+      end
     end
 
     def define_measurement_point(mp)
       @properties[:oml] = Hashie::Mash.new unless @properties.key?(:oml)
       if mp.kind_of? Hash
-        @properties[:oml][:available_mps] = Array.new unless @properties[:oml].key?(:available_mps) 
+        @properties[:oml][:available_mps] = Array.new unless @properties[:oml].key?(:available_mps)
         @properties[:oml][:available_mps] << mp
       else
         error "Cannot define Measurement Point for app '#{self.name}'! MP "+
@@ -41,12 +41,24 @@ module OmfEc
       end
     end
 
+    warn_removed :version
+
+    def path=(arg)
+      @properties[:binary_path] = arg
+      warn_deprecation :path=, :binary_path=
+    end
+
+    def shortDescription=(arg)
+      @properties[:description] = arg
+      warn_deprecation :shortDescription=, :description=
+    end
+
     def method_missing(method_name, *args)
       k = method_name.to_sym
       return @properties[k] if @properties.key?(k)
       m = method_name.to_s.match(/(.*?)([=]?)$/)
       if m[2] == '='
-        @properties[m[1].to_sym] = args.first 
+        @properties[m[1].to_sym] = args.first
       else
         super
       end

data/lib/omf_ec/backward/default_events.rb

@@ -11,7 +11,7 @@ module OmfEc
                 plan = g.members.uniq.sort
                 actual = state.find_all do |v|
                   v[:membership] && v[:membership].include?(g.id)
-                end.map { |v| v[:uid] }.sort
+                end.map { |v| v[:address] }.sort
 
                 debug "Planned: #{g.name}(#{g.id}): #{plan}"
                 debug "Actual: #{g.name}(#{g.id}): #{actual}"

data/lib/omf_ec/context/app_context.rb

@@ -20,7 +20,7 @@ module OmfEc::Context
         @group = group
         self
       else
-        raise RuntimeError, "Cannot create context for unknwon application '#{name}'"
+        raise RuntimeError, "Cannot create context for unknown application '#{name}'"
       end
     end
 

data/lib/omf_ec/dsl.rb

@@ -9,7 +9,7 @@ module OmfEc
     # raised when the OMF EC is processing an OEDL experiment scripts
     #
     # The base exception is OEDLException
-    class OEDLException < Exception; end
+    class OEDLException < StandardError; end
 
     class OEDLArgumentException < OEDLException
       attr_reader :cmd, :arg

data/lib/omf_ec/experiment.rb

@@ -34,8 +34,8 @@ module OmfEc
       ExperimentProperty.create(name, value, description)
     end
 
-    def resource_state(id)
-      @state.find { |v| v[:uid].to_s == id.to_s }
+    def resource_state(address)
+      @state.find { |v| v[:address].to_s == address.to_s }
     end
 
     alias_method :resource, :resource_state
@@ -64,8 +64,8 @@ module OmfEc
             end
           end
         else
-          info "Newly discovered resource >> #{opts[:uid]}"
-          @state << Hashie::Mash.new({ uid: name }.merge(opts))
+          info "Newly discovered resource >> #{name}"
+          @state << Hashie::Mash.new({ address: name }).merge(opts)
         end
       end
     end
@@ -111,7 +111,7 @@ module OmfEc
 
     def add_event(name, trigger)
       self.synchronize do
-        raise RuntimeError, "Event '#{name}' has been defined" if event(name)
+        raise RuntimeError, "Event '#{name}' has already been defined" if event(name)
         @events << { name: name, trigger: trigger }
       end
     end

data/lib/omf_ec/group.rb

@@ -61,8 +61,8 @@ module OmfEc
             @members += g.members
             self.add_resource(*g.members.uniq)
           else
-            @members << name.to_s
             OmfEc.subscribe_and_monitor(name) do |res|
+              @members << res.address
               info "Config #{name} to join #{self.name}"
               res.configure(membership: self.id)
             end
@@ -82,7 +82,7 @@ module OmfEc
         # Make a deep copy of opts in case it contains structures of structures
         begin
           opts = Marshal.load ( Marshal.dump(opts.merge(hrn: name)))
-        rescue Exception => e
+        rescue => e
           raise "#{e.message} - Could not deep copy opts: '#{opts.inspect}'"
         end
 

data/lib/omf_ec/version.rb

@@ -1,3 +1,3 @@
 module OmfEc
-  VERSION = "6.0.1"
+  VERSION = "6.0.2.pre.1"
 end

data/omf_ec.gemspec

@@ -22,6 +22,9 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "minitest", "~> 3.2"
+  s.add_development_dependency "em-minitest-spec", "~> 1.1.1"
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "pry"
   s.add_runtime_dependency "omf_common", "~> 6.0.0"
   s.add_runtime_dependency "gli", "~> 2.5.3"
 end

data/test/omf_ec/experiment_property_spec.rb

@@ -13,7 +13,7 @@ describe OmfEc::ExperimentProperty do
         begin
           OmfEc::ExperimentProperty.create(name)
           created_properties = created_properties + 1
-        rescue Exception => ex
+        rescue  => ex
           ex.must_be_kind_of OEDLCommandException
         end
       end

data/test/omf_ec/experiment_spec.rb

@@ -35,7 +35,7 @@ describe OmfEc::Experiment do
 
   it "must be able to add resource to state" do
     @experiment.add_or_update_resource_state('bob', type: :test)
-    @experiment.resource_state('bob')[:uid].must_equal 'bob'
+    @experiment.resource_state('bob')[:address].must_equal 'bob'
     @experiment.resource_state('bob')[:type].must_equal :test
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.1
-  prerelease: 
+  version: 6.0.2.pre.1
+  prerelease: 6
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -27,6 +27,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: em-minitest-spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !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: omf_common
   requirement: !ruby/object:Gem::Requirement
@@ -122,14 +170,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: OMF experiment controller
-test_files: []
-has_rdoc: 
+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