omf_ec 6.0.8.pre.2 → 6.0.8.pre.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWEyOGNkMWYxODcyY2Q0MDUxN2QxYWNhMWMyZTYyNWNiMzdlZGYzOA==
-  data.tar.gz: !binary |-
-    NWQ4MzQ5NjY2MWYxNGVjZTMzZWFmNzliY2ViNjAzMmYwMzlkZWRkZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Y2MzYmFjMmM3MDZmNWQ4OTk4Y2JlYTYwYWFiOGQ3ODk5YzUzNzhiZGIxMjIx
-    ZWNhODM0MmFjMmU3ZTNhMmM3ZTY3YzNhYTVjZjdkMWQ5MGYzYzdlN2NhMGM4
-    NWNkOGZlZWM3ZWZmM2ZlYTk5MTEzNmRhOWIwYmZmODMwMjk0YzU=
-  data.tar.gz: !binary |-
-    ZmE5N2VkOWJmM2Y5NzExOGVmN2M0YzFlY2FkN2E5ZTVmMTUzNjMyMzJkNmYx
-    YWIxM2JhOTZhNDAzZjhlOTc0MGYzNzBlMGQ0ZjE5ZTZlM2MzOWMxYzNhYzdj
-    N2MyOWEzMGVhMmRhNGFjMzRlY2Q5ZWYxZDk4NWI3OGY1ZTg4MDE=
+SHA1:
+  metadata.gz: 27b8a5ddbab771c9bcb2e4caee6b85d5465859e0
+  data.tar.gz: e137a54683156ee2a6954f59fb5d960d8787de65
+SHA512:
+  metadata.gz: ed8149aa66a20c06cdebdacc26357c887a72421cf2eeae36940cf33c978a676e672c8d09129897c23c53f720221bb21ac57cd43279c00d0a1c497cf421bf725d
+  data.tar.gz: b2008ae56fc0195b315d575a946725ec41a444c9f788d6e23e50750d0fd7bb303763c0c89af1e4f3489f22ecebe6a47f113c239199cf6f6ac2537d590e02c7f1

data/bin/omf_ec

@@ -1,5 +1,11 @@
 #!/usr/bin/env ruby
 
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# 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.
+
+puts "OMF Experiment Controller - Copyright (c) 2012-13 National ICT Australia Limited (NICTA)"
 abort "Please use Ruby 1.9.3 or higher" if RUBY_VERSION < "1.9.3"
 
 require 'gli'

data/lib/omf_ec/backward/default_events.rb

@@ -11,7 +11,7 @@ module OmfEc
         def included(base)
           base.instance_eval do
 
-            def_event :ALL_NODES_UP do |state|
+            def all_nodes_up?(state)
               all_groups? do |g|
                 plan = g.members.values.uniq.sort
                 actual = state.find_all { |v| v.joined?(g.address) }.map { |v| v[:address].to_s }.sort
@@ -27,7 +27,23 @@ module OmfEc
               end
             end
 
-            on_event :ALL_NODES_UP do
+            def all_interfaces_ready?(state)
+              all_groups? do |g|
+                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 == 0 ? false : plan == actual
+              end
+            end
+
+            def all_apps_ready?(state)
+              all_groups? do |g|
+                plan = g.app_contexts.size * g.members.values.uniq.size
+                actual = state.count { |v| v.joined?(g.address("application")) }
+                plan == 0 ? false : plan == actual
+              end
+            end
+
+            def all_nodes_up_cbk
               all_groups do |group|
                 # Deal with brilliant net.w0.ip syntax...
                 group.net_ifs && group.net_ifs.each do |nif|
@@ -53,34 +69,30 @@ 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")) }
+            def_event :ALL_NODES_UP do |state|
+              all_nodes_up?(state)
+            end
 
-                if_plan == if_actual && app_plan == app_actual
-              end
+            alias_event :ALL_UP, :ALL_NODES_UP
+
+            on_event :ALL_NODES_UP do
+              all_nodes_up_cbk
+            end
+
+            def_event :ALL_RESOURCE_UP do |state|
+              all_nodes_up?(state) && all_interfaces_ready?(state) && all_apps_ready?(state)
             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.values.uniq.size
-                actual = state.count { |v| v.joined?(g.address("wlan"), g.address("net")) }
-                plan == actual
-              end
+              all_nodes_up?(state) &&  all_interfaces_ready?(state)
             end
 
             def_event :ALL_UP_AND_INSTALLED do |state|
-              all_groups? do |g|
-                plan = g.app_contexts.size * g.members.values.uniq.size
-                actual = state.count { |v| v.joined?(g.address("application")) }
-                plan == actual
-              end
+              all_nodes_up?(state) && all_apps_ready?(state)
             end
 
             def_event :ALL_APPS_DONE do |state|
+              all_nodes_up?(state) &&
               all_groups? do |g|
                 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' }

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

@@ -15,7 +15,7 @@ def create_app(testbed)
           case m.itype
           when 'STATUS'
             if m[:status_type] == 'APP_EVENT'
-              after(2) { OmfCommon.comm.disconnect } if m[:event] =~ /EXIT/
+              after(2) { OmfCommon.comm.disconnect ; OmfCommon.eventloop.stop } if m[:event] =~ /EXIT/
               info m[:msg] if m[:msg]
             else
               m.each_property do |k, v|

data/lib/omf_ec/dsl.rb

@@ -162,10 +162,18 @@ module OmfEc
       OmfEc.experiment.add_event(name, trigger)
     end
 
+    # Create an alias name of an event
+    def alias_event(new_name, name)
+      unless (event = OmfEc.experiment.event(name))
+        raise RuntimeError, "Can not create alias for Event '#{name}' which is not defined"
+      else
+        event[:aliases] << new_name
+      end
+    end
+
     # Define an event callback
     def on_event(name, consume_event = true, &callback)
-      event = OmfEc.experiment.event(name)
-      if event.nil?
+      unless (event = OmfEc.experiment.event(name))
         raise RuntimeError, "Event '#{name}' not defined"
       else
         event[:callbacks] ||= []

data/lib/omf_ec/experiment.rb

@@ -15,14 +15,15 @@ module OmfEc
 
     include MonitorMixin
 
-    attr_accessor :name, :oml_uri, :app_definitions, :property, :cmdline_properties, :show_graph
+    attr_accessor :name, :oml_uri, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes
     attr_reader :groups, :sub_groups, :state
 
     def initialize
       super
-      @id = Time.now.utc.iso8601
+      @id = Time.now.utc.iso8601(3)
       @state ||= [] #TODO: we need to keep history of all the events and not ovewrite them
       @groups ||= []
+      @nodes ||= []
       @events ||= []
       @app_definitions ||= Hash.new
       @sub_groups ||= []
@@ -80,7 +81,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).join(', '))
+              res.configure(membership: planned_groups.map(&:address))
             end
           end
         end
@@ -129,13 +130,13 @@ module OmfEc
     end
 
     def event(name)
-      @events.find { |v| v[:name] == name }
+      @events.find { |v| v[:name] == name || v[:aliases].include?(name) }
     end
 
     def add_event(name, trigger)
       self.synchronize do
         raise RuntimeError, "Event '#{name}' has already been defined" if event(name)
-        @events << { name: name, trigger: trigger }
+        @events << { name: name, trigger: trigger, aliases: [] }
       end
     end
 
@@ -150,7 +151,8 @@ module OmfEc
         @events.find_all { |v| v[:callbacks] && !v[:callbacks].empty? }.each do |event|
           if event[:trigger].call(@state)
             @events.delete(event) if event[:consume_event]
-            info "Event triggered: '#{event[:name]}'"
+            event_names = ([event[:name]] + event[:aliases]).join(', ')
+            info "Event triggered: '#{event_names}'"
 
             # Last in first serve callbacks
             event[:callbacks].reverse.each do |callback|
@@ -186,10 +188,20 @@ module OmfEc
 
           OmfCommon.el.after(5) do
             OmfCommon.comm.disconnect
+            OmfCommon.eventloop.stop
           end
         end
       end
 
+      def disconnect
+        info "Disconnecting in 5 sec from experiment: #{OmfEc.experiment.id}"
+        info "Run the EC again to reattach"
+        OmfCommon.el.after(5) do
+          OmfCommon.comm.disconnect
+          OmfCommon.eventloop.stop
+        end
+      end
+
       def start
         info "Experiment: #{OmfEc.experiment.id} starts"
 
@@ -200,11 +212,19 @@ module OmfEc
               g.synchronize do
                 g.members[key] = res.address
               end
-              res.configure(membership: g.address)
+              res.configure(membership: g.address, :node_index => OmfEc.experiment.nodes.index(key))
             end
           end
         end
       end
+
+      # Ask the resources which joined the groups I created to leave
+      #
+      def leave_memberships
+        all_groups do |g|
+          g.resources.membership = { leave: g.address }
+        end
+      end
     end
   end
 end

data/lib/omf_ec/group.rb

@@ -22,12 +22,10 @@ module OmfEc
 
     # @param [String] name name of the group
     # @param [Hash] opts
-    # @option opts [Boolean] :unique Should the group be unique or not, default is true
     def initialize(name, opts = {}, &block)
       super()
-      @opts = {unique: true}.merge!(opts)
       self.name = name
-      self.id = @opts[:unique] ? SecureRandom.uuid : self.name
+      self.id = "#{OmfEc.experiment.id}.#{self.name}"
       # Add empty holders for members, network interfaces, and apps
       self.net_ifs = []
       self.members = {}
@@ -41,7 +39,7 @@ module OmfEc
 
     def address(suffix = nil)
       t_id = suffix ? "#{self.id}_#{suffix.to_s}" : self.id
-      OmfCommon.comm.string_to_address(t_id)
+      OmfCommon.comm.string_to_topic_address(t_id)
     end
 
     def associate_topic(topic)
@@ -70,6 +68,7 @@ module OmfEc
           if (g = OmfEc.experiment.group(name))# resource to add is a group
             @members.merge!(g.members)
           else
+            OmfEc.experiment.nodes << name unless OmfEc.experiment.nodes.include?(name)
             @members[name] = nil
           end
         end

data/test/omf_ec/group_spec.rb

@@ -17,20 +17,10 @@ describe OmfEc::Group do
     OmfEc::Group.any_instance.unstub(:address)
   end
 
-  describe "when initialised" do
-    it "must be generate unique id if :unique option is on" do
-      OmfEc::Group.new('bob').id.wont_equal 'bob'
-    end
-
-    it "must use name as id if :unique option is off" do
-      OmfEc::Group.new('bob', unique: false).id.must_equal 'bob'
-    end
-  end
-
   describe "when used to represent group resource" do
     before do
-      @group = OmfEc::Group.new('bob', unique: false)
-      @g_b = OmfEc::Group.new('g_b', unique: false)
+      @group = OmfEc::Group.new('bob')
+      @g_b = OmfEc::Group.new('g_b')
     end
 
     it "must init default context related variables" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.8.pre.2
+  version: 6.0.8.pre.3
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-20 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,40 +86,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.8.pre.2
+        version: 6.0.8.pre.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.8.pre.2
+        version: 6.0.8.pre.3
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Experiment controller of OMF, a generic framework for controlling and
@@ -181,12 +181,12 @@ 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: 1.3.1
 requirements: []