omf_rc 6.0.0.pre.8 → 6.0.0.pre.9

data/lib/omf_rc/resource_proxy/application.rb

@@ -32,10 +32,10 @@
 # - pkg_ubuntu (String) the name of the Ubuntu package for this app
 # - pkg_fedora (String) the name of the Fedora package for this app
 # - state (String) the state of this Application RP
-#   (stop, run, pause, install)
+#   (stopped, running, paused, installed, completed)
 # - installed (Boolean) is this application installed? (default false)
 # - force_tarball_install (Boolean) if true then force the installation
-#   from tarball even if other distribution-specific installation are 
+#   from tarball even if other distribution-specific installation are
 #   available (default false)
 # - map_err_to_out (Boolean) if true then map StdErr to StdOut for this
 #   app (default false)
@@ -107,7 +107,7 @@ module OmfRc::ResourceProxy::Application
   property :force_tarball_install, :default => false
   property :pkg_ubuntu, :default => nil
   property :pkg_fedora, :default => nil
-  property :state, :default => :stop
+  property :state, :default => :stopped
   property :installed, :default => false
   property :map_err_to_out, :default => false
   property :event_sequence, :default => 0
@@ -137,18 +137,19 @@ module OmfRc::ResourceProxy::Application
       logger.info "App Event from '#{app_id}' "+
                   "(##{res.property.event_sequence}) - "+
                   "#{event_type}: '#{msg}'"
-      res.property.state = :stop if event_type.to_s.include?('DONE')
+      if event_type.to_s.include?('DONE')
+        res.property.state = app_id.include?("_INSTALL") ? :stopped : :completed
+      end
 
       (res.membership + [res.uid]).each do |m|
         res.inform(:status, {
-          inform_to: m,
-          status: { status_type: 'APP_EVENT',
-                    event: event_type.to_s.upcase,
-                    app: app_id,
-                    msg: msg,
-                    seq: res.property.event_sequence,
-                    uid: res.uid }
-        })
+          status_type: 'APP_EVENT',
+          event: event_type.to_s.upcase,
+          app: app_id,
+          msg: msg,
+          seq: res.property.event_sequence,
+          uid: res.uid
+        }, m == res.uid ? nil : res.membership_topics[m])
       end
 
       res.property.event_sequence += 1
@@ -215,52 +216,56 @@ module OmfRc::ResourceProxy::Application
   end
 
   # Configure the state of this Application RP. The valid states are
-  # stop, run, pause, install. The semantic of each states are:
+  # stopped, running, paused, installing. The semantic of each states are:
   #
-  # - stop: the initial state for an Application RP, and the final state for
-  #   an applicaiton RP, for which the application instance finished
-  #   its execution or its installation
-  # - run: upon entering in this state, a new instance of the application is
+  # - stopped: the initial state for an Application RP
+  # - completed: the final state for an applicaiton RP. When the application
+  #   has been executed and its execution is finished, it enters this state.
+  #   When the application is completed it cannot change state again
+  #   TODO: maybe in future OMF, we could consider allowing an app to be reset?
+  # - running: upon entering in this state, a new instance of the application is
   #   started, the Application RP stays in this state until the
   #   application instance is finished or paused. The Application RP can
-  #   only enter this state from a previous 'pause' or 'stop' state.
-  # - pause: upon entering this state, the currently running instance of this
+  #   only enter this state from a previous paused or stopped state.
+  # - paused: upon entering this state, the currently running instance of this
   #   application should be paused (it is the responsibility of
-  #   specialised Application Proxy to ensure that! The default
+  #   specialised Application Proxy to ensure that! This default
   #   Application Proxy does nothing to the application instance when
   #   entering this state). The Application RP can only enter this
-  #   state from a previous 'run' state.
-  # - install: upon entering in this state, a new installation of the
+  #   state from a previous running state.
+  # - installing: upon entering in this state, a new installation of the
   #   application will be performed by the Application RP, which will
-  #   stay in this state until the installation is finished. The
-  #   Application RP can only enter this state from a previous 'stop'
-  #   state, and can only enter a 'stop' state once the installation
-  #   is finished.
-  #   Supported install methods are: Tarball, Ubuntu, and Fedora
+  #   stay in this state until the installation is done. The
+  #   Application RP can only enter this state from a previous stopped
+  #   state. Furthermore it can only exit this state to enter the stopped state
+  #   only when the installatio is done. Supported install methods are: Tarball,
+  #   Ubuntu, and Fedora
   #
   # @yieldparam [String] value the state to set this app into
   #
   configure :state do |res, value|
     case value.to_s.downcase.to_sym
-    when :install then res.switch_to_install
-    when :stop then res.switch_to_stop
-    when :run then res.switch_to_run
-    when :pause then res.switch_to_pause
+    when :installing then res.switch_to_installing
+    when :stopped then res.switch_to_stopped
+    when :running then res.switch_to_running
+    when :paused then res.switch_to_paused
+    else
+      res.log_inform_warn "Cannot switch application to unknown state '#{value.to_s}'!"
     end
     res.property.state
   end
 
-  # Swich this Application RP into the 'install' state
+  # Swich this Application RP into the 'installing' state
   # (see the description of configure :state)
   #
-  work('switch_to_install') do |res|
-    if res.property.state.to_sym == :stop
+  work('switch_to_installing') do |res|
+    if res.property.state.to_sym == :stopped
       if res.property.installed
         res.log_inform_warn "The application is already installed"
       else
         # Select the proper installation method based on the platform
         # and the value of 'force_tarball_install'
-        res.property.state = :install
+        res.property.state = :installing
         if res.property.force_tarball_install ||
           (res.property.platform == :unknown)
           installing = res.install_tarball(res.property.pkg_tarball,
@@ -270,19 +275,19 @@ module OmfRc::ResourceProxy::Application
         elsif res.property.platform == :fedora
           installing = res.install_fedora(res.property.pkg_fedora)
         end
-        res.property.state = :stop unless installing
+        res.property.state = :stopped unless installing
       end
     else
       # cannot install as we are not stopped
-      res.log_inform_warn "Not in STOP state. Cannot switch to INSTALL state!"
+      res.log_inform_warn "Not in stopped state. Cannot switch to installing state!"
     end
   end
 
-  # Swich this Application RP into the 'stop' state
+  # Swich this Application RP into the 'stopped' state
   # (see the description of configure :state)
   #
-  work('switch_to_stop') do |res|
-    if res.property.state == :run || res.property.state == :pause
+  work('switch_to_stopped') do |res|
+    if res.property.state == :running || res.property.state == :paused
       id = res.property.app_id
       unless ExecApp[id].nil?
         # stop this app
@@ -299,18 +304,18 @@ module OmfRc::ResourceProxy::Application
             # finally, try sending KILL signal
             ExecApp[id].kill('KILL') unless ExecApp[id].nil?
           end
-          res.property.state = :stop
+          res.property.state = :completed
         rescue => err
         end
       end
     end
   end
 
-  # Swich this Application RP into the 'run' state
+  # Swich this Application RP into the 'running' state
   # (see the description of configure :state)
   #
-  work('switch_to_run') do |res|
-    if res.property.state == :stop
+  work('switch_to_running') do |res|
+    if res.property.state == :stopped
       # start a new instance of this app
       res.property.app_id = res.hrn.nil? ? res.uid : res.hrn
       # we need at least a defined binary path to run an app...
@@ -320,25 +325,25 @@ module OmfRc::ResourceProxy::Application
         ExecApp.new(res.property.app_id, res,
                     res.build_command_line,
                     res.property.map_err_to_out)
-        res.property.state = :run
+        res.property.state = :running
       end
-    elsif res.property.state == :pause
+    elsif res.property.state == :paused
       # resume this paused app
-      res.property.state = :run
+      res.property.state = :running
       # do more things here...
-    elsif res.property.state == :install
-      # cannot run as we are still installing
-      res.log_inform_warn "Still in INSTALL state. Cannot switch to RUN state!"
+    else
+      # cannot run as we are still installing or already completed
+      res.log_inform_warn "Cannot switch to running state as current state is '#{res.property.state}'"
     end
   end
 
-  # Swich this Application RP into the 'pause' state
+  # Swich this Application RP into the 'paused' state
   # (see the description of configure :state)
   #
-  work('switch_to_pause') do |res|
-    if res.property.state == :run
+  work('switch_to_paused') do |res|
+    if res.property.state == :running
       # pause this app
-      res.property.state = :pause
+      res.property.state = :paused
       # do more things here...
     end
   end
@@ -354,12 +359,12 @@ module OmfRc::ResourceProxy::Application
     # Only update a parameter if it is dynamic and the application is running
     dynamic = false
     dynamic = att[:dynamic] if res.boolean?(att[:dynamic])
-    if dynamic && res.property.state == :run
+    if dynamic && res.property.state == :running
       line = ""
       line += "#{att[:cmd]} " unless att[:cmd].nil?
       line += "#{att[:value]}"
       ExecApp[res.property.app_id].stdin(line)
-      logger.info "Updated parameter #{name} with value #{att[:value].inspect}"
+      logger.info "Updated parameter '#{name}' with value '#{att[:value].inspect}' (stdin: '#{line}')"
     end
   end
 

data/lib/omf_rc/resource_proxy/net.rb

@@ -1,8 +1,8 @@
 module OmfRc::ResourceProxy::Net
   include OmfRc::ResourceProxyDSL
-
+  
   register_proxy :net
-
+  property :if_name, :default => "eth0"
   utility :ip
   utility :sysfs
 end

data/lib/omf_rc/resource_proxy/node.rb

@@ -11,8 +11,8 @@ module OmfRc::ResourceProxy::Node
   end
 
   request :interfaces do |node|
-    node.children.find_all { |v| v.type == 'net' || v.type == 'wlan' }.map do |v|
-      { name: v.hrn, type: v.type, uid: v.uid }
+    node.children.find_all { |v| v.type == :net || v.type == :wlan }.map do |v|
+      { name: v.property.if_name, type: v.type, uid: v.uid }
     end.sort { |x, y| x[:name] <=> y[:name] }
   end
 
@@ -22,4 +22,13 @@ module OmfRc::ResourceProxy::Node
     end.sort { |x, y| x[:name] <=> y[:name] }
   end
 
+  hook :before_create do |node, type, opts|
+    if type.to_sym == :net
+      net_dev = node.request_devices.find do |v|
+        v[:name] == opts[:if_name]
+      end
+      raise "Device '#{opts[:if_name]}' not found" if net_dev.nil?
+    end
+  end
+
 end

data/lib/omf_rc/resource_proxy/virtual_machine.rb

@@ -95,7 +95,7 @@
 #
 #    # Define a new event to run the VM resource once it is 'ready'
 #    vm_topic.on_message do |m|
-#      if (m.operation == :inform) && (m.read_content("inform_type") == 'STATUS') && m.read_property('ready')
+#      if (m.operation == :inform) && (m.read_content("itype") == 'STATUS') && m.read_property('ready')
 #        conf_vm_run.publish vm_topic.id    
 #      end
 #    end

data/lib/omf_rc/resource_proxy/wlan.rb

@@ -8,6 +8,8 @@ module OmfRc::ResourceProxy::Wlan
   utility :iw
   utility :sysfs
 
+  property :if_name, :default => "wlan0"
+
   hook :before_release do |device|
     case device.property.mode.to_sym
     when :master

data/lib/omf_rc/resource_proxy_dsl.rb

@@ -4,6 +4,8 @@ module OmfRc::ResourceProxyDSL
   PROXY_DIR = "omf_rc/resource_proxy"
   UTIL_DIR = "omf_rc/util"
 
+  DEF_ACCESS = [:configure, :request]
+
   def self.included(base)
     base.extend(ClassMethods)
   end
@@ -35,6 +37,7 @@ module OmfRc::ResourceProxyDSL
       if opts[:create_by] && !opts[:create_by].kind_of?(Array)
         opts[:create_by] = [opts[:create_by]]
       end
+      opts[:proxy_module] = self
       OmfRc::ResourceFactory.register_proxy(name => opts)
     end
 
@@ -90,7 +93,7 @@ module OmfRc::ResourceProxyDSL
     #    # * resource: the parent resource itself
     #    # * new_resource: the child resource instance
     #    hook :after_create do |resource, new_resource|
-    #      logger.info "#{resource.uid} created #{new_resource.uid}
+    #      logger.info "#{resource.uid} created #{new_resource.uid}"
     #    end
     #
     #    # before_ready hook
@@ -325,6 +328,24 @@ module OmfRc::ResourceProxyDSL
       define_method("def_property_#{name}") do |*args, &block|
         self.property[name] ||= opts[:default]
       end
+
+      access = opts.access || DEF_ACCESS
+      access.each do |a|
+        case a
+        when :configure
+          define_method("configure_#{name}") do |val|
+            self.property[name] = val
+          end
+
+        when :request
+          define_method("request_#{name}") do
+            self.property[name]
+          end
+
+        else
+          raise "Unnown access type '#{a}'"
+        end
+      end
     end
   end
 end

data/lib/omf_rc/util/common_tools.rb

@@ -37,11 +37,9 @@ module OmfRc::Util::CommonTools
   %w(error warn).each do |type|
     work("log_inform_#{type}") do |res, msg|
       logger.send(type, msg)
-      res.comm.publish(
+      OmfCommon.comm.publish(
         res.uid,
-        OmfCommon::Message.inform(type.upcase) do |message|
-          message.element('reason' , msg)
-        end
+        OmfCommon::Message.create(:inform, nil, { reason: msg, itype: type.upcase })
       )
     end
   end

data/lib/omf_rc/util/hostapd.rb

@@ -1,5 +1,6 @@
 require 'hashie'
 require 'cocaine'
+require 'tempfile'
 
 module OmfRc::Util::Hostapd
   include OmfRc::ResourceProxyDSL
@@ -8,8 +9,8 @@ module OmfRc::Util::Hostapd
   # Initialise access point conf and pid location
   #
   work :init_ap_conf_pid do |device|
-    device.property.ap_conf = "/tmp/hostapd.#{device.hrn}.conf"
-    device.property.ap_pid = "/tmp/hostapd.#{device.hrn}.pid"
+    device.property.ap_conf = Tempfile.new(["hostapd.#{device.property.if_name}", ".conf"]).path
+    device.property.ap_pid = Tempfile.new(["hostapd.#{device.property.if_name}", ".pid"]).path
   end
   # Set up and run a hostapd instance
   #
@@ -17,7 +18,7 @@ module OmfRc::Util::Hostapd
     device.init_ap_conf_pid
 
     File.open(device.property.ap_conf, "w") do |f|
-      f << "driver=nl80211\ninterface=#{device.hrn}\nssid=#{device.property.essid}\nchannel=#{device.property.channel}\n"
+      f << "driver=nl80211\ninterface=#{device.property.if_name}\nssid=#{device.property.essid}\nchannel=#{device.property.channel}\n"
       f << "hw_mode=#{device.property.hw_mode}\n" if %w(a b g).include? device.property.hw_mode
       if device.property.hw_mode == 'n'
         if device.property.channel.to_i < 15

data/lib/omf_rc/util/ip.rb

@@ -5,32 +5,35 @@ module OmfRc::Util::Ip
   include Cocaine
 
   request :ip_addr do |resource|
-    addr = CommandLine.new("ip", "addr show dev :device", :device => resource.hrn).run
+    addr = CommandLine.new("ip", "addr show dev :device", :device => resource.property.if_name).run
     addr && addr.chomp.match(/inet ([[0-9]\:\/\.]+)/) && $1
   end
 
   request :mac_addr do |resource|
-    addr = CommandLine.new("ip", "addr show dev :device", :device => resource.hrn).run
+    addr = CommandLine.new("ip", "addr show dev :device", :device => resource.property.if_name).run
     addr && addr.chomp.match(/link\/ether ([\d[a-f][A-F]\:]+)/) && $1
   end
 
   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}."
+    end
     # Remove all ip addrs associated with the device
     resource.flush_ip_addrs
     CommandLine.new("ip",  "addr add :ip_address dev :device",
                     :ip_address => value,
-                    :device => resource.hrn
+                    :device => resource.property.if_name
                    ).run
     resource.interface_up
     resource.request_ip_addr
   end
 
   work :interface_up do |resource|
-    CommandLine.new("ip", "link set :dev up", :dev => resource.hrn).run
+    CommandLine.new("ip", "link set :dev up", :dev => resource.property.if_name).run
   end
 
   work :flush_ip_addrs do |resource|
     CommandLine.new("ip",  "addr flush dev :device",
-                    :device => resource.hrn).run
+                    :device => resource.property.if_name).run
   end
 end

data/lib/omf_rc/util/iw.rb

@@ -14,9 +14,10 @@ module OmfRc::Util::Iw
   #
   begin
     CommandLine.new("iw", "help").run.chomp.gsub(/^\t/, '').split("\n").map {|v| v.match(/[phy|dev] <.+> set (\w+) .*/) && $1 }.compact.uniq.each do |p|
+      next if p == 'type'
       configure p do |device, value|
         CommandLine.new("iw", "dev :dev set :property :value",
-                        :dev => device.hrn,
+                        :dev => device.property.if_name,
                         :property => p,
                         :value => value).run
       end
@@ -30,7 +31,7 @@ module OmfRc::Util::Iw
   request :link do |device|
     known_properties = Mash.new
 
-    command = CommandLine.new("iw", "dev :dev link", :dev => device.hrn)
+    command = CommandLine.new("iw", "dev :dev link", :dev => device.property.if_name)
 
     command.run.chomp.gsub(/^\t/, '').split("\n").drop(1).each do |v|
       v.match(/^(.+):\W*(.+)$/).tap do |m|
@@ -46,7 +47,7 @@ module OmfRc::Util::Iw
   request :info do |device|
     known_properties = Mash.new
 
-    command = CommandLine.new("iw", "dev :dev info", :dev => device.hrn)
+    command = CommandLine.new("iw", "dev :dev info", :dev => device.property.if_name)
 
     command.run.chomp.split("\n").drop(1).each do |v|
       v.match(/^\W*(.+) (.+)$/).tap do |m|
@@ -59,8 +60,8 @@ module OmfRc::Util::Iw
 
   # Delete current interface, clean up
   #
-  work :delele_interface do |device|
-    CommandLine.new("iw", "dev :dev del", :dev => device.hrn).run
+  work :delete_interface do |device|
+    CommandLine.new("iw", "dev :dev del", :dev => device.property.if_name).run
   end
 
   # Add interface to device
@@ -68,7 +69,7 @@ module OmfRc::Util::Iw
   work :add_interface do |device, type|
     CommandLine.new("iw", "phy :phy interface add :dev type :type",
                     :phy => device.property.phy,
-                    :dev => device.hrn,
+                    :dev => device.property.if_name,
                     :type => type.to_s).run
   end
 
@@ -76,7 +77,7 @@ module OmfRc::Util::Iw
   #
   work :join_ibss do |device|
     CommandLine.new("iw", "dev :device ibss join :essid :frequency",
-                      :device => device.hrn.to_s,
+                      :device => device.property.if_name.to_s,
                       :essid => device.property.essid.to_s,
                       :frequency => device.property.frequency.to_s).run
   end
@@ -115,9 +116,18 @@ module OmfRc::Util::Iw
     # capture value hash and store internally
     device.property.update(value)
 
+    if device.property.phy && device.property.phy =~ /^%(\d+)%$/
+      wlan_phy_device = device.request_wlan_devices[$1.to_i]
+      if wlan_phy_device
+        device.property.phy = wlan_phy_device[:name]
+      else
+        raise ArgumentError, "Could not find your wifi device no #{$1.to_i}"
+      end
+    end
+
     device.validate_iw_properties
 
-    device.delele_interface rescue logger.warn "Interface #{device.hrn} not found"
+    device.delete_interface rescue logger.warn "Interface #{device.property.if_name} not found"
 
     # TODO should just remove all interfaces from physical device, at least make it optional
 

data/lib/omf_rc/util/sysfs.rb

@@ -15,6 +15,20 @@ module OmfRc::Util::Sysfs
           device = { name: File.basename(v), driver: driver, category: category }
           device[:subcategory] = subcategory if subcategory
           device[:proxy] = proxy if OmfRc::ResourceFactory.proxy_list.include?(proxy.to_sym)
+          File.exist?("#{v}/operstate") && File.open("#{v}/operstate") do |fo|
+            device[:op_state] = (fo.read || '').chomp
+          end
+          # Let's see if the interface is already up 
+          # NOTE: THIS MAY NOT BE ROBUST
+          s = `ifconfig #{File.basename(v)}`
+          unless s.empty?
+            if m = s.match(/inet addr:\s*([0-9.]+)/)
+              device[:ip4] = m[1]
+            end 
+            if m = s.match(/inet6 addr:\s*([0-9a-f.:\/]+)/)
+              device[:ip6] = m[1]
+            end 
+          end
           devices << device
         end
       end

data/lib/omf_rc/util/vmbuilder.rb

@@ -163,7 +163,7 @@ source /usr/local/rvm/scripts/rvm
 command rvm install 1.9.3
 PATH=$PATH:/usr/local/rvm/rubies/ruby-1.9.3-p194/bin/ 
 source /usr/local/rvm/environments/ruby-1.9.3-p194
-gem install omf_rc --pre --no-ri --no-rdoc 
+gem install omf_rc --no-ri --no-rdoc 
 # HACK
 # Right now we dont have a Ubuntu startup script for OMF6 RC
 # Do this quick hack in the meantime

data/lib/omf_rc/util/wpa.rb

@@ -1,5 +1,6 @@
 require 'hashie'
 require 'cocaine'
+require 'tempfile'
 
 module OmfRc::Util::Wpa
   include OmfRc::ResourceProxyDSL
@@ -8,8 +9,8 @@ module OmfRc::Util::Wpa
   # Initialise wpa related conf and pid location
   #
   work :init_wpa_conf_pid do |device|
-    device.property.wpa_conf = "/tmp/wpa.#{device.hrn}.conf"
-    device.property.wpa_pid = "/tmp/wpa.#{device.hrn}.pid"
+    device.property.wpa_conf = Tempfile.new(["wpa.#{device.property.if_name}", ".conf"]).path
+    device.property.wpa_pid = Tempfile.new(["wpa.#{device.property.if_name}", ".pid"]).path
   end
 
   work :wpasup do |device|
@@ -19,7 +20,7 @@ module OmfRc::Util::Wpa
       f << "network={\n  ssid=\"#{device.property.essid}\"\n  scan_ssid=1\n  key_mgmt=NONE\n}"
     end
     CommandLine.new("wpa_supplicant", "-B -P :wpa_pid -i:dev -c:wpa_conf",
-                    :dev => device.hrn,
+                    :dev => device.property.if_name,
                     :wpa_conf => device.property.wpa_conf,
                     :wpa_pid => device.property.wpa_pid).run
   end

data/lib/omf_rc/version.rb

@@ -1,3 +1,3 @@
 module OmfRc
-  VERSION = "6.0.0.pre.8"
+  VERSION = "6.0.0.pre.9"
 end

data/lib/omf_rc.rb

@@ -1,7 +1,9 @@
 require 'omf_common'
-require "omf_rc/version"
+require 'omf_rc/version'
 
 module OmfRc
   module ResourceProxy; end
   module Util; end
 end
+
+require 'omf_rc/resource_factory'

data/omf_rc.gemspec

@@ -7,10 +7,12 @@ Gem::Specification.new do |s|
   s.version     = OmfRc::VERSION
   s.authors     = ["NICTA"]
   s.email       = ["omf-user@lists.nicta.com.au"]
-  s.homepage    = "https://www.mytestbed.net"
+  s.homepage    = "http://omf.mytestbed.net"
   s.summary     = %q{OMF resource controller}
   s.description = %q{Resource controller of OMF, a generic framework for controlling and managing networking testbeds.}
-
+  s.required_ruby_version = '>= 1.9.3'
+  s.license = 'MIT'
+  
   s.rubyforge_project = "omf_rc"
 
   s.files         = `git ls-files`.split("\n")

data/test/omf_rc/message_process_error_spec.rb

@@ -2,9 +2,9 @@ require 'test_helper'
 
 describe OmfRc::MessageProcessError do
   it "must be able to initialised" do
-    mpe = OmfRc::MessageProcessError.new('test_context_id', 'inform_to_address', 'error_messsage')
-    mpe.context_id.must_equal 'test_context_id'
-    mpe.inform_to.must_equal 'inform_to_address'
+    mpe = OmfRc::MessageProcessError.new('test_cid', 'replyto_address', 'error_messsage')
+    mpe.cid.must_equal 'test_cid'
+    mpe.replyto.must_equal 'replyto_address'
     mpe.message.must_equal 'error_messsage'
     mpe.must_be_kind_of StandardError
   end

data/test/omf_rc/resource_factory_spec.rb

@@ -3,24 +3,31 @@ require 'omf_rc/resource_factory'
 
 describe OmfRc::ResourceFactory do
   describe "when resource proxies loaded" do
+    before do
+      @xmpp = MiniTest::Mock.new
+      @xmpp.expect(:subscribe, true, [String])
+    end
+
     it "must have list of registered proxies and utilities" do
       OmfRc::ResourceFactory.load_default_resource_proxies
       OmfRc::ResourceFactory.proxy_list.must_include :mock
     end
 
     it "must be able to create new resource proxy" do
-      OmfRc::ResourceFactory.load_default_resource_proxies
-      mock = OmfRc::ResourceFactory.new(:mock)
-      mock.must_be_kind_of OmfRc::ResourceProxy::AbstractResource
-      mock.must_respond_to :request_nothing
-      mock.request_nothing.must_equal mock.uid
-      mock.must_respond_to :configure_nothing
+      OmfCommon.stub :comm, @xmpp do
+        OmfRc::ResourceFactory.load_default_resource_proxies
+        mock = OmfRc::ResourceFactory.new(:mock)
+        mock.must_be_kind_of OmfRc::ResourceProxy::AbstractResource
+        mock.must_respond_to :request_nothing
+        mock.request_nothing.must_equal mock.uid
+        mock.must_respond_to :configure_nothing
+      end
     end
 
     it "must be able to load addtional proxies from local folder" do
       Dir.stub :[], ["non_exist_folder/test.rb"] do
         proc do
-          OmfRc::ResourceFactory.load_addtional_resource_proxies("non_exist_folder")
+          OmfRc::ResourceFactory.load_additional_resource_proxies("non_exist_folder")
         end.must_raise LoadError
       end
     end