omf_rc 6.1.9.pre.3 → 6.1.9

data/lib/omf_rc/resource_proxy/node.rb

@@ -85,6 +85,7 @@ module OmfRc::ResourceProxy::Node
   # referenced in that file. The result is sent to an OML database.
   hook :before_ready do |res|
     next if res.defaults(:topo_file).nil? || res.defaults(:topo_file).empty?
-    check_topology(res.uid, res.defaults(:topo_file))    
+    timeout = res.defaults(:topo_check_timeout) || 600
+    check_topology(res.uid, res.defaults(:topo_file), timeout)
   end
 end

data/lib/omf_rc/runner.rb

@@ -142,8 +142,9 @@ module OmfRc
         end
 
         @opts.merge!(@gopts)
-
-        @omlopts.merge(@opts[:instrumentation] || {}) { |k, v1, v2| v1 } # merge in place as OML may hold @omlopts
+        # Merge in place as OML may hold @omlopts
+        in_place_oml_opts = (@opts[:oml] || @opts[:instrumentation] || Mash.new).to_hash(symbolize_keys: true)
+        @omlopts.merge!(in_place_oml_opts)
       end
     end
 

data/lib/omf_rc/util/topology.rb

@@ -14,13 +14,13 @@ module OmfRc::Util::Topology
   # This MP is reporting if a 'to' host is reachable from a 'from' host
   class OmfRc::Util::Topology::MPEdges < OML4R::MPBase
     name :edges
-    param :timestamp, :type => :double # Time (s) 
+    param :timestamp, :type => :double # Time (s)
     param :from, :type => :string # ID/Name for this Resource Proxy
     param :to, :type => :string # Address/Name of remote host
     param :reachable, :type => :string # Is the remote host reachable?
   end
 
-  # Check if a list of hosts from a local file are reachable from the host 
+  # Check if a list of hosts from a local file are reachable from the host
   # running this Node Proxy. The input topology file must simply contain one
   # line per host, i.e. its IP address of hostname.
   # The results of this check are send to the OML server and database set
@@ -29,13 +29,18 @@ module OmfRc::Util::Topology
   # @yieldparam [Object] from the id or name of this Node Proxy
   # @yieldparam [Object] topo_path the file with the host addresses
   #
-  work :check_topology do |res,from,topo_path|
-    info "Checking topology from file: '#{topo_path}'"
-    File.foreach(topo_path) do |v| 
-      target = v.chomp
-      reachable = `ping -c 1 #{target}`.include?('bytes from')
-      info "Checked link to #{target}: #{reachable}" 
-      OmfRc::Util::Topology::MPEdges.inject(Time.now.to_i, from, target, reachable)
+  work :check_topology do |res, from, topo_path, timeout|
+    timeout ||= 600 # Stop checking after 10 minutes
+    t = OmfCommon.el.every(10) do
+      info "Checking topology from file: '#{topo_path}'"
+      File.foreach(topo_path) do |v|
+        target = v.chomp
+        reachable = `ping -c 1 #{target}`.include?('bytes from')
+        info "Checked link to #{target}: #{reachable}"
+        OmfRc::Util::Topology::MPEdges.inject(Time.now.to_i, from, target, reachable)
+      end
     end
+
+    OmfCommon.el.after(timeout) { t.cancel }
   end
 end

metadata

@@ -1,111 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.1.9.pre.3
+  version: 6.1.9
+  prerelease: 
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   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: 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: mocha
   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
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.9.pre.3
+        version: 6.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.9.pre.3
+        version: 6.1.9
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Resource controller of OMF, a generic framework for controlling and managing
@@ -197,54 +212,29 @@ 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: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3715069632668391664
 requirements: []
 rubyforge_project: omf_rc
-rubygems_version: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OMF resource controller
-test_files:
-- test/fixture/ip/addr_show
-- test/fixture/iw/help
-- test/fixture/iw/info
-- test/fixture/iw/link
-- test/fixture/lsmod
-- test/fixture/omf_rc.simple.yml
-- test/fixture/omf_rc.yml
-- test/fixture/oml.hash
-- test/fixture/oml.spec
-- test/fixture/oml.xml
-- test/fixture/sys/class/ieee80211/phy0/device/uevent
-- test/fixture/sys/class/ieee80211/phy0/uevent
-- test/fixture/sys/class/net/eth0/device/uevent
-- test/fixture/sys/class/net/eth0/uevent
-- test/fixture/sys/class/net/wlan0/device/uevent
-- test/fixture/sys/class/net/wlan0/uevent
-- test/omf_rc/message_process_error_spec.rb
-- test/omf_rc/resource_factory_spec.rb
-- test/omf_rc/resource_proxy/abstract_resource_spec.rb
-- test/omf_rc/resource_proxy/application_spec.rb
-- test/omf_rc/resource_proxy/node_spec.rb
-- test/omf_rc/resource_proxy_dsl_spec.rb
-- test/omf_rc/runner_spec.rb
-- test/omf_rc/util/common_tools_spec.rb
-- test/omf_rc/util/fact_spec.rb
-- test/omf_rc/util/ip_spec.rb
-- test/omf_rc/util/iw_spec.rb
-- test/omf_rc/util/mod_spec.rb
-- test/test_helper.rb
+test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 40a379ccf3e96a718c8ed4ea8a8b65e14edc2d82
-  data.tar.gz: 3bd5b1e9b8f98b6bf53980b71dcc9a41e3fcdeac
-SHA512:
-  metadata.gz: 95d40bf71325da5f8c74a0ebcb2fe3c99022ee5b37533cef23713db32ed15b06a0e64fcff6e40f2e22b03cca299c6e44716f8a7c6b5235b5ee4313f258b2c626
-  data.tar.gz: 05ac257e1e5b88172d13fa7fe3244bd590f8b5e58a6f2fa92cd44882524d4bd1a0642c34c3835c56a5c1ba2180183ace15988159616c9cb882a8cf2effb19bc5