omf_rc 6.0.2.pre.2 → 6.0.2

data/bin/omf_rc

@@ -17,7 +17,8 @@ gem_version = Gem::Specification.find_by_name('omf_rc').version.to_s
 
 begin
   oml_enabled = OML4R::init(ARGV, appName: executable_name) do |opts|
-    opts.banner = "usage: #{executable_name} [options]"
+    opts.banner = "OMF Resource Controller version '#{gem_version}'\n"
+    opts.banner += "Usage: #{executable_name} [options]"
 
     opts.on("-c CONFIGFILE", "Configuration File") do |file|
       options[:configfile] = file
@@ -35,9 +36,19 @@ begin
       options[:environment] = environment
     end
 
-    opts.on("-i UID", "UID of the resource, also becomes the pubsub topic of the resource, default to hostname") do |uid|
+    opts.on("-i UID", "UID (and pubsub topic) of the resource, defaults to hostname") do |uid|
       options[:uid] = uid
     end
+
+    opts.on("-v", "--version", "Show version") do
+      puts "OMF Resource Controller version '#{gem_version}'"
+      exit
+    end
+
+    opts.on("-h", "--help", "Show this message") do
+      puts opts
+      exit
+    end
   end
 rescue OML4R::MissingArgumentException => e
   puts "Warning: #{e.message} to instrument this RC, so it will run without instrumentation. (see --oml-help)"
@@ -94,35 +105,32 @@ if options[:factories]
 end
 
 if options[:auth]
-  if File.exist?(options[:auth][:root_cert])
-    root = OmfCommon::Auth::Certificate.create_from_x509(File.read(options[:auth][:root_cert]))
-  end
-
   if File.exist?(options[:auth][:entity_cert]) && File.exist?(options[:auth][:entity_key])
     entity = OmfCommon::Auth::Certificate.create_from_x509(File.read(options[:auth][:entity_cert]),
                                                            File.read(options[:auth][:entity_key]))
   end
 end
 
-common_options[:communication][:auth] = { certs: [ root.to_pem_compact ] } if root
+common_options[:communication][:auth] = {} if entity
 
 OmfCommon.init(options[:environment].to_sym, common_options) do |el|
   info "Starting OMF Resource Controller version '#{gem_version}'"
 
   OmfCommon.comm.on_connected do |comm|
+    info "Connected using #{comm.conn_info}"
 
-    OmfCommon::Auth::CertificateStore.instance.register(root) if root
+    if options[:auth] && options[:auth][:root_cert_dir]
+      OmfCommon::Auth::CertificateStore.instance.register_default_certs(options[:auth][:root_cert_dir])
+    end
     OmfCommon::Auth::CertificateStore.instance.register(entity) if entity
 
-    info "Connected using #{comm.conn_info}"
-
     options[:resources].each do |res_opts|
       rtype = res_opts.delete(:type)
       res_opts[:certificate] = entity if entity
       begin
         OmfRc::ResourceFactory.create(rtype, res_opts)
       rescue => e
-        error e.message
+        error "#{e.message}\n#{e.backtrace.join("\n")}"
       end
     end
 

data/config/config.yml

@@ -6,8 +6,3 @@
 :uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@localhost
 :environment: production
 :debug: false
-
-:auth:
-  :root_cert: /home/jack/omf_keys/root.pem
-  :entity_cert: /home/jack/omf_keys/rc.pem
-  :entity_key: /home/jack/omf_keys/rc_key.pem

data/config/config_with_authentication.yml.example

@@ -8,6 +8,6 @@
 :debug: false
 
 :auth:
-  :root_cert: /path_to_root_cert
+  :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/deferred_process.rb

@@ -1,3 +1,8 @@
+# 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.
+
 # To be used for handling long running processes
 #
 class OmfRc::DeferredProcess

data/lib/omf_rc/omf_error.rb

@@ -1,3 +1,8 @@
+# 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.
+
 # Error during message processing,  include message related information cid and replyto, for publishing  errors to pubsub server
 #
 class OmfRc::MessageProcessError < StandardError

data/lib/omf_rc/resource_factory.rb

@@ -1,3 +1,8 @@
+# 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.
+
 require 'securerandom'
 require 'hashie'
 require 'omf_rc/resource_proxy_dsl'
@@ -6,6 +11,8 @@ require 'omf_rc/resource_proxy/abstract_resource'
 # Factory class for managing available proxies and creating new resource proxy instances
 #
 class OmfRc::ResourceFactory
+  include OmfRc::ResourceProxyDSL
+
   # List of registered resource proxies
   @@proxy_list = Hashie::Mash.new
 
@@ -19,17 +26,20 @@ class OmfRc::ResourceFactory
       unless @@proxy_list.include?(type)
         raise ArgumentError, "Resource type not found: #{type.to_s}" unless @@proxy_list.include?(type)
       end
+      # Get relevant module identified by type
+      emodule = @@proxy_list[type].proxy_module || "OmfRc::ResourceProxy::#{type.camelize}".constantize
       # Create a new instance of abstract resource
       resource = OmfRc::ResourceProxy::AbstractResource.new(type, opts, creation_opts, &creation_callback)
-      # Then extend this instance with relevant module identified by type
-      emodule = @@proxy_list[type].proxy_module || "OmfRc::ResourceProxy::#{type.camelize}".constantize
+      # Extend newly created resource with proxy module
       resource.extend(emodule)
+
       # Initiate property hash
       resource.methods.each do |m|
-        resource.__send__(m) if m =~ /def_property_(.+)/
+        resource.__send__(m) if m =~ /default_property_(.+)/
       end
       # Execute resource before_ready hook if any
-      resource.before_ready if resource.respond_to? :before_ready
+      call_hook(:before_ready, resource)
+
       resource
     end
 
@@ -50,13 +60,15 @@ class OmfRc::ResourceFactory
     end
 
     # Require files from default resource proxy library folder
-    #
     def load_default_resource_proxies
       Dir["#{File.dirname(__FILE__)}/resource_proxy/*.rb"].each do |file|
         require "omf_rc/resource_proxy/#{File.basename(file).gsub(/\.rb/, '')}"
       end
     end
 
+    # Require files from a folder contains resource proxy definition files
+    #
+    # @param [String] folder contains resource proxy definition files
     def load_additional_resource_proxies(folder)
       Dir["#{folder}/*.rb"].each do |file|
         require "#{folder}/#{File.basename(file).gsub(/\.rb/, '')}"