omf_rc 6.0.3 → 6.0.4.pre.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGNiZjU5MGViODBjNTc1MDU0MDE3Y2ZmMzY0ZTA0YjQwMWY2MThkMA==
+  data.tar.gz: !binary |-
+    ZTFiYTZiYzQ0MzZiNjM1NDI1YTlhOTQ0MGZlZTEwYWUwMDlmNjU2MA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MzFhMDI5ZTk5Zjg0YzY3NjI5YzIzMDNiMDYyNDFiYjc4YjIyNzkyNjk4NWNh
+    MjYwM2NmMzc3MzJmMTU5NDFkMzA0MTE0N2VhMTM4NjViZTMzY2JlZTE3OWMz
+    Y2ExOGE4ZmI5ZjI4YmYyYjgwOTY0M2UxZjNmOTdlN2YyMGE2OGM=
+  data.tar.gz: !binary |-
+    MGQ1OTExNjE5NjYwZjUxNTU4Njc2ZWNlOWVmODViZThlNThiMTNlN2YzOTZj
+    MWE2MjZmMDJmZjZjMDVhMzEwNGU3ZGVkNDEwMTM3Mzk5NzliZGRkNTU0OGE5
+    ODAzZGZhMmE4YjZhY2UxNzBhYjUwZWJkNzJhZjdkZWJmZmQzM2E=

data/bin/omf_rc

@@ -28,6 +28,10 @@ begin
       options[:advanced_configfile] = file
     end
 
+    opts.on("--log_config CONFIGFILE", "Logging Configuration File") do |file|
+      options[:logging_configfile] = file
+    end
+
     opts.on("-u URI", "Communication URI (xmpp://user:password@domain)") do |uri|
       options[:uri] = uri
     end
@@ -87,23 +91,6 @@ unless common_options[:communication] && common_options[:communication][:url]
   exit(1)
 end
 
-if options[:add_default_factories] != false
-  OmfRc::ResourceFactory.load_default_resource_proxies
-end
-
-if options[:factories]
-  options[: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
-end
-
 if options[:auth]
   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]),
@@ -114,6 +101,27 @@ end
 common_options[:communication][:auth] = {} if entity
 
 OmfCommon.init(options[:environment].to_sym, common_options) do |el|
+  # Load a customised logging set up if provided
+  OmfCommon.load_logging_config(options[:logging_configfile])
+
+  # Load extensions
+  if options[:add_default_factories] != false
+    OmfRc::ResourceFactory.load_default_resource_proxies
+  end
+
+  if options[:factories]
+    options[: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
+  end
+
   info "Starting OMF Resource Controller version '#{gem_version}'"
 
   OmfCommon.comm.on_connected do |comm|
@@ -126,9 +134,12 @@ OmfCommon.init(options[:environment].to_sym, common_options) do |el|
 
     options[: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)
+        OmfRc::ResourceFactory.create(rtype, res_opts, res_creation_opts)
       rescue => e
         error "#{e.message}\n#{e.backtrace.join("\n")}"
       end
@@ -137,3 +148,4 @@ OmfCommon.init(options[:environment].to_sym, common_options) do |el|
   end
 end
 info "Stopping OMF Resource Controller version '#{gem_version}'"
+

data/bin/plc_trigger_omf_rc

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby
+
+# 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.
+
+# This script is intended to be run by the PLE Node Manager:
+# 1) after initial slice creation
+# 2) after slice renewal
+# to fetch the client, root and intermediate certificates for the OMF RC
+
+require 'yaml'
+
+curl="curl -s -m30"
+
+puts "Running OMF PLE trigger script"
+
+raise "Please use Ruby 1.9.3 or higher" if RUBY_VERSION < "1.9.3"
+raise "You must run this script as root" unless Process.uid==0
+raise "You must switch to gemset 'omf' and install the 'omf_rc' gem" unless system("which install_omf_rc > /dev/null")
+
+def check_cert(file, text)
+  raise "Failed to #{text} (#{file})" unless File.exists?(file) and File.size?(file) > 0
+end
+
+config_file = "/etc/omf_rc/config.yml"
+init_script = "/etc/init.d/omf_rc"
+csr = "/tmp/request.csr"
+cert_server = "http://srv.mytestbed.net:4567/ple/"
+
+# parse config file
+raise "could not find #{config_file}" unless File.exists?(config_file)
+config = YAML.load_file(config_file)
+host = config[:hostname]
+slice = config[:slicename]
+raise "could not determine host name" unless host
+raise "could not determine slice name" unless slice
+root_cert_dir = config[:auth][:root_cert_dir]
+entity_cert = config[:auth][:entity_cert]
+entity_key = config[:auth][:entity_key]
+raise ":root_cert_dir missing in config file" unless root_cert_dir
+raise ":entity_cert missing in config file" unless entity_cert
+raise "cannot find private key at #{entity_key}" unless File.exists?(entity_key)
+Dir.mkdir(root_cert_dir) unless File.directory?(root_cert_dir)
+
+# stop the RC
+system "#{init_script} stop" if File.exists?(init_script)
+system "sleep 2; pkill -f /bin/omf_rc"
+
+# create CSR
+puts "Generating CSR"
+system "openssl req -subj /CN=#{slice}%#{host} -new -key #{entity_key} -out #{csr}"
+check_cert(csr, "generate CSR")
+
+# fetch client cert
+puts "Fetching client cert"
+system "#{curl} -F \"csr=@#{csr}\" -F \"slice=#{slice}\" -F \"resource=#{host}\" #{cert_server}resource/cert -o #{entity_cert}"
+check_cert(entity_cert, "fetch client cert")
+
+# fetch root cert
+puts "Fetching root cert"
+root_cert = "#{root_cert_dir}/root.crt"
+system "#{curl} #{cert_server}root/cert -o #{root_cert}"
+check_cert(root_cert, "fetch root cert")
+
+# fetch intermediate cert
+puts "Fetching intermediate cert"
+intermediate_cert = "#{root_cert_dir}/intermediate.crt"
+system "#{curl} #{cert_server}intermediate/cert -o #{intermediate_cert}"
+check_cert(intermediate_cert, "fetch intermediate cert")
+
+# install the init script if it doesn't exist yet
+puts "Installing OMF init script"
+system "install_omf_rc -i" unless File.exists?(init_script)
+
+# start the RC
+system "#{init_script} start"
+
+puts "OMF PLE trigger script operation finished"

data/lib/omf_rc/omf_error.rb

@@ -15,6 +15,8 @@ class OmfRc::MessageProcessError < StandardError
   end
 end
 
+class OmfRc::TopicNotSubscribedError < StandardError; end
+
 # No method error that caused by configure/request unknown property
 #
 class OmfRc::UnknownPropertyError < NoMethodError

data/lib/omf_rc/resource_factory.rb

@@ -26,21 +26,10 @@ 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)
-      # Extend newly created resource with proxy module
-      resource.extend(emodule)
-
-      # Initiate property hash
-      resource.methods.each do |m|
-        resource.__send__(m) if m =~ /default_property_(.+)/
+      # Create a new instance of abstract resource and return it
+      OmfRc::ResourceProxy::AbstractResource.new(type, opts, creation_opts) do |res|
+        creation_callback.call(res) if creation_callback
       end
-      # Execute resource before_ready hook if any
-      call_hook(:before_ready, resource)
-
-      resource
     end
 
     alias :new :create

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -79,8 +79,8 @@ class OmfRc::ResourceProxy::AbstractResource
     create_children_resources: true
   }
 
-  attr_accessor :uid, :hrn, :type, :comm, :property, :certificate
-  attr_reader :opts, :children, :membership, :creation_opts, :membership_topics
+  attr_accessor :uid, :hrn, :type, :property, :certificate
+  attr_reader :opts, :children, :membership, :creation_opts, :membership_topics, :topics
 
   # Initialisation
   #
@@ -89,7 +89,6 @@ class OmfRc::ResourceProxy::AbstractResource
   # @param [Hash] opts options to be initialised
   # @option opts [String] :uid Unique identifier
   # @option opts [String] :hrn Human readable name
-  # @option opts [Hash] :property A hash for keeping internal state
   # @option opts [Hash] :instrument A hash for keeping instrumentation-related state
   # @option opts [OmfCommon::Auth::Certificate] :certificate The certificate for this resource
   #
@@ -104,15 +103,15 @@ class OmfRc::ResourceProxy::AbstractResource
     @creation_opts = Hashie::Mash.new(DEFAULT_CREATION_OPTS.merge(creation_opts))
 
     @type = type
-    @uid = (@opts.uid || SecureRandom.uuid).to_s
-    @hrn = @opts.hrn && @opts.hrn.to_s
+    @uid = (@opts.delete(:uid) || SecureRandom.uuid).to_s
+    @hrn = @opts.delete(:hrn)
+    @hrn = @hrn.to_s if @hrn
 
-    @children ||= []
+    @children = []
     @membership = []
     @topics = []
-    @membership_topics ||= {}
-
-    @property = Hashie::Mash.new(@opts.property)
+    @membership_topics = {}
+    @property = Hashie::Mash.new
 
     OmfCommon.comm.subscribe(@uid) do |t|
       @topics << t
@@ -121,40 +120,66 @@ class OmfRc::ResourceProxy::AbstractResource
         warn "Could not create topic '#{uid}', will shutdown, trying to clean up old topics. Please start it again once it has been shutdown."
         OmfCommon.comm.disconnect()
       else
-        if (@certificate = @opts.certificate)
-          OmfCommon::Auth::CertificateStore.instance.register(@certificate, t.address)
-        else
-          if (pcert = @opts.parent_certificate)
-            @certificate = pcert.create_for(resource_address, @type, t.address)
+        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
           end
-        end
-
-        creation_callback.call(self) if creation_callback
-
-        copts = { src: self.resource_address }
-        copts[:cert] = @certificate.to_pem_compact if @certificate
-
-        cprops = @property.reject { |k| [:parent_certificate, :parent].include?(k.to_sym) }
-        cprops[:res_id] = self.resource_address
 
-        t.inform(:creation_ok, cprops, copts)
+          # Extend resource with Resource Module, can be obtained from Factory
+          emodule = OmfRc::ResourceFactory.proxy_list[@type].proxy_module || "OmfRc::ResourceProxy::#{@type.camelize}".constantize
+          self.extend(emodule)
+          # Initiate property hash with default property values
+          self.methods.each do |m|
+            self.__send__(m) if m =~ /default_property_(.+)/
+          end
+          # Bootstrap initial configure, this should handle membership too
+          init_configure(self, @opts)
+          # Execute resource before_ready hook if any
+          call_hook :before_ready, self
+
+          # Prepare init :creation_ok message
+          copts = { src: self.resource_address }
+          copts[:cert] = @certificate.to_pem_compact if @certificate
+          cprops = @property
+          cprops[:res_id] = self.resource_address
+          add_prop_status_to_response(self, @opts.keys, cprops)
+
+          # Then send inform message to itself, with all resource options' current values.
+          t.inform(:creation_ok, cprops, copts) unless creation_opts[:suppress_create_message]
+
+          t.on_message(@uid) do |imsg|
+            process_omf_message(imsg, t)
+          end
 
-        t.on_message(@uid) do |imsg|
-          process_omf_message(imsg, t)
+          creation_callback.call(self) if creation_callback
+        rescue => e
+          error "Encountered exception: #{e.message}, returning ERROR message"
+          debug e.backtrace.join("\n")
+          t.inform(:creation_failed,
+                   { reason: e.message },
+                   { src: self.resource_address })
         end
       end
     end
-    configure_membership(@opts.membership) if @opts.membership
+  end
+
+  # Return resource' pubsub topic it has subscribed.
+  def resource_topic
+    if @topics.empty?
+      raise TopicNotSubscribedError, "Resource '#{@uid}' has not subscribed to any topics"
+    end
+    @topics[0]
   end
 
   # Return the public 'routable' address for this resource or nil if not known yet.
   #
-  def resource_address()
-    if t = @topics[0]
-      t.address
-    else
-      nil # TODO: should we raise Excaption
-    end
+  def resource_address
+    resource_topic.address
   end
 
   # Get binding of current object, used for ERB eval
@@ -183,9 +208,6 @@ class OmfRc::ResourceProxy::AbstractResource
 
     new_resource = OmfRc::ResourceFactory.create(type.to_sym, opts, creation_opts, &creation_callback)
 
-    new_props = opts.reject { |k| [:type, :name, :uid, :hrn, :property, :instrument].include?(k.to_sym) }
-    init_configure(new_resource, new_props)
-
     call_hook(:after_create, self, new_resource)
 
     self.synchronize do
@@ -442,13 +464,8 @@ class OmfRc::ResourceProxy::AbstractResource
         response[:res_id] = new_obj.resource_address
         response[:uid] = new_obj.uid
 
-        msg_props.each do |key, value|
-          if new_obj.respond_to? "request_#{key}"
-            response[key] = new_obj.__send__("request_#{key}")
-          elsif new_obj.respond_to? key
-            response[key] = new_obj.__send__(key)
-          end
-        end
+        # Getting property status, for preparing inform msg
+        add_prop_status_to_response(new_obj, msg_props.keys, response)
 
 				if (cred = new_obj.certificate)
           response[:cert] = cred.to_pem_compact
@@ -531,13 +548,7 @@ class OmfRc::ResourceProxy::AbstractResource
       warn "INFORM message delayed as resource's address is not known yet"
       return
     end
-    if topic == :ALL
-      inform(itype, inform_data)
-      membership_topics.each {|m| inform(itype, inform_data, m[1])}
-      return
-    end
 
-    topic ||= @topics.first
     if inform_data.is_a? Hash
       inform_data = Hashie::Mash.new(inform_data) if inform_data.class == Hash
       #idata = inform_data.dup
@@ -552,12 +563,11 @@ class OmfRc::ResourceProxy::AbstractResource
 
     message.itype = itype
     unless itype == :released
-      #message[:uid] ||= self.uid
-      #message[:type] ||= self.type
       message[:hrn] ||= self.hrn if self.hrn
     end
 
-    topic.publish(message)
+    # 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?
@@ -569,12 +579,17 @@ class OmfRc::ResourceProxy::AbstractResource
 
   def inform_error(reason)
     error reason
-    inform :error, {reason: reason}
+    inform :error, { reason: reason }
+  end
+
+  def inform_creation_failed(reason)
+    error reason
+    inform :creation_failed, { reason: reason }
   end
 
   def inform_warn(reason)
     warn reason
-    inform :warn, {reason: reason}
+    inform :warn, { reason: reason }
   end
 
   # Return a hash describing a reference to this object
@@ -591,11 +606,12 @@ class OmfRc::ResourceProxy::AbstractResource
   # @param [String] name of the topic
   # @return [Array<OmfRc::ResourceProxy::AbstractResource>]
   def objects_by_topic(name)
-    if name == uid || membership.include?(name)
+    if name == uid || membership.any? { |m| m.include?(name) }
       objs = [self]
     else
-      objs = children.find_all { |v| v.uid == name || v.membership.include?(name)}
+      objs = children.find_all { |v| v.uid == name || v.membership.any? { |m| m.include?(name) } }
     end
+    objs
   end
 
   # Retrieve replyto address
@@ -644,4 +660,20 @@ class OmfRc::ResourceProxy::AbstractResource
 
     call_hook(:after_initial_configured, res_ctx)
   end
+
+  # Getting property status, adding them to inform message
+  #
+  # @param [OmfRc::ResourceProxy::AbstractResource] res_ctx resource object it applies to
+  # @param [Array] msg_props a set of property names coming via configure/create message
+  def add_prop_status_to_response(res_ctx, msg_props, response)
+    msg_props.each do |p|
+      # Property can either be defined as 'request' API call
+      # or just an internal variable, e.g. uid, hrn, etc.
+      if res_ctx.respond_to? "request_#{p}"
+        response[p] = res_ctx.__send__("request_#{p}")
+      elsif res_ctx.respond_to? p
+        response[p] = res_ctx.__send__(p)
+      end
+    end
+  end
 end

data/lib/omf_rc/resource_proxy/application.rb

@@ -475,7 +475,7 @@ module OmfRc::ResourceProxy::Application
   # @return [String] the full command line
   # @!macro work
   work('build_command_line') do |res|
-    cmd_line = "env -i " # Start with a 'clean' environments
+    cmd_line = "env -i " # Start with a 'clean' environment
     res.property.environments.each do |e,v|
       val = v.kind_of?(String) ? "'#{v}'" : v
       cmd_line += "#{e.to_s.upcase}=#{val} "

data/lib/omf_rc/util/common_tools.rb

@@ -41,11 +41,10 @@ module OmfRc::Util::CommonTools
   #
   %w(error warn).each do |type|
     work("log_inform_#{type}") do |res, msg|
-      logger.send(type, msg)
-      OmfCommon.comm.publish(
-        res.uid,
-        OmfCommon::Message.create(:inform, { reason: msg }, { itype: type.upcase })
-      )
+      res.send(type, msg, res.uid)
+      res.topics.first.inform(type.to_sym,
+                              { reason: msg },
+                              { src: res.resource_address })
     end
   end
 

data/lib/omf_rc/util/ip.rb

@@ -45,7 +45,7 @@ module OmfRc::Util::Ip
   # @!method configure_ip_addr
   configure :ip_addr do |resource, value|
     if value.nil? || value.split('/')[1].nil?
-      raise ArgumentError, "You need to provide an IP address with netmask. E.g. 0.0.0.0/24. Got #{value}."
+      raise ArgumentError, "You need to provide a netmask with the IP address, e.g. #{value}/24. Got #{value}."
     end
     # Remove all ip addrs associated with the device
     resource.flush_ip_addrs

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.3"
+  VERSION = "6.0.4.pre.1"
 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.2"
+  s.add_runtime_dependency "omf_common", "~> 6.0.4.pre.1"
   s.add_runtime_dependency "cocaine", "~> 0.3.0"
   s.add_runtime_dependency "mocha"
 end

data/test/omf_rc/resource_proxy/abstract_resource_spec.rb

@@ -14,6 +14,7 @@ module OmfRc::ResourceProxy
     include OmfRc::ResourceProxyDSL
     register_proxy :parent
 
+    property :p0
     request :test_exception do
       raise StandardError
     end
@@ -33,45 +34,13 @@ end
 
 describe AbstractResource do
   before do
-    # Things we need to mock
-    # * communicator
-    # * topic
-    # * calling communicator callbacks
-    @comm = mock
-    @topics = {
-      parent: OmfCommon::Comm::Topic.create(:parent),
-      child:  OmfCommon::Comm::Topic.create(:child)
-    }
-    [:inform, :publish, :unsubscribe].each do |m_name|
-      OmfCommon::Comm::Topic.any_instance.stubs(m_name)
-    end
-
-    # Return child topic by default unless specified
-    @comm.stubs(:create_topic).returns(@topics[:child])
-
-    [:parent, :child].each do |t_name|
-      @topics[t_name].stubs(:address).returns("xmpp://localhost/#{t_name.to_s}")
-      @comm.stubs(:create_topic).with("xmpp://localhost/#{t_name}").returns(@topics[t_name])
-    end
-
-    @comm.class_eval do
-      define_method(:subscribe) do |*args, &block|
-        block.call(self.create_topic("xmpp://localhost/#{args[0]}"))
-      end
-    end
-
-    OmfCommon.stubs(:comm).returns(@comm)
+    mock_comm_in_res_proxy
+    mock_topics_in_res_proxy(resources: [:parent, :child], default: :child)
     @parent = OmfRc::ResourceFactory.create(:parent, { uid: :parent, hrn: 'default_node' }, { create_children_resources: true })
   end
 
   after do
-    @comm.class_eval do
-      undef_method(:subscribe)
-    end
-    OmfCommon.unstub(:comm)
-    [:inform, :publish, :unsubscribe].each do |m_name|
-      OmfCommon::Comm::Topic.any_instance.unstub(m_name)
-    end
+    unmock_comm_in_res_proxy
     @parent = nil
   end
 
@@ -80,6 +49,12 @@ describe AbstractResource do
       OmfRc::ResourceFactory.create(:parent).uid.must_match /.{8}-.{4}-.{4}-.{4}-.{12}/
     end
 
+    it "must be able to initialise properties" do
+      p = OmfRc::ResourceFactory.create(:parent, { p0: 'bob', uid: 'unique' })
+      p.request_p0.must_equal 'bob'
+      p.request_uid.must_equal 'unique'
+    end
+
     it "must be able to keep state inside 'property' instnace variable" do
       @parent.property.bob = "test"
       @parent.property.bob.must_equal "test"
@@ -90,9 +65,9 @@ describe AbstractResource do
     end
 
     it "must returned all the properties can be requested & configured" do
-      @parent.request_available_properties.configure.must_equal [:membership]
+      @parent.request_available_properties.configure.must_equal [:p0, :membership]
       @parent.request_available_properties.request.must_equal(
-        [:test_exception, :supported_children_type, :uid, :type, :hrn, :name, :membership, :child_resources]
+        [:p0, :test_exception, :supported_children_type, :uid, :type, :hrn, :name, :membership, :child_resources]
       )
     end
 
@@ -134,66 +109,29 @@ describe AbstractResource do
   end
 
   describe "when interacted with communication layer" do
-    #include EM::MiniTest::Spec
-
-    before do
-      #@client = Blather::Client.new
-      #@stream = MiniTest::Mock.new
-      #@stream.expect(:send, true, [Blather::Stanza])
-      #@client.post_init @stream, Blather::JID.new('n@d/r')
-      #@xmpp = OmfCommon::Comm::XMPP::Communicator.new
-    end
-
     it "must be able to send inform message" do
-      skip
-      # FIXME
-      @xmpp.stub :publish, proc { |replyto, message| message.valid?.must_equal true} do
-        @parent.inform(:creation_ok, res_id: 'bob', cid: 'id', replyto: 'topic')
-        @parent.inform(:released, res_id: 'bob', cid: 'id', replyto: 'topic')
-        @parent.inform(:status, status: { key: 'value' }, cid: 'id', replyto: 'topic')
-        @parent.inform(:creation_ok, res_id: 'bob', cid: 'id', replyto: 'topic')
-        @parent.inform(:warn, 'going to fail')
-        @parent.inform(:error, 'failed')
-        @parent.inform(:warn, Exception.new('going to fail'))
-        @parent.inform(:error, Exception.new('failed'))
-        @parent.inform(:creation_failed, Exception.new('failed'))
-      end
-
-      lambda { @parent.inform(:creation_failed, 'bob') }.must_raise ArgumentError
-      lambda { @parent.inform(:creation_ok, 'topic') }.must_raise ArgumentError
-      lambda { @parent.inform(:status, 'topic') }.must_raise ArgumentError
-    end
-
-    it "must be able to connect & disconnect" do
-      skip
-      Blather::Client.stub :new, @client do
-        Blather::Stream::Client.stub(:start, @client) do
-          @parent = OmfRc::ResourceFactory.create(:node, { hrn: 'default_node', user: 'bob', password: 'pw', server: 'example.com'}, @xmpp)
-          @client.stub(:connected?, true) do
-            @parent.connect
-            @parent.comm.conn_info.must_equal({proto: :xmpp, user: 'bob', doamin: 'example.com'})
-          end
-        end
-      end
+      @parent.inform(:creation_ok, res_id: 'bob')
+      @parent.inform(:released, res_id: 'bob')
+
+      @parent.inform_status(key: 'value')
+      @parent.inform_warn('going to fail')
+      @parent.inform_error('failed')
+      @parent.inform_creation_failed('failed')
     end
   end
 
-  describe "when request/configure property not pre-defined in proxy" do
-    it "must try property hash" do
-      skip
+  describe "when request/configure property not pre-defined in proxy (adhoc)" do
+    it "must try property hash for internal usage" do
       @parent.property[:bob] = "bob"
-      @parent.property[:false] = false
-
-      @parent.methods.must_include :request_bob
-      @parent.methods.must_include :configure_bob
-
-      @parent.request_bob.must_equal "bob"
-      @parent.request_false.must_equal false
+      @parent.property[:boolean] = false
+      @parent.property.bob.must_equal "bob"
+      @parent.property.boolean.must_equal false
+    end
 
-      @parent.configure_bob("not_bob")
-      @parent.request_bob.must_equal "not_bob"
-      proc { @parent.request_bobs_cousin }.must_raise OmfRc::UnknownPropertyError
-      proc { @parent.bobs_cousin }.must_raise NoMethodError
+    it "wont create request/configure method for such property" do
+      @parent.methods.wont_include :request_bob
+      @parent.methods.wont_include :configure_bob
+      proc { @parent.request_bob }.must_raise NoMethodError
     end
   end
 
@@ -209,7 +147,7 @@ describe AbstractResource do
       @parent.process_omf_message(@request_msg, @topics[:parent])
     end
 
-    it "must resuce exception if occured" do
+    it "must rescue exception if occurred" do
       @parent.process_omf_message(OmfCommon::Message.create(:request, { test_exception: nil }), @topics[:parent])
     end
 

data/test/omf_rc/resource_proxy/node_spec.rb

@@ -8,12 +8,14 @@ require 'omf_rc/resource_proxy/node'
 
 describe OmfRc::ResourceProxy::Node do
   before do
-    @xmpp = MiniTest::Mock.new
-    @xmpp.expect(:subscribe, true, [String])
+    mock_comm_in_res_proxy
+    mock_topics_in_res_proxy(resources: [:n0, :app_test], default: :n0)
+    @node = OmfRc::ResourceFactory.create(:node, { uid: :n0, hrn: 'node_test'})
+  end
 
-    OmfCommon.stub :comm, @xmpp do
-      @node = OmfRc::ResourceFactory.create(:node, hrn: 'node_test')
-    end
+  after do
+    unmock_comm_in_res_proxy
+    @node = nil
   end
 
   describe "when included in the resource instance" do
@@ -46,32 +48,26 @@ describe OmfRc::ResourceProxy::Node do
     end
 
     it "must provide a list of created applications" do
-      OmfCommon.stub :comm, @xmpp do
-        @xmpp.expect(:subscribe, true, [String])
-        @node.create(:application, { :uid => 'app_test', :hrn => 'app_test' })
+      @node.create(:application, { uid: 'app_test', hrn: 'app_test' })
 
-        @node.request_applications.must_equal [
-          { name: 'app_test', type: :application, uid: 'app_test' }
-        ]
-      end
+      @node.request_applications.must_equal [
+        { name: 'app_test', type: :application, uid: 'app_test' }
+      ]
     end
 
     it "must provide a list of created interfaces" do
-      OmfCommon.stub :comm, @xmpp do
-        devices = [
-          { name: 'eth0', driver: 'e1000e', category: 'net', proxy: 'net' },
-          { name: 'phy0', driver: 'iwlwifi', category: 'net', subcategory: 'wlan', proxy: 'wlan' }
-        ]
-        @node.stub :request_devices, devices do
-          2.times { @xmpp.expect(:subscribe, true, [String]) }
-          @node.create(:wlan, { :uid => 'wlan0', :if_name => 'wlan0' })
-          @node.create(:net, { :uid => 'eth0', :if_name => 'eth0' })
+      devices = [
+        { name: 'eth0', driver: 'e1000e', category: 'net', proxy: 'net' },
+        { name: 'phy0', driver: 'iwlwifi', category: 'net', subcategory: 'wlan', proxy: 'wlan' }
+      ]
+      @node.stub :request_devices, devices do
+        @node.create(:wlan, { :uid => 'wlan0', :if_name => 'wlan0' })
+        @node.create(:net, { :uid => 'eth0', :if_name => 'eth0' })
 
-          @node.request_interfaces.must_equal [
-            { name: 'eth0', type: :net, uid: 'eth0' },
-            { name: 'wlan0', type: :wlan, uid: 'wlan0' }
-          ]
-        end
+        @node.request_interfaces.must_equal [
+          { name: 'eth0', type: :net, uid: 'eth0' },
+          { name: 'wlan0', type: :wlan, uid: 'wlan0' }
+        ]
       end
     end
   end

data/test/omf_rc/resource_proxy_dsl_spec.rb

@@ -8,8 +8,8 @@ require 'omf_rc/resource_proxy_dsl'
 
 describe OmfRc::ResourceProxyDSL do
   before do
-    @xmpp = MiniTest::Mock.new
-    @xmpp.expect(:subscribe, true, [String])
+    mock_comm_in_res_proxy
+    mock_topics_in_res_proxy(resources: [:mp0, :mrp0, :up0])
 
     module OmfRc::Util::MockUtility
       include OmfRc::ResourceProxyDSL
@@ -71,31 +71,33 @@ describe OmfRc::ResourceProxyDSL do
     end
   end
 
+  after do
+    unmock_comm_in_res_proxy
+  end
+
   describe "when included by modules to define resource proxy functionalities" do
     it "must be able to register the modules" do
       OmfRc::ResourceFactory.proxy_list.must_include :mock_proxy
     end
 
     it "must be able to define methods" do
-      OmfCommon.stub :comm, @xmpp do
-        %w(configure_alpha request_alpha bravo).each do |m|
-          OmfRc::Util::MockUtility.method_defined?(m.to_sym).must_equal true
-        end
+      %w(configure_alpha request_alpha bravo).each do |m|
+        OmfRc::Util::MockUtility.method_defined?(m.to_sym).must_equal true
+      end
 
-        %w(configure_alpha request_alpha before_ready before_release bravo).each do |m|
-          OmfRc::ResourceProxy::MockProxy.method_defined?(m.to_sym).must_equal true
-        end
+      %w(configure_alpha request_alpha before_ready before_release bravo).each do |m|
+        OmfRc::ResourceProxy::MockProxy.method_defined?(m.to_sym).must_equal true
+      end
 
-        mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy)
-        mock_proxy.request_alpha.must_equal mock_proxy.uid
-        mock_proxy.request_delta.must_equal "printing"
-        mock_proxy.request_charlie.must_equal "working on printing"
-        mock_proxy.bravo("magic", "second parameter") do |v|
-          v.must_equal "working on magic"
-        end
-        mock_proxy.bravo("something", "something else").must_equal "something"
-        mock_proxy.request_zulu(country: 'uk').must_equal "You called zulu with: country"
+      mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy, uid: :mp0)
+      mock_proxy.request_alpha.must_equal mock_proxy.uid
+      mock_proxy.request_delta.must_equal "printing"
+      mock_proxy.request_charlie.must_equal "working on printing"
+      mock_proxy.bravo("magic", "second parameter") do |v|
+        v.must_equal "working on magic"
       end
+      mock_proxy.bravo("something", "something else").must_equal "something"
+      mock_proxy.request_zulu(country: 'uk').must_equal "You called zulu with: country"
     end
 
     it "must be able to include utility" do
@@ -116,39 +118,30 @@ describe OmfRc::ResourceProxyDSL do
     end
 
     it "must check new proxy's create_by option when ask a proxy create a new proxy" do
-      OmfCommon.stub :comm, @xmpp do
-        @xmpp.expect(:subscribe, true, [String])
-        OmfRc::ResourceFactory.create(:mock_root_proxy).create(:mock_proxy)
-        2.times { @xmpp.expect(:subscribe, true, [String]) }
-        OmfRc::ResourceFactory.create(:mock_root_proxy).create(:useless_proxy)
-        2.times { @xmpp.expect(:subscribe, true, [String]) }
-        lambda { OmfRc::ResourceFactory.create(:useless_proxy).create(:mock_proxy) }.must_raise StandardError
-      end
+      OmfRc::ResourceFactory.create(:mock_root_proxy, uid: :mrp0).create(:mock_proxy, uid: :mp0)
+      OmfRc::ResourceFactory.create(:mock_root_proxy, uid: :mrp0).create(:useless_proxy, uid: :up0)
+      lambda { OmfRc::ResourceFactory.create(:useless_proxy, uid: :mrp0).create(:mock_proxy, uid: :mp0) }.must_raise StandardError
     end
 
     it "must be able to define property with default vlaue" do
-      OmfCommon.stub :comm, @xmpp do
-        mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy)
-        mock_proxy.property.mock_prop.must_equal 1
-        mock_proxy.request_mock_prop.must_equal 1
-        mock_proxy.configure_mock_prop(2)
-        mock_proxy.request_mock_prop.must_equal 2
-      end
+      mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy, uid: :mp0)
+      mock_proxy.property.mock_prop.must_equal 1
+      mock_proxy.request_mock_prop.must_equal 1
+      mock_proxy.configure_mock_prop(2)
+      mock_proxy.request_mock_prop.must_equal 2
     end
 
 
     it "must define associate methods when access option given to property definition" do
-      OmfCommon.stub :comm, @xmpp do
-        mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy)
-        # Ready only
-        mock_proxy.request_read_only_prop.must_equal 1
-        lambda { mock_proxy.init_read_only_prop }.must_raise NoMethodError
-        lambda { mock_proxy.configure_read_only_prop }.must_raise NoMethodError
-        # Init only
-        mock_proxy.request_init_only_prop.must_equal 1
-        lambda { mock_proxy.init_init_only_prop }.must_raise NoMethodError
-        lambda { mock_proxy.configure_init_only_prop }.must_raise NoMethodError
-      end
+      mock_proxy = OmfRc::ResourceFactory.create(:mock_proxy, uid: :mp0)
+      # Ready only
+      mock_proxy.request_read_only_prop.must_equal 1
+      lambda { mock_proxy.init_read_only_prop }.must_raise NoMethodError
+      lambda { mock_proxy.configure_read_only_prop }.must_raise NoMethodError
+      # Init only
+      mock_proxy.request_init_only_prop.must_equal 1
+      lambda { mock_proxy.init_init_only_prop }.must_raise NoMethodError
+      lambda { mock_proxy.configure_init_only_prop }.must_raise NoMethodError
     end
   end
 end

data/test/omf_rc/util/common_tools_spec.rb

@@ -7,7 +7,7 @@ require 'test_helper'
 require 'omf_rc/util/common_tools'
 
 describe OmfRc::Util::CommonTools do
-  
+
   describe "when included in the resource proxy" do
     before do
       module OmfRc::ResourceProxy::Test
@@ -15,18 +15,19 @@ describe OmfRc::Util::CommonTools do
         register_proxy :test
         utility :common_tools
       end
+      mock_comm_in_res_proxy
+      mock_topics_in_res_proxy(resources: [:t0])
+      @test = OmfRc::ResourceFactory.create(:test, uid: :t0)
+    end
 
-      @xmpp = MiniTest::Mock.new
-      @xmpp.expect(:subscribe, true, [String])
+    after do
+      unmock_comm_in_res_proxy
+      @test = nil
     end
 
     it "must be able to log and inform error/warn messages" do
-      OmfCommon.stub :comm, @xmpp do
-        @test = OmfRc::ResourceFactory.create(:test)
-        2.times { @xmpp.expect(:publish, true, [String, OmfCommon::Message]) }
-        @test.log_inform_error "bob"
-        @test.log_inform_warn "bob"
-      end
+      @test.log_inform_error "bob"
+      @test.log_inform_warn "bob"
     end
   end
 end

data/test/omf_rc/util/ip_spec.rb

@@ -17,14 +17,16 @@ describe OmfRc::Util::Ip do
         utility :ip
       end
 
-      @xmpp = MiniTest::Mock.new
-      @xmpp.expect(:subscribe, true, [String])
-
       @command = MiniTest::Mock.new
 
-      OmfCommon.stub :comm, @xmpp do
-        @wlan00 = OmfRc::ResourceFactory.create(:ip_test, hrn: 'wlan00')
-      end
+      mock_comm_in_res_proxy
+      mock_topics_in_res_proxy(resources: [:w00])
+      @wlan00 = OmfRc::ResourceFactory.create(:ip_test, uid: :w00, hrn: 'wlan00')
+    end
+
+    after do
+      unmock_comm_in_res_proxy
+      @wlan00 = nil
     end
 
     it "must provide features defined in proxy" do

data/test/omf_rc/util/iw_spec.rb

@@ -29,12 +29,14 @@ Cocaine::CommandLine.stub(:new, @command) do
           property :phy
         end
 
-        @xmpp = MiniTest::Mock.new
-        @xmpp.expect(:subscribe, true, [String])
+        mock_comm_in_res_proxy
+        mock_topics_in_res_proxy(resources: [:w00])
+        @wlan00 = OmfRc::ResourceFactory.create(:iw_test, uid: :w00, hrn: 'wlan00', phy: 'phy00', if_name: 'wlan1')
+      end
 
-        OmfCommon.stub :comm, @xmpp do
-          @wlan00 = OmfRc::ResourceFactory.create(:iw_test, hrn: 'wlan00', property: { phy: 'phy00', if_name: 'wlan1' })
-        end
+      after do
+        unmock_comm_in_res_proxy
+        @wlan00 = nil
       end
 
       it "must provide features defined in proxy" do

data/test/omf_rc/util/mod_spec.rb

@@ -15,30 +15,32 @@ describe OmfRc::Util::Mod do
         utility :mod
       end
       @command = MiniTest::Mock.new
-      @xmpp = MiniTest::Mock.new
-      @xmpp.expect(:subscribe, true, [String])
+
+      mock_comm_in_res_proxy
+      mock_topics_in_res_proxy(resources: [:mt0])
+      @mod_test = OmfRc::ResourceFactory.create(:mod_test, uid: :mt0)
+    end
+
+    after do
+      unmock_comm_in_res_proxy
+      @mod_test = nil
     end
 
     it "will find out a list of modules" do
-      OmfCommon.stub :comm, @xmpp do
-        Cocaine::CommandLine.stub(:new, @command) do
-          @command.expect(:run, fixture("lsmod"))
-          OmfRc::ResourceFactory.create(:mod_test).request_modules.must_include "kvm"
-          @command.expect(:run, fixture("lsmod"))
-          @xmpp.expect(:subscribe, true, [String])
-          OmfRc::ResourceFactory.create(:mod_test).request_modules.wont_include "Module"
-          @command.verify
-        end
+      Cocaine::CommandLine.stub(:new, @command) do
+        @command.expect(:run, fixture("lsmod"))
+        @mod_test.request_modules.must_include "kvm"
+        @command.expect(:run, fixture("lsmod"))
+        @mod_test.request_modules.wont_include "Module"
+        @command.verify
       end
     end
 
     it "could load a module" do
-      OmfCommon.stub :comm, @xmpp do
-        Cocaine::CommandLine.stub(:new, @command) do
-          @command.expect(:run, true)
-          OmfRc::ResourceFactory.create(:mod_test).configure_load_module(name: 'magic_module').must_equal "magic_module loaded"
-          @command.verify
-        end
+      Cocaine::CommandLine.stub(:new, @command) do
+        @command.expect(:run, true)
+        @mod_test.configure_load_module(name: 'magic_module').must_equal "magic_module loaded"
+        @command.verify
       end
     end
   end

data/test/test_helper.rb

@@ -25,5 +25,48 @@ def fixture(name)
   File.read("#{FIXTURE_DIR}/#{name.to_s}")
 end
 
+def mock_comm_in_res_proxy
+  @comm = mock
+
+  [:inform, :publish, :unsubscribe].each do |m_name|
+    OmfCommon::Comm::Topic.any_instance.stubs(m_name)
+  end
+
+  @comm.class_eval do
+    define_method(:subscribe) do |*args, &block|
+      block.call(self.create_topic("xmpp://localhost/#{args[0]}"))
+    end
+  end
+
+  OmfCommon.stubs(:comm).returns(@comm)
+end
+
+def mock_topics_in_res_proxy(options)
+  @topics = {}.tap do |hash|
+    options[:resources].each do |r|
+      hash[r] = OmfCommon::Comm::Topic.create(:parent)
+    end
+  end
+
+  if (default_r = options[:default]) && options[:resources].include?(default_r)
+    # Return default topic unless specified
+    @comm.stubs(:create_topic).returns(@topics[default_r])
+  end
+  options[:resources].each do |t_name|
+    @topics[t_name].stubs(:address).returns("xmpp://localhost/#{t_name.to_s}")
+    @comm.stubs(:create_topic).with("xmpp://localhost/#{t_name}").returns(@topics[t_name])
+  end
+end
+
+def unmock_comm_in_res_proxy
+  @comm.class_eval do
+    undef_method(:subscribe)
+  end
+  OmfCommon.unstub(:comm)
+  [:inform, :publish, :unsubscribe].each do |m_name|
+    OmfCommon::Comm::Topic.any_instance.unstub(m_name)
+  end
+end
+
 OmfCommon::Message.init(type: :xml)
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.0.3
-  prerelease: 
+  version: 6.0.4.pre.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,23 +69,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.4.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.4.pre.1
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -130,6 +115,7 @@ email:
 executables:
 - install_omf_rc
 - omf_rc
+- plc_trigger_omf_rc
 extensions: []
 extra_rdoc_files: []
 files:
@@ -138,6 +124,7 @@ files:
 - Rakefile
 - bin/install_omf_rc
 - bin/omf_rc
+- bin/plc_trigger_omf_rc
 - config/config.yml
 - config/config_with_authentication.yml.example
 - config/config_with_extensions.yml.example
@@ -200,29 +187,25 @@ 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: 4426195785601747847
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_rc
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OMF resource controller
 test_files: []