omf_rc 6.0.7.1 → 6.0.8.pre.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b2e820a1934c20b23aa5c856ae703cf133a02754
-  data.tar.gz: 54d8d9ba99a745bdbeef85260c66d71ef893012c
-SHA512:
-  metadata.gz: f76a8aff1d31d9768c4999385594aef8bd2f0bd71ab117cd5defeecbfa91c349a282ca5d3381bff6a2d49daa5022fc38de9c4b0606224a599e2e9282ad5ec47a
-  data.tar.gz: 8862865525de1f67d2e68d1766a4d7cba008aeb41ec63076f6571866f29f692801bf95272e9016dd1a4985ae3bc6847a7bc2c9d5afa4b56207fc6915e6137f5e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2JmN2U2NmJlNTc4OGI5OWViYWZjNzdkMDg3MWZkYjFiNWFjMzhkNA==
+  data.tar.gz: !binary |-
+    NDk2NTEzZGY4MzYyYmZmNDA5OTY4MzNkOGY3MTBkMmY3M2RhN2NiZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2M2YmRkNmJjYTVkYWViZjRjOWUwZmQ1MDM4ZmQ3YTFmZWM4YWRiMjUxZTAw
+    OGU2OWI3YzlhNGJkN2IzM2E3YjI2YjRkNTY0ZDk0MmI5ZWNhZjM5NzA2OTky
+    YjE5NGUyMzhmYmI0Y2VlYWY0NDVjZDExOTk3M2ZlYjA3OWU5OTI=
+  data.tar.gz: !binary |-
+    N2Q5YjI4Y2MzYWU5ODgxNTM4NDgyZWZkMjg1NTQyNTU0ZmU3ZjE3MGQ5NGRj
+    NmE4ZDMwZjUxMWNhZGExYTRiMDg2YTQzY2VhZGIxZjM0MzcwNmFlMjU3NmEy
+    MjdkYmU5MzQ4ZDdmYjI4NDYzZGZhYWE5OWRkNWJhYjcxNTMzZTA=

data/bin/install_omf_rc

@@ -44,30 +44,23 @@ end
 
 if options[:init]
   puts "Detecting operating system..."
-  
+  FileUtils.cp "#{gem_root}/init/run_omf_rc.sh", "/usr/local/bin/run_omf_rc.sh"
   if !File.exist?("/etc/issue")
     abort "Unknown or unsupported operating system. Cannot install init script."
   end
-  
-  os=`awk 'NR==1 {print $1}' /etc/issue`.chomp
-  
-  if os.nil?
-    abort "Unknown or unsupported operating system. Cannot install init script."
-  end
- 
-  puts "'#{os}' found"
-  
-  FileUtils.cp "#{gem_root}/init/run_omf_rc.sh", "/usr/local/bin/run_omf_rc.sh"
-  
-  case os
-  when "Ubuntu"
+  issue = File.read("/etc/issue")
+  if issue.include? "Ubuntu"
     FileUtils.cp "#{gem_root}/init/ubuntu", "/etc/init/omf_rc.conf"
     puts "Upstart script for Ubuntu has been installed. Execute 'start omf_rc' to run the daemon."
-  when "Debian"
+  elsif issue.include? "Debian"
     FileUtils.cp "#{gem_root}/init/debian", "/etc/init.d/omf_rc"
     `update-rc.d omf_rc defaults`
     puts "Init script for Debian has been installed. Execute '/etc/init.d/omf_rc start' to run the daemon."
-  when "Fedora"
+  elsif issue.include? "Angstrom"
+    FileUtils.cp "#{gem_root}/init/angstrom", "/etc/init.d/omf_rc"
+    `update-rc.d omf_rc defaults`
+    puts "Init script for Angstrom has been installed. Execute '/etc/init.d/omf_rc start' to run the daemon."
+  elsif issue.include? "Fedora"
      FileUtils.cp "#{gem_root}/init/fedora", "/etc/init.d/omf_rc"
     `chkconfig --add omf_rc`
     # older Fedora's don't use systemd

data/bin/omf_rc

@@ -12,214 +12,8 @@ require 'socket'
 
 require 'omf_rc'
 require 'omf_rc/resource_factory'
+require 'omf_rc/runner'
 
 $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).
-#
-# 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.
-#
-# 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
-# during command line parsing.
-#
-class OmfRcRunner
-  def initialize()
-    @options = {}
-    @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",
-      environment: 'production',
-      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 ..."
-        OmfCommon.comm.disconnect
-      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
-            info "Try to load resource module '#{req}'"
-            require(req)
-          rescue LoadError => e
-            error e.message
-          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)
-          res_creation_opts ||= res_opts.delete(:create_opts)
-          res_creation_opts ||= {}
-          #res_opts[:certificate] = entity if entity
-          begin
-            OmfRc::ResourceFactory.create(rtype, res_opts, res_creation_opts)
-          rescue => e
-            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]
-      if File.exist?(opts[:auth][:entity_cert]) && File.exist?(opts[:auth][:entity_key])
-        entity = OmfCommon::Auth::Certificate.create_from_x509(File.read(opts[:auth][:entity_cert]),
-                                                               File.read(opts[:auth][:entity_key]))
-      end
-    end
-    opts[:communication][:auth] = {} if entity
-  end
-
-  def parse_config_files()
-    @opts = {communication: {}, resources: [], factories: [], add_default_factories: true}
-    config_file = @gopts[:config_file]
-    adv_config_file = @gopts[:adv_config_file]
-    if config_file && adv_config_file
-      puts "To avoid any unexpected surprises, you should stick to one form of config file"
-      exit(1)
-    end
-
-    if !config_file && !adv_config_file
-      puts "You must specify a 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))
-      @opts[:communication][:url] = copts[:uri]
-      @opts[:resources] = copts[:resources] || [{ type: :node, uid: copts[:uid] }]
-      @opts[:factories] = copts[:factories] if copts[:factories]
-      if copts[:add_default_factories] == false
-        @opts[:add_default_factories] = false
-      end
-      @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)
-      @gopts[:environment] ||= @copts[:environment] || aenv || @def_opts[:environment]
-      @opts.merge!(aopts)
-      # need to do a merge! to update the hash passed into OML.init already
-      @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 op
-          exit
-        end
-      end
-    rescue OML4R::MissingArgumentException => e
-      puts "Warning: #{e.message} to instrument this RC, so it will run without instrumentation. (see --oml-help)"
-    rescue => e
-      puts e.message
-      exit(1)
-    end
-  end
-end
-
-OmfRcRunner.new().run()
+OmfRc::Runner.new.run

data/init/angstrom

@@ -0,0 +1,47 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          omf-rc
+# Required-Start:    $ALL
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start daemon at boot time
+# Description:       Enable service provided by daemon.
+### END INIT INFO
+
+PATH=$PATH:/usr/bin:/usr/local/bin
+DAEMON=/usr/local/bin/run_omf_rc.sh
+[ -x "$DAEMON" ] || exit 0
+NAME=omf_rc
+PIDFILE=/var/run/$NAME.pid
+
+start(){
+        echo -n "Starting OMF Resource Controller: $NAME"
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --exec $DAEMON 2>&1 | logger -t omf_rc &
+        echo "."
+}
+
+stop(){
+        echo -n "Stopping OMF Resource Controller: $NAME"
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+        echo "."
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+ 	stop
+ 	start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart}" >&2
+	exit 3
+	;;
+esac
+
+:

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -123,11 +123,13 @@ class OmfRc::ResourceProxy::AbstractResource
         begin
           # Setup authentication related properties
           if (@certificate = @opts.delete(:certificate))
-            OmfCommon::Auth::CertificateStore.instance.register(@certificate, t.address)
-          else
-            if (pcert = @opts.delete(:parent_certificate))
-              @certificate = pcert.create_for(resource_address, @type, t.address)
-            end
+          elsif (pcert = @opts.delete(:parent_certificate))
+            @certificate = pcert.dup
+          end
+
+          if @certificate
+            @certificate.resource_id = resource_address
+            OmfCommon::Auth::CertificateStore.instance.register(@certificate)
           end
 
           # Extend resource with Resource Module, can be obtained from Factory
@@ -386,9 +388,8 @@ class OmfRc::ResourceProxy::AbstractResource
     end
 
     objects_by_topic(topic.id.to_s).each do |obj|
-      if OmfCommon::Measure.enabled?
-        OmfRc::ResourceProxy::MPReceived.inject(Time.now.to_f, self.uid, topic, message.mid)
-      end
+      OmfRc::ResourceProxy::MPReceived.inject(Time.now.to_f, self.uid,
+        topic.id.to_s, message.mid) if OmfCommon::Measure.enabled?
       execute_omf_operation(message, obj, topic)
     end
   end
@@ -492,7 +493,12 @@ class OmfRc::ResourceProxy::AbstractResource
     message.each_property do |key, value|
       method_name =  "#{message.operation.to_s}_#{key}"
       p_value = message[key]
-      response[key] ||= obj.__send__(method_name, p_value)
+
+      if namespaced_property?(key)
+        response[key, namespace] = obj.__send__(method_name, p_value)
+      else
+        response[key] = obj.__send__(method_name, p_value)
+      end
     end
   end
 
@@ -512,7 +518,13 @@ class OmfRc::ResourceProxy::AbstractResource
     request_props.each do |p_name|
       method_name = "request_#{p_name.to_s}"
       value = obj.__send__(method_name)
-      response[p_name] = value if value
+      if value
+        if namespaced_property?(p_name)
+          response[p_name, namespace] = value
+        else
+          response[p_name] = value
+        end
+      end
     end
   end
 
@@ -567,10 +579,11 @@ class OmfRc::ResourceProxy::AbstractResource
     end
 
     # Just send to all topics, including group membership
-    (membership_topics.map { |mt| mt[1] } + @topics).each { |t| t.publish(message) }
-
-    OmfRc::ResourceProxy::MPPublished.inject(Time.now.to_f,
-      self.uid, replyto, inform_message.mid) if OmfCommon::Measure.enabled?
+    (membership_topics.map { |mt| mt[1] } + @topics).each do |t|
+      t.publish(message)
+      OmfRc::ResourceProxy::MPPublished.inject(Time.now.to_f,
+        self.uid, t.id, message.mid) if OmfCommon::Measure.enabled?
+    end
   end
 
   def inform_status(props)
@@ -676,4 +689,11 @@ class OmfRc::ResourceProxy::AbstractResource
       end
     end
   end
+
+  # Check if a property has namespace associated
+  #
+  # @param [String] name of the property
+  def namespaced_property?(name)
+    respond_to?(:namespace) && name =~ /^(.+)__(.+)$/
+  end
 end

data/lib/omf_rc/resource_proxy/application.rb

@@ -88,6 +88,7 @@ module OmfRc::ResourceProxy::Application
   property :app_id, :default => nil
   property :description, :default => ''
   property :binary_path, :default => nil
+  property :quiet, :default => false
   property :platform, :default => nil
   property :pkg_tarball, :default => nil
   property :tarball_install_path, :default => '/'
@@ -169,7 +170,7 @@ module OmfRc::ResourceProxy::Application
                       msg: msg,
                       seq: res.property.event_sequence,
                       uid: res.uid
-                    }, :ALL)
+                    }, :ALL) unless res.property.quiet
       end
   end
 
@@ -549,7 +550,7 @@ module OmfRc::ResourceProxy::Application
       o = res.property.oml
       ofile = "/tmp/#{res.uid}-#{Time.now.to_i}.xml"
       of = File.open(ofile,'w')
-      of << "<omlc experiment='#{o.experiment}' id='#{o.id}'>\n"
+      of << "<omlc experiment='#{o.experiment}' id='#{o.id}_#{res.uid}'>\n"
       o.collection.each do |c|
         of << "  <collect url='#{c.url}'>\n"
         c.streams.each do |m|

data/lib/omf_rc/resource_proxy_dsl.rb

@@ -346,6 +346,14 @@ module OmfRc::ResourceProxyDSL
       alias_method "orig_request_#{request_name}", "request_#{request_name}"
     end
 
+    def namespace(ns_prefix, ns_href)
+      define_method("namespace") do
+        { ns_prefix => ns_href }
+      end
+    end
+
+    alias_method :ns, :namespace
+
     # Define internal property. Refer to options section to see supported options.
     #
     # @param [Symbol] name of the property

data/lib/omf_rc/runner.rb

@@ -0,0 +1,180 @@
+# Copyright (c) 2013 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.
+
+module OmfRc
+  # 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).
+  #
+  # 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.
+  #
+  # 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
+  # during command line parsing.
+  #
+  class Runner
+    include Hashie
+
+    attr_accessor :gopts, :copts, :def_opts
+    attr_accessor :opts
+
+    def initialize()
+      @executable_name = File.basename($PROGRAM_NAME)
+      @oml_enabled = false
+      @gem_version = OmfCommon.version_of('omf_common')
+
+      @node_id = Socket.gethostname
+
+      @def_opts = Mash.new(
+        environment: 'production',
+        resources: [ { type: :node, uid: @node_id }],
+        factories: [],
+        communication: { url: "xmpp://#{@node_id}-#{Process.pid}:#{@node_id}-#{Process.pid}@localhost" },
+        add_default_factories: true,
+      )
+
+      @gopts = Mash.new(
+        config_file: nil,
+        adv_config_file: nil,
+        logging_configfile: nil,
+        environment: nil
+      )
+
+      @opts = Mash.new
+
+      @omlopts = {appName: @executable_name}
+    end
+
+    def run()
+      oml_init() # calls parse_config_files()
+
+      OmfCommon::Measure.enable if @oml_enabled
+
+      OmfCommon.init(@opts[:environment], @opts.to_hash) do |el|
+        # Load a customised logging set up if provided
+        OmfCommon.load_logging_config(@opts[:logging_configfile])
+
+        info "Starting OMF Resource Controller version '#{@gem_version}'"
+
+        Signal.trap("SIGINT") do
+          # TODO: Should release resources first
+          info "Stopping ..."
+          OmfCommon.comm.disconnect
+        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
+              info "Try to load resource module '#{req}'"
+              require(req)
+            rescue LoadError => e
+              error e.message
+            end
+          end
+        end
+
+        OmfCommon.comm.on_connected do |comm|
+          info "Connected using #{comm.conn_info}"
+
+          rc_cert = OmfCommon.load_credentials(@opts[:credentials])
+
+          @opts[:resources].each do |res_opts|
+            rtype = res_opts.delete(:type)
+            res_creation_opts = res_opts.delete(:creation_opts)
+            res_creation_opts ||= res_opts.delete(:create_opts)
+            res_creation_opts ||= {}
+            res_opts[:certificate] = rc_cert
+            begin
+              OmfRc::ResourceFactory.create(rtype, res_opts, res_creation_opts)
+            rescue => e
+              error "#{e.message}\n#{e.backtrace.join("\n")}"
+            end
+          end
+
+        end
+      end
+      info "Stopping OMF Resource Controller version '#{@gem_version}'"
+    end
+
+    def parse_config_files()
+      config_file = @gopts[:config_file]
+
+      if config_file.nil?
+        puts "You must specify a config file"
+        exit(1)
+      else
+        cfg_opts = Mash.new(OmfCommon.load_yaml(config_file, symbolize_keys: true, erb_process: true))
+
+        @opts.merge!(@def_opts.merge(cfg_opts))
+
+        # Legacy support uri & uid opt could also configure comm & resource
+        cfg_opts.each do |k, v|
+          case k.to_sym
+          when :uri
+            @opts[:communication][:url] = v
+          when :uid
+            @opts[:resources][0][:type] = :node
+            @opts[:resources][0][:uid] = v
+          else
+            @opts[k] = v
+          end
+        end
+
+        @omlopts.merge(@opts[:instrumentation] || {}) { |k, v1, v2| v1 } # 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("-e ENVIRONMENT", "Environment (development, production ...) [#{@def_opts[:environment]}]") do |e|
+            @gopts[:environment] = e
+          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 op
+            exit
+          end
+        end
+      rescue OML4R::MissingArgumentException => e
+        puts "Warning: #{e.message} to instrument this RC, so it will run without instrumentation. (see --oml-help)"
+      rescue => e
+        puts e.message
+        #puts e.backtrace
+        exit(1)
+      end
+    end
+  end
+end

data/lib/omf_rc/version.rb

@@ -3,6 +3,8 @@
 # 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 'omf_common/version'
+
 module OmfRc
-  VERSION = "6.0.7.1"
+  VERSION = OmfCommon.version_of('omf_rc')
 end

data/omf_rc.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "em-minitest-spec", "~> 1.1.1"
   s.add_development_dependency "pry"
   s.add_development_dependency "simplecov"
-  s.add_runtime_dependency "omf_common", "= 6.0.7.1"
+  s.add_runtime_dependency "omf_common", "= #{OmfCommon::VERSION}"
   s.add_runtime_dependency "cocaine", "~> 0.3.0"
   s.add_runtime_dependency "mocha"
 end

data/test/fixture/omf_rc.simple.yml

@@ -0,0 +1,8 @@
+---
+# 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}" %>@somewhere
+:environment: production
+:debug: false

data/test/fixture/omf_rc.yml

@@ -0,0 +1,92 @@
+# EXISTING options
+
+# By default it loads node proxy, and this is its id
+uid: bob
+
+# How to connect to pubsub server
+uri: xmpp://remote
+
+# Which environment to use, the value is the one of pre-defined ones in omf_common
+environment: development
+
+# Load an external file contains Logging configuration
+logging_configfile: config/my_logging.rb
+
+# If load default type factories
+add_default_factories: true
+
+# Additional resources which can be created by this RC
+factories:
+  - require: omf_rc_openflow
+
+# Customise what proxy to load
+resources:
+  - type: my_resource
+    # Can initialise resource properties
+    uid: resource_1
+    my_prop: foo
+    membership:
+      - g1
+
+    # Can set resource creation options
+    creation_opts:
+      send_backtrace: true
+
+# END of EXISTING options
+
+
+# Option to be MODIFIED
+
+# This used to be called 'auth', but it is really about loading
+# credentials (certificates) during RC bootstrap. Name it 'credentials' makes more sense.
+
+credentials:
+  root_cert_dir: ~/omf_keys/root/
+  entity_cert: ~/omf_keys/rc.pem
+  entity_key: ~/omf_keys/rc_key.pem
+
+# END of Option to be MODIFIED
+
+# NEW options (used to be defined in 'advanced configuration file')
+
+# Basically everything that can be initialised using OmfCommon.init
+
+communication:
+  type: :xmpp
+  url: xmpp://localhost
+
+  auth:
+    authenticate: true
+    pdp:
+      constructor: TestPDP
+      trust:
+        - adam
+
+eventloop:
+  type: :em
+
+logging:
+
+  level:
+    default: debug
+
+  appenders:
+    stdout:
+      date_pattern: "%H:%M:%S"
+      pattern: "%d %5l %c{2}: %m\n"
+      color_scheme: none
+
+# END of NEW options
+
+# OML options
+
+instrumentation:
+  oml-id: id                 # Name to identify this app instance [undefined]
+  oml-domain: domain         # Name of experimental domain [undefined] *EXPERIMENTAL*
+  oml-collect: uri           # URI of server to send measurements to
+  oml-protocol: 4            # Protocol number [4]
+  oml-log-level: l           # Log level used (info: 1 .. debug: 0)
+  oml-noop:                  # Do not collect measurements
+  oml-config: file           # File holding OML configuration parameters
+
+# END of OML options

data/test/omf_rc/resource_proxy_dsl_spec.rb

@@ -9,7 +9,7 @@ require 'omf_rc/resource_proxy_dsl'
 describe OmfRc::ResourceProxyDSL do
   before do
     mock_comm_in_res_proxy
-    mock_topics_in_res_proxy(resources: [:mp0, :mrp0, :up0])
+    mock_topics_in_res_proxy(resources: [:mp0, :mrp0, :up0, :f0])
 
     module OmfRc::Util::MockUtility
       include OmfRc::ResourceProxyDSL
@@ -69,6 +69,14 @@ describe OmfRc::ResourceProxyDSL do
 
       register_proxy :useless_proxy
     end
+
+    module OmfRc::ResourceProxy::Foo
+      include OmfRc::ResourceProxyDSL
+
+      register_proxy :foo
+
+      namespace :foo, "http://schema/foo"
+    end
   end
 
   after do
@@ -144,4 +152,11 @@ describe OmfRc::ResourceProxyDSL do
       lambda { mock_proxy.configure_init_only_prop }.must_raise NoMethodError
     end
   end
+
+  describe "when namespace specified" do
+    it "must define namespace in the resource proxy" do
+      foo = OmfRc::ResourceFactory.create(:foo, uid: :f0)
+      foo.namespace.must_equal({foo: "http://schema/foo"})
+    end
+  end
 end

data/test/omf_rc/runner_spec.rb

@@ -0,0 +1,49 @@
+# Copyright (c) 2013 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 'test_helper'
+require 'omf_rc/runner'
+
+describe OmfRc::Runner do
+  describe 'when loading a configuration yaml file' do
+    before do
+      @r = OmfRc::Runner.new
+    end
+
+    it 'must initialise options properly' do
+      @r.gopts[:config_file] = "#{FIXTURE_DIR}/omf_rc.yml"
+      @r.parse_config_files
+
+      @r.opts[:add_default_factories].must_equal true
+
+      @r.opts[:factories][0][:require].must_equal 'omf_rc_openflow'
+
+      @r.opts[:resources][0][:membership].must_equal ['g1']
+
+      @r.opts[:credentials][:root_cert_dir].must_equal '~/omf_keys/root/'
+      @r.opts[:credentials][:entity_cert].must_equal '~/omf_keys/rc.pem'
+      @r.opts[:credentials][:entity_key].must_equal '~/omf_keys/rc_key.pem'
+
+      @r.opts[:communication][:url].must_equal "xmpp://localhost"
+      @r.opts[:communication][:auth][:pdp][:trust].must_equal ['adam']
+
+      @r.opts[:instrumentation]['oml-domain'].must_equal 'domain'
+    end
+
+    it 'must support a very minimal configure file with proper defaults' do
+      @r.gopts[:config_file] = "#{FIXTURE_DIR}/omf_rc.simple.yml"
+      @r.parse_config_files
+
+      @r.opts[:add_default_factories].must_equal true
+      @r.opts[:resources][0][:type].must_equal :node
+
+      node_id = Socket.gethostname
+      user = "#{node_id}-#{Process.pid}"
+
+      @r.opts[:resources][0][:uid].must_equal node_id
+      @r.opts[:communication][:url].must_equal "xmpp://#{user}:#{user}@somewhere"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.0.7.1
+  version: 6.0.8.pre.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2013-11-19 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.7.1
+        version: 6.0.8.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.7.1
+        version: 6.0.8.pre.1
 - !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
@@ -128,6 +128,7 @@ files:
 - config/config.yml
 - config/config_with_authentication.yml.example
 - config/config_with_extensions.yml.example
+- init/angstrom
 - init/debian
 - init/fedora
 - init/run_omf_rc.sh
@@ -144,6 +145,7 @@ files:
 - lib/omf_rc/resource_proxy/virtual_machine_factory.rb
 - lib/omf_rc/resource_proxy/wlan.rb
 - lib/omf_rc/resource_proxy_dsl.rb
+- lib/omf_rc/runner.rb
 - lib/omf_rc/util/common_tools.rb
 - lib/omf_rc/util/hostapd.rb
 - lib/omf_rc/util/ip.rb
@@ -163,6 +165,8 @@ files:
 - 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
@@ -179,6 +183,7 @@ files:
 - 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/ip_spec.rb
 - test/omf_rc/util/iw_spec.rb
@@ -194,44 +199,18 @@ 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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_rc
-rubygems_version: 2.0.6
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 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/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
+test_files: []