omf_ec 6.0.3 → 6.0.4.pre.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjRmMzAxMmI4ZWZmOWI2NjY1NDhlN2ZkMmM1ZGM5MGM0Y2JmMjNkZA==
+  data.tar.gz: !binary |-
+    OTYyYTQ5NzYxOTBiNWVjZDE2NmNmMDAwMmE1YzM0NjQ4MjUzOWYyMg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NGJhYTg5OTJiMmM0YjFmMmExZjNkNjA0YjNkNGQ0ZjVhZjM5NjMyNzNjOWMz
+    ZmM0OThiZDhiODgxN2VlYzAwY2Y3ZTRmZTAwOTllYzgwYWNlMDU4MDY5MDE4
+    NjkzZmE0YmM5MDBkZmUwYTg1NGZlOTZkMmI1Y2MwOTQ0NjU3YmQ=
+  data.tar.gz: !binary |-
+    MDE2ZDQ0MWFkZjE3YmE0ZjFhMGE5YmNmYzNmOTAwZGY3OGIzOTI5M2E4MjJm
+    MzAxNTFkYTljNTczNGJjZDFjYWUyMjlmOGVjZDkxMjAzZDUyYWUzNDQzYzFk
+    OWUwOTJlNDliNDdhZGE3NGQ2YzUwZTE1YzRiZWQyNTg1MjZlNGY=

data/bin/omf_ec

@@ -40,6 +40,10 @@ arg_name "directory"
 default_value "/tmp"
 flag [:log_file_dir]
 
+desc "Logging config file"
+arg_name "file"
+flag [:log_config]
+
 # the path given here is relative to the user's home directory
 config_file(".config/omf_ec.yml")
 
@@ -59,7 +63,7 @@ command :exec do |c|
 
   c.action do |global_options, options, args|
     help_now! "Missing experiment script" if args[0].nil?
-    help_now! "Experiment script not found" unless File.exist?(args[0])
+    help_now! "Experiment script not found" unless File.exist?(File.expand_path(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.
@@ -79,7 +83,7 @@ command :exec do |c|
     end
 
     # FIXME this loading script is way too simple
-    load_exp(args[0], global_options, options, properties)
+    load_exp(File.expand_path(args[0]), global_options, options, properties)
   end
 end
 
@@ -231,26 +235,28 @@ def setup_logging(global_options = {})
   end
 
   unless global_options[:debug]
-    Logging.consolidate 'OmfCommon', 'OmfEc', 'OmfRc'
+    Logging.consolidate 'OmfCommon', 'OmfRc'
   end
 
   # FIXME this should go to common setup
-  if global_options[:log_file_dir] && File.exist?(global_options[:log_file_dir])
+  if global_options[:log_file_dir] && File.exist?(File.expand_path(global_options[:log_file_dir]))
     Logging.logger.root.add_appenders(
       Logging.appenders.file(
-        "#{global_options[:log_file_dir]}/#{OmfEc.experiment.id}.log",
+        "#{File.expand_path(global_options[:log_file_dir])}/#{OmfEc.experiment.id}.log",
         :layout => Logging.layouts.pattern(:date_pattern => '%F %T %z',
                                            :pattern => '[%d] %-5l %c: %m\n')))
   end
+
+  OmfCommon.load_logging_config(global_options[:log_config])
 end
 
 def load_exp(exp_path, global_options = {} , options = {}, properties = {})
   begin
-    if global_options[:cert] && File.exist?(global_options[:cert]) &&
-      global_options[:key] && File.exist?(global_options[:key])
+    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(global_options[:cert]),
-                                                             File.read(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])))
     end
 
     opts = {
@@ -271,18 +277,22 @@ def load_exp(exp_path, global_options = {} , options = {}, properties = {})
     opts[:communication][:auth] = {} if entity
 
     OmfCommon.init(:development, opts) do |el|
+
       setup_logging(global_options)
 
       OmfCommon.comm.on_connected do |comm|
+        info "OMF Experiment Controller #{OmfEc::VERSION}"
         info "Connected using #{comm.conn_info}"
-        info "Start experiment: #{OmfEc.experiment.id}"
+        info "Execute: #{exp_path}"
+        info "Properties: #{OmfEc.experiment.cmdline_properties}"
 
-        OmfCommon::Auth::CertificateStore.instance.register_default_certs(global_options[:root_cert_dir]) if global_options[:root_cert_dir]
+        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
 
         begin
           include OmfEc::Backward::DefaultEvents
           load exp_path
+          OmfEc::Experiment.start
         rescue => e
           error e.message
           error e.backtrace.join("\n")

data/lib/omf_ec/backward/default_events.rb

@@ -11,19 +11,22 @@ module OmfEc
         def included(base)
           base.instance_eval do
 
-            def_event :ALL_UP do |state|
+            def_event :ALL_NODES_UP do |state|
               all_groups? do |g|
-                plan = g.members.uniq.sort
-                actual = state.find_all { |v| v.joined?(g.id) }.map { |v| v[:address] }.sort
+                plan = g.members.values.uniq.sort
+                actual = state.find_all { |v| v.joined?(g.address) }.map { |v| v[:address] }.sort
 
-                debug "Planned: #{g.name}(#{g.id}): #{plan}"
-                debug "Actual: #{g.name}(#{g.id}): #{actual}"
+                debug "Planned: #{g.name}(#{g.address}): #{plan}"
+                debug "Actual: #{g.name}(#{g.address}): #{actual}"
 
-                plan == actual
+                if plan.empty? && actual.empty?
+                  warn "Group '#{g.name}' is empty"
+                end
+                plan.empty? ? true : plan == actual
               end
             end
 
-            on_event :ALL_UP do
+            on_event :ALL_NODES_UP do
               all_groups do |group|
                 # Deal with brilliant net.w0.ip syntax...
                 group.net_ifs && group.net_ifs.each do |nif|
@@ -49,26 +52,37 @@ module OmfEc
               end
             end
 
+            def_event :ALL_UP do |state|
+              all_groups? do |g|
+                app_plan = g.app_contexts.size * g.members.values.uniq.size
+                app_actual = state.count { |v| v.joined?(g.address("application")) }
+                if_plan = g.net_ifs.map { |v| v.conf[:if_name] }.uniq.size * g.members.values.uniq.size
+                if_actual = state.count { |v| v.joined?(g.address("wlan"), g.address("net")) }
+
+                if_plan == if_actual && app_plan == app_actual
+              end
+            end
+
             def_event :ALL_INTERFACE_UP do |state|
               all_groups? do |g|
-                plan = g.net_ifs.map { |v| v.conf[:if_name] }.uniq.size * g.members.uniq.size
-                actual = state.count { |v| v.joined?("#{g.id}_wlan", "#{g.id}_net") }
+                plan = g.net_ifs.map { |v| v.conf[:if_name] }.uniq.size * g.members.values.uniq.size
+                actual = state.count { |v| v.joined?(g.address("wlan"), g.address("net")) }
                 plan == actual
               end
             end
 
             def_event :ALL_UP_AND_INSTALLED do |state|
               all_groups? do |g|
-                plan = g.app_contexts.size * g.members.uniq.size
-                actual = state.count { |v| v.joined?("#{g.id}_application") }
+                plan = g.app_contexts.size * g.members.values.uniq.size
+                actual = state.count { |v| v.joined?(g.address("application")) }
                 plan == actual
               end
             end
 
             def_event :ALL_APPS_DONE do |state|
               all_groups? do |g|
-                plan = (g.execs.size + g.app_contexts.size) * g.members.uniq.size
-                actual = state.count { |v| v.joined?("#{g.id}_application") && v[:event] == 'EXIT' }
+                plan = (g.execs.size + g.app_contexts.size) * g.members.values.uniq.size
+                actual = state.count { |v| v.joined?(g.address("application")) && v[:event] == 'EXIT' }
                 plan == 0 ? false : plan == actual
               end
             end
@@ -76,7 +90,6 @@ module OmfEc
           end
         end
       end
-
     end
   end
 end

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

@@ -23,9 +23,9 @@ def create_app(testbed)
               end
             end
           when 'WARN'
-            warn m[:reason]
+            warn m[:reason], m.src
           when 'ERROR'
-            error m[:reason]
+            error m[:reason], m.src
           end
         end
       end

data/lib/omf_ec/backward/group.rb

@@ -25,10 +25,10 @@ module OmfEc
         e_uid = SecureRandom.uuid
         e_name = "#{self.name}_application_#{name}_created_#{e_uid}"
 
-        resource_group_name = "#{self.id}_application"
+        resource_group_name = self.address("application")
 
         def_event e_name do |state|
-          state.find_all { |v| v[:hrn] == name && v[:membership] && v[:membership].include?(resource_group_name)}.size >= self.members.uniq.size
+          state.find_all { |v| v[:hrn] == name && v[:membership] && v[:membership].include?(resource_group_name)}.size >= self.members.values.sort.uniq.size
         end
 
         on_event e_name do

data/lib/omf_ec/context/group_context.rb

@@ -65,6 +65,16 @@ module OmfEc::Context
         topic = self.group.topic
       end
 
+      if topic.nil?
+        if self.guard[:type]
+          warn "Group '#{self.group.name}' has NO resources of type '#{self.guard[:type]}' ready. Could not send message."
+        else
+          warn "Group topic '#{self.group.name}' NOT subscribed. Could not send message."
+        end
+        return
+      end
+
+
       case self.operation
       when :configure
         topic.configure({ name => value }, { guard: self.guard })

data/lib/omf_ec/experiment.rb

@@ -79,7 +79,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(&:id).join(', '))
+              res.configure(membership: planned_groups.map(&:address).join(', '))
             end
           end
         end
@@ -91,7 +91,7 @@ module OmfEc
     # Find all groups a given resource belongs to
     #
     def groups_by_res(res_addr)
-      groups.find_all { |g| g.members.include?(res_addr) }
+      groups.find_all { |g| g.members.values.include?(res_addr) }
     end
 
     def sub_group(name)
@@ -164,22 +164,38 @@ module OmfEc
     class << self
       # Disconnect communicator, try to delete any XMPP affiliations
       def done
-        info "Exit in up to 15 seconds..."
-
-        OmfCommon.eventloop.after(10) do
-          info "Release applications and network interfaces"
+        info "Experiment: #{OmfEc.experiment.id} finished"
+        info "Release applications and network interfaces"
+        info "Exit in 15 seconds..."
 
+        OmfCommon.el.after(10) do
           allGroups do |g|
-            g.resources[type: 'application'].release
+            g.resources[type: 'application'].release unless g.app_contexts.empty?
             g.resources[type: 'net'].release unless g.net_ifs.find_all { |v| v.conf[:type] == 'net' }.empty?
             g.resources[type: 'wlan'].release unless g.net_ifs.find_all { |v| v.conf[:type] == 'wlan' }.empty?
           end
 
-          OmfCommon.eventloop.after(5) do
+          OmfCommon.el.after(5) do
             OmfCommon.comm.disconnect
           end
         end
       end
+
+      def start
+        info "Experiment: #{OmfEc.experiment.id} starts"
+
+        allGroups do |g|
+          g.members.each do |key, value|
+            OmfEc.subscribe_and_monitor(key) do |res|
+              info "Configure '#{key}' to join '#{g.name}'"
+              g.synchronize do
+                g.members[key] = res.address
+              end
+              res.configure(membership: g.address)
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/omf_ec/group.rb

@@ -30,7 +30,7 @@ module OmfEc
       self.id = @opts[:unique] ? SecureRandom.uuid : self.name
       # Add empty holders for members, network interfaces, and apps
       self.net_ifs = []
-      self.members = []
+      self.members = {}
       self.app_contexts = []
       self.execs = []
 
@@ -39,6 +39,11 @@ module OmfEc
       OmfEc.subscribe_and_monitor(id, self, &block)
     end
 
+    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]}"
+    end
+
     def associate_topic(topic)
       self.synchronize do
         @topic = topic
@@ -59,24 +64,19 @@ module OmfEc
     #
     # Resources to be added could be a list of resources, groups, or the mixture of both.
     def add_resource(*names)
-      self.synchronize do
+      synchronize do
         # Recording membership first, used for ALL_UP event
         names.each do |name|
-          g = OmfEc.experiment.group(name)
-          if g # resource to add is a group
-            @members += g.members
-            self.add_resource(*g.members.uniq)
+          if (g = OmfEc.experiment.group(name))# resource to add is a group
+            @members.merge!(g.members)
           else
-            OmfEc.subscribe_and_monitor(name) do |res|
-              @members << res.address
-              info "Config #{name} to join #{self.name}"
-              res.configure(membership: self.id)
-            end
+            @members[name] = nil
           end
         end
       end
     end
 
+
     # Create a set of new resources and add them to the group
     #
     # @param [String] name
@@ -93,7 +93,8 @@ module OmfEc
         end
 
         # Naming convention of child resource group
-        resource_group_name = "#{self.id}_#{opts[:type].to_s}"
+        #resource_group_name = "#{self.id}_#{opts[:type].to_s}"
+        resource_group_name = self.address(opts[:type])
 
         OmfEc.subscribe_and_monitor(resource_group_name) do |res_group|
           associate_resource_topic(opts[:type].to_s, res_group)

data/lib/omf_ec/version.rb

@@ -4,5 +4,5 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
 module OmfEc
-  VERSION = "6.0.3"
+  VERSION = "6.0.4.pre.1"
 end

data/lib/omf_ec.rb

@@ -38,25 +38,25 @@ module OmfEc
       topic.on_inform do |msg|
         case msg.itype
         when 'CREATION.FAILED'
-          warn "RC reports creation.failed: '#{msg[:reason]}'"
-          debug msg
+          warn "RC reports creation.failed: '#{msg[:reason]}'", msg.src
+          debug msg, msg.src
         when 'ERROR'
-          warn "RC reports error: '#{msg[:reason]}'"
-          debug msg
+          warn "RC reports error: '#{msg[:reason]}'", msg.src
+          debug msg, msg.src
         when 'WARN'
-          warn "RC reports warning: '#{msg[:reason]}'"
-          debug msg
+          warn "RC reports warning: '#{msg[:reason]}'", msg.src
+          debug msg, msg.src
         when 'CREATION.OK'
+          debug "Resource #{msg[:res_id]} #{msg.resource.address} created"
           debug "Received CREATION.OK via #{topic.id}"
-          info "Resource #{msg[:res_id]} #{msg.resource.address} created"
+          debug msg, msg.src
 
           OmfEc.experiment.add_or_update_resource_state(msg.resource.address, msg.properties)
-
           OmfEc.experiment.process_events
         when 'STATUS'
           props = []
           msg.each_property { |k, v| props << "#{k}: #{v}" }
-          debug "#{topic.id} >> inform: #{props.join(", ")}"
+          debug "Received INFORM via #{topic.id} >> #{props.join(", ")}", msg.src
 
           if msg[:status_type] == 'APP_EVENT'
             info "APP_EVENT #{msg[:event]} from app #{msg[:app]} - msg: #{msg[:msg]}"
@@ -76,7 +76,7 @@ module OmfEc
           if topic.error?
             error "Failed to subscribe #{topic_id}"
           else
-            info "Subscribed to #{topic_id}"
+            debug "Subscribed to #{topic_id}"
             context_obj.associate_topic(topic) if context_obj
             block.call(context_obj || topic) if block
             register_default_callback(topic)

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.2"
+  s.add_runtime_dependency "omf_common", "~> 6.0.4.pre.1"
   s.add_runtime_dependency "gli", "~> 2.5.3"
 end

data/test/omf_ec/group_spec.rb

@@ -9,10 +9,12 @@ require 'omf_ec/group'
 describe OmfEc::Group do
   before do
     OmfEc.stubs(:subscribe_and_monitor)
+    OmfEc::Group.any_instance.stubs(:address).returns("xmpp://g@bob.com")
   end
 
   after do
     OmfEc.unstub(:subscribe_and_monitor)
+    OmfEc::Group.any_instance.unstub(:address)
   end
 
   describe "when initialised" do
@@ -31,10 +33,10 @@ describe OmfEc::Group do
       @g_b = OmfEc::Group.new('g_b', unique: false)
     end
 
-    it "must init default context related arrasy" do
-      @group.net_ifs.must_equal []
-      @group.members.must_equal []
-      @group.app_contexts.must_equal []
+    it "must init default context related variables" do
+      @group.net_ifs.must_equal([])
+      @group.members.must_equal({})
+      @group.app_contexts.must_equal([])
     end
 
     it "must be capable of adding existing resources to group" do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.3
-  prerelease: 
+  version: 6.0.4.pre.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,23 +83,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.4.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.4.pre.1
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -173,29 +158,25 @@ 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: '0'
-      segments:
-      - 0
-      hash: -4558190109347079441
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OMF experiment controller
 test_files: []