omf_rc 6.0.8.pre.2 → 6.0.8.pre.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWRjNDNiYzBkM2RiMTMzMGEzZjZlZGMyM2JmYmVlYWE3MmQ1YWZkNQ==
-  data.tar.gz: !binary |-
-    NWJiMTRmYzA1ODVhYzMwZGEyNzUxZmQwMDc4YzA5ZTkwY2I5MmEwMg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODI4YWUzNzdlZjFmM2VlNDc0MjU5ZjcxMWMzZGM5ZTBhNGU1OGU1MzRhZjVl
-    NDU3ZGRjZjM5MzQ1NjQzN2RiY2E3NjU0NzRmZGNjZjVkYjQ3ZTA3Y2FjMTdm
-    YTY0MjdjZjQ0ZTQzOGU2OTk1YzMzYTdjYTdhY2NjN2JmMWRmOGM=
-  data.tar.gz: !binary |-
-    YzdiYjNjMmUyMzdkYmQwMDIwODM3YmNjMDRiOTc0MTU1MWE2YzhjZDU3Nzgy
-    MGM2MDM2Mjk1YmQxYWZjMDQ0NGExMDlmZjRiYjU0MDVjMzI1OGFkOWM5NWJk
-    MzU5MTJkODU1NTQ1NGIwMGI5ZjBkY2EwNWU3MmUwNTk1MTE3ZmM=
+SHA1:
+  metadata.gz: 5a92080ab8ac073244c065f60d87806a27fc685b
+  data.tar.gz: a8948f02267a30d879352a6dc03181137764d92e
+SHA512:
+  metadata.gz: 8f1dd69b9f12dfb89a45456da944ef20825f8e35eb2647fe368243fc9454d54149ee8aaa7d60ceb1ab59d8b371c78d3583a0535350cfd16c5980df87d08c6286
+  data.tar.gz: 458b124483db9d371d4850064058e2c95bbfbe42cd6c146ad36bec6e9808968cea0f072682d1b1327b35ee28a2fabe2b7e5ebfeb547b22060353195093404193

data/bin/omf_rc

@@ -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 Resource 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"
 
 # The following is to work around a bug in activesupport triggered by

data/config/config_with_authentication.yml.example

@@ -2,12 +2,17 @@
 # default topic name is this machine's hostname
 # default xmpp user name/password is "hostname-pid"
 # this is to ensure that every RC has its own topic and XMPP account
-:uid: <%= Socket.gethostname %>
-:uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@localhost
-:environment: production
-:debug: false
+uid: <%= Socket.gethostname %>
+uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@localhost
+environment: production
+debug: false
+
+credentials:
+  root_cert_dir: /path_to_folder_contains_root_certs
+  entity_cert: /path_to_cert_used_by_this_rc
+  entity_key: /path_to_private_key_used_by_this_rc
+
+communication:
+  auth:
+    authenticate: true
 
-:auth:
-  :root_cert_dir: /path_to_folder_contains_root_certs
-  :entity_cert: /path_to_cert_used_by_this_rc
-  :entity_key: /path_to_private_key_used_by_this_rc

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -106,6 +106,7 @@ class OmfRc::ResourceProxy::AbstractResource
     @uid = (@opts.delete(:uid) || SecureRandom.uuid).to_s
     @hrn = @opts.delete(:hrn)
     @hrn = @hrn.to_s if @hrn
+    @node_index = nil
 
     @children = []
     @membership = []
@@ -118,7 +119,8 @@ class OmfRc::ResourceProxy::AbstractResource
 
       if t.error?
         warn "Could not create topic '#{uid}', will shutdown, trying to clean up old topics. Please start it again once it has been shutdown."
-        OmfCommon.comm.disconnect()
+        OmfCommon.comm.disconnect
+        OmfCommon.eventloop.stop
       else
         begin
           # Setup authentication related properties
@@ -341,18 +343,34 @@ class OmfRc::ResourceProxy::AbstractResource
 
   # Make resource part of the group topic, it will overwrite existing membership array
   #
-  # @param [String|Array] args name of group topic/topics
+  # @param [String|Array|Hash] args name of group topic/topics
+  #
+  # @example Explaining argument values
+  #
+  #   # Join a single group
+  #   "group_1"
+  #
+  #   # Join multiple group
+  #   ["group_1", "group_2"]
+  #
+  #   # Leave a single group or multiple groups
+  #   { leave: ["group_1", "group_2"] } or { leave: "group_1" }
   def configure_membership(*args)
-    new_membership = [args[0]].flatten
+    case args[0]
+    when Symbol, String, Array
+      new_membership = [args[0]].flatten.compact
+    when Hash
+      leave_membership = [args[0][:leave]].flatten.compact
+    end
 
-    new_membership.each do |new_m|
+    new_membership && new_membership.each do |new_m|
       unless @membership.include?(new_m)
         OmfCommon.comm.subscribe(new_m) do |t|
           if t.error?
             warn "Group #{new_m} disappeared"
-            #EM.next_tick do
-            #  @membership.delete(m)
-            #end
+            self.synchronize do
+              @membership.delete(m)
+            end
           else
             self.synchronize do
               @membership << new_m
@@ -367,9 +385,29 @@ class OmfRc::ResourceProxy::AbstractResource
         end
       end
     end
+
+    leave_membership && leave_membership.each do |leave_m|
+      if (leave_m_topic = @membership_topics[leave_m])
+        self.synchronize do
+          leave_m_topic.unsubscribe(leave_m)
+          @membership.delete(leave_m)
+          @membership_topics.delete_if { |k, v| k == leave_m }
+        end
+      end
+    end
+
     @membership
   end
 
+  # Set the node index, overwriting any previous index
+  # The index is a unique integer for each node in an experiment
+  # It's used e.g. to give each node an IP address such as x.x.x.node_index
+  #
+  # @param [String|Array] args name of group topic/topics
+  def configure_node_index(index)
+    @node_index = index
+  end
+
   # @!endgroup
 
   # Parse omf message and execute as instructed by the message

data/lib/omf_rc/runner.rb

@@ -21,7 +21,7 @@ module OmfRc
   class Runner
     include Hashie
 
-    attr_accessor :gopts, :copts, :def_opts
+    attr_accessor :gopts, :copts, :def_opts, :node_index
     attr_accessor :opts
 
     def initialize()
@@ -66,6 +66,7 @@ module OmfRc
           # TODO: Should release resources first
           info "Stopping ..."
           OmfCommon.comm.disconnect
+          OmfCommon.eventloop.stop
         end
 
         # Load extensions

data/test/omf_rc/resource_proxy/abstract_resource_spec.rb

@@ -84,7 +84,17 @@ describe AbstractResource do
 
     it "must be able to configure membership (join group)" do
       @parent.configure_membership(:test_group)
+      @parent.configure_membership([:test_group, 'test_group_2'])
       @parent.request_membership.must_include :test_group
+      @parent.request_membership.must_include 'test_group_2'
+    end
+
+    it "must be able to configure membership (leave group)" do
+      @parent.configure_membership([:test_group, 'test_group_2'])
+      @parent.configure_membership({ leave: [:test_group] })
+      @parent.request_membership.must_equal ['test_group_2']
+      @parent.configure_membership({ leave: [:test_group, 'test_group_2'] })
+      @parent.request_membership.must_equal []
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 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,28 +42,28 @@ dependencies:
   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: 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
@@ -72,14 +72,14 @@ 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: cocaine
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
   name: mocha
   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: Resource controller of OMF, a generic framework for controlling and managing
@@ -199,12 +199,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: []