omf_rc 6.1.2.pre.5 → 6.1.2.pre.6

data/config/config_node_topo_check.yml.example

@@ -0,0 +1,21 @@
+---
+uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@localhost
+environment: development
+debug: false
+
+resources:
+  - type: node
+    uid: <%= Socket.gethostname %>
+
+add_default_factories: false # Not loading default type factories
+
+factories: # Additional resources which can be created by this RC
+  load: [
+    'omf_rc/resource_proxy/node',
+    'omf_rc/resource_proxy/net',
+    'omf_rc/resource_proxy/wlan',
+    'omf_rc/resource_proxy/application'
+  ]
+  defaults:
+    node:
+      topo_file: '/etc/topology.txt'

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -79,7 +79,7 @@ class OmfRc::ResourceProxy::AbstractResource
     create_children_resources: true
   }
 
-  @@defaults = {}
+  @@defaults = Hashie::Mash.new
 
   # Set defaults for a particular resource class. Can be retrieved with 'defaults'
   # in the instance.

data/lib/omf_rc/resource_proxy/node.rb

@@ -31,6 +31,7 @@ module OmfRc::ResourceProxy::Node
   # @!parse include OmfRc::Util::Sysfs
   utility :mod
   utility :sysfs
+  utility :topology
 
   # @!macro group_request
   #
@@ -78,4 +79,12 @@ module OmfRc::ResourceProxy::Node
     end
   end
   # @!endgroup
+
+  # If a path to a topology file was given in the config file attribute
+  # 'topo_file', then check the connectivity towards the resources in
+  # 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))    
+  end
 end

data/lib/omf_rc/runner.rb

@@ -21,6 +21,7 @@ module OmfRc
     def initialize()
       @executable_name = File.basename($PROGRAM_NAME)
       @oml_enabled = false
+      @instrument = false
       @gem_version = OmfCommon.version_of('omf_common')
 
       @node_id = Socket.gethostname
@@ -43,7 +44,7 @@ module OmfRc
     def run()
       oml_init() # calls parse_config_files()
 
-      OmfCommon::Measure.enable if @oml_enabled
+      OmfCommon::Measure.enable if @oml_enabled && @instrument
 
       OmfCommon.init(@opts[:environment], @opts.to_hash) do |el|
         # Load a customised logging set up if provided
@@ -165,6 +166,10 @@ module OmfRc
             @gopts[:environment] = e
           end
 
+          op.on("-i", "--instrument", "Turn on self instrumentation, OML parameters must be set!") do
+            @instrument = true
+          end
+
           op.on("-v", "--version", "Show version") do
             puts "OMF Resource Controller version '#{@gem_version}'"
             exit

data/lib/omf_rc/util/topology.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2014 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.
+
+#
+# This module defines a Utility which could be used to check a topology
+# between distributed Resource Proxy.
+#
+module OmfRc::Util::Topology
+  include OmfRc::ResourceProxyDSL
+
+  # OML Measurement Point (MP)
+  # 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 :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 
+  # 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
+  # on the command line of this Resource Controller.
+  #
+  # @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)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.1.2.pre.5
+  version: 6.1.2.pre.6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2.pre.5
+        version: 6.1.2.pre.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2.pre.5
+        version: 6.1.2.pre.6
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - bin/plc_trigger_omf_rc
 - config/config.yml
 - config/config_node.yml.example
+- config/config_node_topo_check.yml.example
 - config/config_with_authentication.yml.example
 - config/config_with_extensions.yml.example
 - config/instageni.yaml
@@ -156,6 +157,7 @@ files:
 - lib/omf_rc/util/package.rb
 - lib/omf_rc/util/platform_tools.rb
 - lib/omf_rc/util/sysfs.rb
+- lib/omf_rc/util/topology.rb
 - lib/omf_rc/util/vmbuilder.rb
 - lib/omf_rc/util/wpa.rb
 - lib/omf_rc/version.rb