omf_ec 6.0.2.pre.1 → 6.0.2.pre.2

data/bin/omf_ec

@@ -17,7 +17,7 @@ switch [:d, :debug]
 
 desc "URI for communication layer"
 arg_name "URI"
-default_value "xmpp://bob:password@localhost"
+default_value "xmpp://localhost"
 flag [:u, :uri]
 
 desc "Debug XMPP traffic mode (include XMPP debug logging messages under debug mode)."

data/lib/omf_ec/backward/app_definition.rb

@@ -1,12 +1,34 @@
 module OmfEc
   module Backward
     module AppDefinition
-      # The following are ODEL 5 methods
+      # The following are OEDL 5 methods
 
-      # Add a new parameter to this Application Definition
-      # This method is for backward compatibility with previous OEDL 5
+      # Add a new parameter to this Application Definition.
+      # This method is for backward compatibility with previous OEDL 5.
+      #
+      # @param [String] name name of the property to define (mandatory)
+      # @param [String] description description of this property; oml2-scaffold uses this for the help message (popt: descrip)
+      # @param [String] parameter command-line parameter to introduce this property, including dashes if needed (can be nil)
+      # @param [Hash] options list of options associated with this property
+      # @option options [String] :type type of the property: :integer, :string and :boolean are supported; oml2-scaffold extends this with :int and :double (popt: argInfo)
+      # @option options [Boolean] :dynamic true if the property can be changed at run-time
+      # @option options [Fixnum] :order used to order properties when creating the command line
+      #
+      # The OML code-generation tool, oml2-scaffold extends the range of
+      # options supported in the options hash to support generation of
+      # popt(3) command line parsing code. As for the parameters, depending
+      # on the number of dashes (two/one) in parameter, it is used as the
+      # longName/shortName for popt(3), otherwise the former defaults to
+      # name, and the latter defaults to either :mnemonic or nothing.
+      #
+      # @option options [String] :mnemonic one-letter mnemonic for the option (also returned by poptGetNextOpt as val)
+      # @option options [String] :unit unit in which this property is expressed; oml2-scaffold uses this for the help message (popt: argDescrip)
+      # @option options [String] :default default value if argument unspecified (optional; defaults to something sane for the :type)
+      # @option options [String] :var_name name of the C variable for popt(3) to store the property value into (optional; popt: arg; defaults to name, after sanitisation)
+      #
+      # @see http://oml.mytestbed.net/doc/oml/latest/oml2-scaffold.1.html
+      # @see http://linux.die.net/man/3/popt
       #
-      # @param [String] name name of the application to define
       def defProperty(name = :mandatory, description = nil, parameter = nil, options = {})
         opts = {:description => description, :cmd => parameter}
         # Map old OMF5 types to OMF6
@@ -21,6 +43,7 @@ module OmfEc
         @fields << {:field => name, :type => type}
       end
 
+      # XXX: This should be provided by the omf-oml glue.
       def defMeasurement(name,&block)
         mp = {:mp => name, :fields => []}
         @fields = []

data/lib/omf_ec/backward/exp/testbed.rb

@@ -1,32 +1,28 @@
 def create_app(testbed)
-  testbed.create(:application) do |reply|
+  testbed.create(:application, binary_path: @cmd) do |reply|
     if reply.success?
       app = reply.resource
 
       app.on_subscribed do
-        app.request([:platform])
-
-        after(1) { app.configure(binary_path: @cmd) }
-        after(2) { app.configure(state: :running) }
+        app.configure(state: :running)
 
         app.on_status  do |m|
-          if m[:status_type] == 'APP_EVENT'
-            after(2) { OmfCommon.comm.disconnect } if m[:event] =~ /DONE.(OK|ERROR)/
-            info m[:msg]
-          else
-            m.each_property do |k, v|
-              info "#{k} => #{v.strip}" unless v.nil?
+          case m.itype
+          when 'STATUS'
+            if m[:status_type] == 'APP_EVENT'
+              after(2) { OmfCommon.comm.disconnect } if m[:event] =~ /DONE.(OK|ERROR)/
+              info m[:msg] if m[:msg]
+            else
+              m.each_property do |k, v|
+                info "#{k} => #{v.strip}" unless v.nil?
+              end
             end
+          when 'WARN'
+            warn m[:reason]
+          when 'ERROR'
+            error m[:reason]
           end
         end
-
-        app.on_warn  do |m|
-          warn m[:reason]
-        end
-
-        app.on_error  do |m|
-          error m[:reason]
-        end
       end
     else
       error reply[:reason]

data/lib/omf_ec/experiment.rb

@@ -65,13 +65,30 @@ module OmfEc
           end
         else
           info "Newly discovered resource >> #{name}"
-          @state << Hashie::Mash.new({ address: name }).merge(opts)
+          res = Hashie::Mash.new({ address: name }).merge(opts)
+          @state << res
+
+          # Re send membership configure
+          planned_groups = groups_by_res(res[:address])
+
+          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(&:id).join(', '))
+            end
+          end
         end
       end
     end
 
     alias_method :add_resource, :add_or_update_resource_state
 
+    # Find all groups a given resource belongs to
+    #
+    def groups_by_res(res_addr)
+      groups.find_all { |g| g.members.include?(res_addr) }
+    end
+
     def sub_group(name)
       @sub_groups.find { |v| v == name }
     end

data/lib/omf_ec/version.rb

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

data/omf_ec.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   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 "omf_common", "~> 6.0.2.pre.2"
   s.add_runtime_dependency "gli", "~> 2.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.2.pre.1
+  version: 6.0.2.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.2.pre.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.2.pre.2
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement