omf_rc 6.0.4 → 6.0.4.1

data/bin/omf_rc

@@ -17,14 +17,14 @@ $stdout.sync = true
 
 #
 # Class to start an OMF RC. The configuration parameters can be set
-# in decreasing priority through the command line,  configuration 
-# file and default settings (see @def_opts). 
+# in decreasing priority through the command line,  configuration
+# file and default settings (see @def_opts).
 #
 # For historic reasons and to make this implementation more interesting
 # there are two different config file formats. A 'normal' one inherited from
 # earlier version of OMF, and an 'advanced' one which is identical to the
 # format accepted by OmfCommon.init(). To maintain some level of sanity,
-# only one configuration file is accepted. 
+# only one configuration file is accepted.
 #
 # Having said that, there is one exception and that relates to the 'oml'
 # configuration which is stripped out first and handed to the OML4R library
@@ -36,9 +36,9 @@ class OmfRcRunner
     @executable_name = File.basename($PROGRAM_NAME)
     @oml_enabled = false
     @gem_version = Gem::Specification.find_by_name('omf_rc').version.to_s
-    
+
     @node_id = Socket.gethostname
-    
+
     @def_opts = {
       uid: @node_id,
       uri: "xmpp:#{@node_id}-#{Process.pid}:#{@node_id}-#{Process.pid}@localhost",
@@ -46,40 +46,40 @@ class OmfRcRunner
       debug: false
     }
     @copts = {}
-    
+
     @gopts = {
       config_file: nil,
       adv_config_file: nil,
       logging_configfile: nil,
       environment: nil
     }
-    
+
     @opts = {}
     @omlopts = {appName: @executable_name}
   end
-  
+
   def run()
     setup()
     OmfCommon::Measure.enable if @oml_enabled
-    
+
     OmfCommon.init(@gopts[:environment], @opts) do |el|
       # Load a customised logging set up if provided
       OmfCommon.load_logging_config(@gopts[:logging_configfile]) if @gopts[:logging_configfile]
-    
+
       info "Starting OMF Resource Controller version '#{@gem_version}'"
-      
+
       #el.on_int_signal do # Implementation missing
       Signal.trap("SIGINT") do
         # TODO: Should release resources first
-        info "Stopping ..." 
+        info "Stopping ..."
         el.stop
       end
-    
+
       # Load extensions
       if @opts[:add_default_factories] != false
         OmfRc::ResourceFactory.load_default_resource_proxies
       end
-    
+
       @opts[:factories].each do |f|
         if (req = f[:require])
           begin
@@ -90,15 +90,15 @@ class OmfRcRunner
           end
         end
       end
-      
+
       OmfCommon.comm.on_connected do |comm|
         info "Connected using #{comm.conn_info}"
-    
+
         #if @opts[:auth] && @optss[:auth][:root_cert_dir]
         #  OmfCommon::Auth::CertificateStore.instance.register_default_certs(@opts[:auth][:root_cert_dir])
         #end
         #OmfCommon::Auth::CertificateStore.instance.register(entity) if entity
-    
+
         @opts[:resources].each do |res_opts|
           rtype = res_opts.delete(:type)
           res_creation_opts = res_opts.delete(:creation_opts)
@@ -111,19 +111,19 @@ class OmfRcRunner
             error "#{e.message}\n#{e.backtrace.join("\n")}"
           end
         end
-    
+
       end
     end
     info "Stopping OMF Resource Controller version '#{@gem_version}'"
   end
-  
+
   def setup()
     oml_init() # calls parse_config_files()
     unless @opts[:communication][:url]
       puts "Error: Missing parameters to connect to a PubSub Server (see --help)"
       exit(1)
     end
-    
+
     opts = @opts
     # TODO: This needs to be fixed
     if opts[:auth]
@@ -134,7 +134,7 @@ class OmfRcRunner
     end
     opts[:communication][:auth] = {} if entity
   end
-  
+
   def parse_config_files()
     @opts = {communication: {}, resources: [], factories: [], add_default_factories: true}
     config_file = @gopts[:config_file]
@@ -143,7 +143,7 @@ class OmfRcRunner
       puts "To avoid any unexpected surprises, you should stick to one form of config file"
       exit(1)
     end
-    
+
     if config_file
       cfg_opts =  OmfCommon.load_yaml(config_file, symbolize_keys: true, erb_process: true)
       copts = @def_opts.merge(cfg_opts.merge(@copts))
@@ -156,7 +156,7 @@ class OmfRcRunner
       @gopts[:environment] ||= copts[:environment]
       @omlopts.merge(copts[:oml] || {}) {|k, v1, v2| v1 } # merge in place as OML may hold @omlopts
     end
-    
+
     if adv_config_file
       aopts =  OmfCommon.load_yaml(adv_config_file, symbolize_keys: true, erb_process: true)
       aenv = aopts.delete(:environment)
@@ -166,45 +166,45 @@ class OmfRcRunner
       @omlopts.merge!(@opts.delete(:oml) || {}) {|k, v1, v2| v1 || v2 } # merge in place as OML may hold @omlopts
     end
   end
-  
+
   def oml_init
     begin
       @omlopts[:afterParse] = lambda {|o| parse_config_files() }
       @oml_enabled = OML4R::init(ARGV, @omlopts) do |op|
         op.banner = "OMF Resource Controller version '#{@gem_version}'\n"
         op.banner += "Usage: #{@executable_name} [options]"
-    
+
         op.on("-c CONFIGFILE", "Configuration File") do |file|
           @gopts[:config_file] = file
         end
-    
+
         op.on("-a ADVANCED_CONFIGFILE", "Advanced Configuration File") do |file|
           @gopts[:adv_config_file] = file
         end
-    
+
         op.on("--log_config CONFIGFILE", "Logging Configuration File") do |file|
           @gopts[:logging_configfile] = file
         end
-    
+
         op.on("-u URI", "Communication URI [#{@def_opts[:uri]}") do |uri|
           @copts[:uri] = uri
         end
-    
+
         op.on("-e ENVIRONMENT", "Environment (development, production ...) [#{@def_opts[:environment]}]") do |e|
           @gopts[:environment] = e
         end
-    
+
         op.on("-i UID", "UID (and pubsub topic) of the resource, [#{@def_opts[:uid]}]") do |uid|
           @copts[:uid] = uid
         end
-    
+
         op.on("-v", "--version", "Show version") do
           puts "OMF Resource Controller version '#{@gem_version}'"
           exit
         end
-    
+
         op.on("-h", "--help", "Show this message") do
-          puts opts
+          puts op
           exit
         end
       end

data/init/debian

@@ -1,7 +1,7 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          omf-rc
-# Required-Start:    $remote_fs $syslog
+# Required-Start:    $ALL
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
@@ -9,6 +9,7 @@
 # Description:       Enable service provided by daemon.
 ### END INIT INFO
 
+PATH=$PATH:/usr/local/bin
 DAEMON=/usr/local/bin/run_omf_rc.sh
 [ -x "$DAEMON" ] || exit 0
 NAME=omf_rc
@@ -48,4 +49,4 @@ case "$1" in
 	;;
 esac
 
-:
+:

data/init/fedora

@@ -1,7 +1,7 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          omf-rc
-# Required-Start:    $remote_fs $syslog
+# Required-Start:    $ALL
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
@@ -9,6 +9,7 @@
 # Description:       Enable service provided by daemon.
 ### END INIT INFO
 
+PATH=$PATH:/usr/local/bin
 DAEMON=/usr/local/bin/run_omf_rc.sh
 [ -x "$DAEMON" ] || exit 0
 NAME=omf_rc
@@ -51,4 +52,4 @@ case "$1" in
 	;;
 esac
 
-:
+:

data/init/ubuntu

@@ -6,4 +6,7 @@ stop on runlevel [!2345]
 
 env DAEMON=/usr/local/bin/run_omf_rc.sh
 
-exec $DAEMON 2>&1 | logger -t omf_rc
+script
+  PATH=$PATH:/usr/local/bin
+  exec $DAEMON 2>&1 | logger -t omf_rc
+end script

data/lib/omf_rc/version.rb

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

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.4.1
+  prerelease: 
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -187,25 +202,55 @@ 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: -760579399178425643
 requirements: []
 rubyforge_project: omf_rc
-rubygems_version: 2.0.7
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OMF resource controller
-test_files: []
+test_files:
+- test/fixture/ip/addr_show
+- test/fixture/iw/help
+- test/fixture/iw/info
+- test/fixture/iw/link
+- test/fixture/lsmod
+- 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/deferred_process_spec.rb
+- 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/util/common_tools_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

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2E5YTUyM2U4OWQzYjk2Y2RlMTBlMDZiOGJmYmY5ZTg3MTY0ZTJiOQ==
-  data.tar.gz: !binary |-
-    MGQ2YmY4ZTY1NTM3ZjQyNjNhZjU0NTVmYjc4YzM4ZmVhNTlmNzg4Zg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZDEyM2VmZDViZDRkOTM0ZTZhYjY2YmQ2OGNmMGY1MzgzZDEwZjMzMjZiNTYy
-    MmRiMzY4ZmIxMmIxZTU5MGNkMDlkNDVlOTY2ZjRkODcyMTNjMzFmYmM4NmU2
-    YmI2YjhlNGMxYmEzOTdjYTg2MmJiYjg3ZTg3ZTkzYmU2ODc5NmY=
-  data.tar.gz: !binary |-
-    MDQ3ZmEyMTlkNDhhMGI4NTRkY2IyY2UyZGYxNTIwOTU0ZmU0Mjk3M2E5NjA4
-    NTQxNTNiYjhlNmMxZGFjZTc1ODdkNTkxZTk0MWZkMTQ5MzRkMDQ3YzljMTk1
-    OGMwOTcwOGQxZjgyNTc4NDJjODIxMmVkZWY4ZWMzOWM3ZDA0Y2Q=