omf_rc 6.0.0.pre.4 → 6.0.0.pre.5

data/bin/omf_rc

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require "optparse"
-require 'omf_common'
 require 'omf_rc'
 require 'omf_rc/resource_factory'
 $stdout.sync = true
@@ -27,8 +26,8 @@ option_parser = OptionParser.new do |opts|
     options[:server] = server
   end
 
-  opts.on("-n NODE", "PubSub node to create, also becomes the uid of the resource") do |node|
-    options[:uid] = node
+  opts.on("-t TOPIC", "PubSub topic to create, also becomes the uid of the resource") do |topic|
+    options[:uid] = topic
   end
 
   opts.on("-d", "--debug", "Debug mode") do

data/lib/omf_rc/resource_factory.rb

@@ -1,4 +1,3 @@
-require 'omf_common'
 require 'securerandom'
 require 'hashie'
 require 'omf_rc/resource_proxy_dsl'
@@ -9,13 +8,10 @@ require 'omf_rc/resource_proxy/abstract_resource'
 class OmfRc::ResourceFactory
   # List of registered resource proxies
   @@proxy_list = []
-  # List of registered utilities
-  @@utility_list = []
 
-  # By default, we use xmpp_blather dsl, which based on blather
+  # By default, we use xmpp dsl, which based on blather
   DEFAULT_OPTS = {
-    dsl: 'xmpp_blather',
-    pubsub_host: 'pubsub'
+    dsl: 'xmpp'
   }
 
   class << self
@@ -31,7 +27,7 @@ class OmfRc::ResourceFactory
       # Create a new instance of abstract resource
       resource = OmfRc::ResourceProxy::AbstractResource.new(type, opts, comm)
       # Then extend this instance with relevant module identified by type
-      resource.extend("OmfRc::ResourceProxy::#{type.camelcase}".constant)
+      resource.extend("OmfRc::ResourceProxy::#{type.camelize}".constantize)
       # Execute resource before_ready hook if any
       resource.before_ready if resource.respond_to? :before_ready
       resource
@@ -44,17 +40,7 @@ class OmfRc::ResourceFactory
 
     # Add a proxy to the list
     def register_proxy(proxy)
-      @@proxy_list << proxy
-    end
-
-    # Return the utility list
-    def utility_list
-      @@utility_list
-    end
-
-    # Add a utility to the list
-    def register_utility(utility)
-      @@utility_list << utility
+      @@proxy_list << proxy unless @@proxy_list.include?(proxy)
     end
 
     # Require files from default resource proxy library folder

data/lib/omf_rc/resource_proxy/abstract_resource.rb

@@ -1,18 +1,17 @@
-require 'omf_common'
 require 'omf_rc/deferred_process'
 require 'omf_rc/message_process_error'
 require 'securerandom'
 require 'hashie'
 
 class OmfRc::ResourceProxy::AbstractResource
-  # Time to wait before shutting down event loop, wait for deleting pubsub nodes
+  # Time to wait before shutting down event loop, wait for deleting pubsub topics
   DISCONNECT_WAIT = 5
-  # Time to wait before releasing resource, wait for deleting pubsub nodes
+  # Time to wait before releasing resource, wait for deleting pubsub topics
   RELEASE_WAIT = 5
 
-  # @!attribute metadata
+  # @!attribute property
   #   @return [String] the resource's internal meta data storage
-  attr_accessor :uid, :hrn, :type, :comm, :metadata
+  attr_accessor :uid, :hrn, :type, :comm, :property
   attr_reader :opts, :children, :host
 
   # Initialisation
@@ -21,11 +20,11 @@ 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 [String] :pubsub_host pubsub server subdomain, default to 'pubsub'
   # @option opts [String] :dsl Which pubsub DSL to be used for pubsub communication
   # @option opts [String] :user pubsub user id
   # @option opts [String] :password pubsub user password
   # @option opts [String] :server pubsub server domain
+  # @option opts [String] :property A hash for keeping internal state
   # @param [Comm] comm communicator instance, pass this to new resource proxy instance if want to use a common communicator instance.
   def initialize(type, opts = nil, comm = nil)
     @opts = Hashie::Mash.new(opts)
@@ -34,24 +33,24 @@ class OmfRc::ResourceProxy::AbstractResource
     @hrn = @opts.hrn
     @children ||= []
     @host = nil
-    @metadata = @opts.metadata || Hashie::Mash.new
+    @property = @opts.property || Hashie::Mash.new
 
     @comm = comm || OmfCommon::Comm.new(@opts.dsl)
     # Fire when connection to pubsub server established
     @comm.when_ready do
       logger.info "CONNECTED: #{@comm.jid.inspect}"
-      @host = "#{@opts.pubsub_host}.#{@comm.jid.domain}"
+      @host = @comm.jid.domain
 
-      # Once connection established, create a pubsub node, then subscribe to it
-      @comm.create_node(uid, host) do |s|
-        # Creating node failed, no point to continue; clean up and disconnect
-        # Otherwise go subscribe to this pubsub node
+      # Once connection established, create a pubsub topic, then subscribe to it
+      @comm.create_topic(uid, host) do |s|
+        # Creating topic failed, no point to continue; clean up and disconnect
+        # Otherwise go subscribe to this pubsub topic
         s.error? ? disconnect : @comm.subscribe(uid, host)
       end
     end
 
     # Fire when message published
-    @comm.node_event do |e|
+    @comm.topic_event do |e|
       e.items.each do |item|
         process_omf_message(item.payload, e.node)
       end
@@ -68,21 +67,21 @@ class OmfRc::ResourceProxy::AbstractResource
     @comm.connect(opts.user, opts.password, opts.server)
   end
 
-  # Try to clean up pubsub nodes, and wait for DISCONNECT_WAIT seconds, then shutdown event machine loop
+  # Try to clean up pubsub topics, and wait for DISCONNECT_WAIT seconds, then shutdown event machine loop
   def disconnect
-    @comm.pubsub.affiliations(host) do |a|
-      my_pubsub_nodes = a[:owner] ? a[:owner].size : 0
-      if my_pubsub_nodes > 0
-        logger.info "Cleaning #{my_pubsub_nodes} pubsub node(s)"
-        a[:owner].each { |node| @comm.delete_node(node, host) }
+    @comm.affiliations(host) do |a|
+      my_pubsub_topics = a[:owner] ? a[:owner].size : 0
+      if my_pubsub_topics > 0
+        logger.info "Cleaning #{my_pubsub_topics} pubsub topic(s)"
+        a[:owner].each { |topic| @comm.delete_topic(topic, host) }
       else
         logger.info "Disconnecting now"
-        @comm.disconnect(host)
+        @comm.disconnect
       end
     end
     logger.info "Disconnecting in #{DISCONNECT_WAIT} seconds"
     EM.add_timer(DISCONNECT_WAIT) do
-      @comm.disconnect(host)
+      @comm.disconnect
     end
   end
 
@@ -99,15 +98,13 @@ class OmfRc::ResourceProxy::AbstractResource
   # Release a resource
   #
   def release
-    pubsub_nodes_left = []
+    pubsub_topics_left = []
     children.each do |c|
       c.before_release if c.respond_to? :before_release
-      pubsub_nodes_left << c.uid
-      c.freeze
+      pubsub_topics_left << c.uid
     end.clear
     before_release if respond_to? :before_release
-    freeze
-    pubsub_nodes_left
+    pubsub_topics_left
   end
 
   # Return a list of all properties can be requested and configured
@@ -147,7 +144,7 @@ class OmfRc::ResourceProxy::AbstractResource
 
   # Parse omf message and execute as instructed by the message
   #
-  def process_omf_message(pubsub_item_payload, node)
+  def process_omf_message(pubsub_item_payload, topic)
     dp = OmfRc::DeferredProcess.new
 
     dp.callback do |end_result|
@@ -155,7 +152,7 @@ class OmfRc::ResourceProxy::AbstractResource
         case end_result[:operation]
         when :create
           new_uid = end_result[:result]
-          @comm.create_node(new_uid, host) do
+          @comm.create_topic(new_uid, host) do
             @comm.subscribe(new_uid, host) do
               inform_msg = OmfCommon::Message.inform(end_result[:context_id], 'CREATED') do |i|
                 i.element('resource_id', new_uid)
@@ -185,7 +182,7 @@ class OmfRc::ResourceProxy::AbstractResource
           end
 
           end_result[:result].each do |n|
-            @comm.delete_node(n, host)
+            @comm.delete_topic(n, host)
           end
 
           EM.add_timer(RELEASE_WAIT) do
@@ -207,10 +204,10 @@ class OmfRc::ResourceProxy::AbstractResource
       # Get the context id, which will be included when informing
       context_id = message.read_content("context_id")
 
-      obj = node == uid ? self : children.find { |v| v.uid == node }
+      obj = topic == uid ? self : children.find { |v| v.uid == topic }
 
       begin
-        raise "Resource disappeard #{node}" if obj.nil?
+        raise "Resource disappeard #{topic}" if obj.nil?
 
         case message.operation
         when :create

data/lib/omf_rc/resource_proxy_dsl.rb

@@ -32,7 +32,7 @@ module OmfRc::ResourceProxyDSL
     #
     # Currently the system supports two hooks:
     #
-    # * before_ready, called when a resource created, before creating an associated pubsub node
+    # * before_ready, called when a resource created, before creating an associated pubsub topic
     # * before_release, called before a resource released
     #
     # @param [Symbol] name hook name. :before_create or :before_release
@@ -75,12 +75,12 @@ module OmfRc::ResourceProxyDSL
       name = name.to_s
       begin
         # In case of module defined inline
-        include "OmfRc::Util::#{name.camelcase}".constant
+        include "OmfRc::Util::#{name.camelize}".constantize
       rescue NameError
         begin
           # Then we try to require the file and include the module
           require "#{UTIL_DIR}/#{name}"
-          include "OmfRc::Util::#{name.camelcase}".constant
+          include "OmfRc::Util::#{name.camelize}".constantize
         rescue LoadError => le
           logger.error le.message
         rescue NameError => ne
@@ -89,22 +89,6 @@ module OmfRc::ResourceProxyDSL
       end
     end
 
-    # Register a named utility entry with factory class, normally this should be done in the utility module
-    #
-    # @param [Symbol] name of the resource proxy
-    # @example suppose we define a utility for iw command interaction
-    #
-    #   module OmfRc::Util::Iw
-    #     include OmfRc::ResourceProxyDSL
-    #
-    #     # Let the factory know it is available
-    #     register_utility :iw
-    #   end
-    def register_utility(name)
-      name = name.to_sym
-      OmfRc::ResourceFactory.register_utility(name)
-    end
-
     # Register a configurable property
     #
     # @param [Symbol] name of the property

data/lib/omf_rc/util/iw.rb

@@ -1,10 +1,11 @@
 require 'hashie'
+
 module OmfRc::Util::Iw
   include OmfRc::ResourceProxyDSL
 
   OmfCommon::Command.execute("iw help").chomp.gsub(/^\t/, '').split("\n").map {|v| v.match(/[phy|dev] <.+> set (\w+) .*/) && $1 }.compact.uniq.each do |p|
     configure p do |resource, value|
-      OmfCommon::Command.execute("#{IW_CMD} #{resource.hrn} set #{p} #{value}")
+      OmfCommon::Command.execute("iw #{resource.hrn} set #{p} #{value}")
     end
   end
 

data/lib/omf_rc/util/mock.rb

@@ -1,8 +1,6 @@
 module OmfRc::Util::Mock
   include OmfRc::ResourceProxyDSL
 
-  register_utility :mock
-
   request :nothing do |resource|
     resource.uid
   end
@@ -17,10 +15,6 @@ module OmfRc::Util::Mock
     OmfRc::ResourceFactory.proxy_list
   end
 
-  request :resource_utility_list do
-    OmfRc::ResourceFactory.utility_list
-  end
-
   request :kernel_version do
     OmfCommon::Command.execute("uname -r")
   end

data/lib/omf_rc/util/mod.rb

@@ -1,12 +1,10 @@
 module OmfRc::Util::Mod
   include OmfRc::ResourceProxyDSL
 
-  register_utility :mod
-
   request :modules do
     OmfCommon::Command.execute('lsmod').split("\n").map do |v|
-      v.match(/^(.+)\W*.+$/) && $1
-    end.compact
+      v.match(/^(\w+).+$/) && $1
+    end.compact.tap { |ary| ary.shift }
   end
 
   configure :load_module do |resource, value|

data/lib/omf_rc/version.rb

@@ -1,3 +1,3 @@
 module OmfRc
-  VERSION = "6.0.0.pre.4"
+  VERSION = "6.0.0.pre.5"
 end

data/lib/omf_rc.rb

@@ -1,3 +1,4 @@
+require 'omf_common'
 require "omf_rc/version"
 
 module OmfRc

data/test/fixture/iw/help

@@ -0,0 +1,228 @@
+Usage:	iw [options] command
+Options:
+	--debug		enable netlink debugging
+	--version	show version (3.4)
+Commands:
+	help [command]
+		Print usage for all or a specific command, e.g.
+		"help wowlan" or "help wowlan enable".
+
+	event [-t] [-r] [-f]
+		Monitor events from the kernel.
+		-t - print timestamp
+		-r - print relative timstamp
+		-f - print full frame for auth/assoc etc.
+
+	phy
+	list
+		List all wireless devices and their capabilities.
+
+	phy <phyname> info
+		Show capabilities for the specified wireless device.
+
+	dev
+		List all network interfaces for wireless hardware.
+
+	dev <devname> info
+		Show information for this interface.
+
+	dev <devname> del
+		Remove this virtual interface
+
+	dev <devname> interface add <name> type <type> [mesh_id <meshid>] [4addr on|off] [flags <flag>*]
+	phy <phyname> interface add <name> type <type> [mesh_id <meshid>] [4addr on|off] [flags <flag>*]
+		Add a new virtual interface with the given configuration.
+		Valid interface types are: managed, ibss, monitor, mesh, wds.
+		
+		The flags are only used for monitor interfaces, valid flags are:
+		none:     no special flags
+		fcsfail:  show frames with FCS errors
+		control:  show control frames
+		otherbss: show frames from other BSSes
+		cook:     use cooked mode
+		
+		The mesh_id is used only for mesh mode.
+
+	dev <devname> ibss join <SSID> <freq in MHz> [HT20|HT40+|HT40-|NOHT] [fixed-freq] [<fixed bssid>] [beacon-interval <TU>] [basic-rates <rate in Mbps,rate2,...>] [mcast-rate <rate in Mbps>] [key d:0:abcde]
+		Join the IBSS cell with the given SSID, if it doesn't exist create
+		it on the given frequency. When fixed frequency is requested, don't
+		join/create a cell on a different frequency. When a fixed BSSID is
+		requested use that BSSID and do not adopt another cell's BSSID even
+		if it has higher TSF and the same SSID. If an IBSS is created, create
+		it with the specified basic-rates, multicast-rate and beacon-interval.
+
+	dev <devname> ibss leave
+		Leave the current IBSS cell.
+
+	dev <devname> station dump
+		List all stations known, e.g. the AP on managed interfaces
+
+	dev <devname> station set <MAC address> vlan <ifindex>
+		Set an AP VLAN for this station.
+
+	dev <devname> station set <MAC address> plink_action <open|block>
+		Set mesh peer link action for this station (peer).
+
+	dev <devname> station del <MAC address>
+		Remove the given station entry (use with caution!)
+
+	dev <devname> station get <MAC address>
+		Get information for a specific station.
+
+	dev <devname> survey dump
+		List all gathered channel survey data
+
+	dev <devname> mesh leave
+		Leave a mesh.
+
+	dev <devname> mesh join <mesh ID> [mcast-rate <rate in Mbps>] [<param>=<value>]*
+		Join a mesh with the given mesh ID with mcast-rate and mesh parameters.
+
+	dev <devname> mpath dump
+		List known mesh paths.
+
+	dev <devname> mpath set <destination MAC address> next_hop <next hop MAC address>
+		Set an existing mesh path's next hop.
+
+	dev <devname> mpath new <destination MAC address> next_hop <next hop MAC address>
+		Create a new mesh path (instead of relying on automatic discovery).
+
+	dev <devname> mpath del <MAC address>
+		Remove the mesh path to the given node.
+
+	dev <devname> mpath get <MAC address>
+		Get information on mesh path to the given node.
+
+	dev <devname> scan [-u] [freq <freq>*] [ies <hex as 00:11:..>] [ssid <ssid>*|passive]
+		Scan on the given frequencies and probe for the given SSIDs
+		(or wildcard if not given) unless passive scanning is requested.
+		If -u is specified print unknown data in the scan results.
+		Specified (vendor) IEs must be well-formed.
+
+	dev <devname> scan trigger [freq <freq>*] [ies <hex as 00:11:..>] [ssid <ssid>*|passive]
+		Trigger a scan on the given frequencies with probing for the given
+		SSIDs (or wildcard if not given) unless passive scanning is requested.
+
+	dev <devname> scan dump [-u]
+		Dump the current scan results. If -u is specified, print unknown
+		data in scan results.
+
+	reg get
+		Print out the kernel's current regulatory domain information.
+
+	reg set <ISO/IEC 3166-1 alpha2>
+		Notify the kernel about the current regulatory domain.
+
+	dev <devname> connect [-w] <SSID> [<freq in MHz>] [<bssid>] [key 0:abcde d:1:6162636465]
+		Join the network with the given SSID (and frequency, BSSID).
+		With -w, wait for the connect to finish or fail.
+
+	dev <devname> disconnect
+		Disconnect from the current network.
+
+	dev <devname> link
+		Print information about the current link, if any.
+
+	dev <devname> offchannel <freq> <duration>
+		Leave operating channel and go to the given channel for a while.
+
+	dev <devname> cqm rssi <threshold|off> [<hysteresis>]
+		Set connection quality monitor RSSI threshold.
+		
+
+	phy <phyname> wowlan show 
+		Show WoWLAN status.
+
+	phy <phyname> wowlan disable 
+		Disable WoWLAN.
+
+	phy <phyname> wowlan enable [any] [disconnect] [magic-packet] [gtk-rekey-failure] [eap-identity-request] [4way-handshake] [rfkill-release] [patterns <pattern>*]
+		Enable WoWLAN with the given triggers.
+		Each pattern is given as a bytestring with '-' in places where any byte
+		may be present, e.g. 00:11:22:-:44 will match 00:11:22:33:44 and
+		00:11:22:33:ff:44 etc.
+
+	dev <devname> roc start <freq> <time>
+		
+
+	phy <phyname> set antenna <bitmap> | all | <tx bitmap> <rx bitmap>
+		Set a bitmap of allowed antennas to use for TX and RX.
+		The driver may reject antenna configurations it cannot support.
+
+	dev <devname> set txpower <auto|fixed|limit> [<tx power in mBm>]
+		Specify transmit power level and setting type.
+
+	phy <phyname> set txpower <auto|fixed|limit> [<tx power in mBm>]
+		Specify transmit power level and setting type.
+
+	phy <phyname> set distance <distance>
+		Set appropriate coverage class for given link distance in meters.
+		Valid values: 0 - 114750
+
+	phy <phyname> set coverage <coverage class>
+		Set coverage class (1 for every 3 usec of air propagation time).
+		Valid values: 0 - 255.
+
+	phy <phyname> set netns <pid>
+		Put this wireless device into a different network namespace
+
+	phy <phyname> set rts <rts threshold|off>
+		Set rts threshold.
+
+	phy <phyname> set frag <fragmentation threshold|off>
+		Set fragmentation threshold.
+
+	dev <devname> set channel <channel> [HT20|HT40+|HT40-]
+	phy <phyname> set channel <channel> [HT20|HT40+|HT40-]
+	dev <devname> set freq <freq> [HT20|HT40+|HT40-]
+	phy <phyname> set freq <freq> [HT20|HT40+|HT40-]
+		Set frequency/channel the hardware is using, including HT
+		configuration.
+
+	phy <phyname> set name <new name>
+		Rename this wireless device.
+
+	dev <devname> set peer <MAC address>
+		Set interface WDS peer.
+
+	dev <devname> set noack_map <map>
+		Set the NoAck map for the TIDs. (0x0009 = BE, 0x0006 = BK, 0x0030 = VI, 0x00C0 = VO)
+
+	dev <devname> set 4addr <on|off>
+		Set interface 4addr (WDS) mode.
+
+	dev <devname> set type <type>
+		Set interface type/mode.
+		Valid interface types are: managed, ibss, monitor, mesh, wds.
+
+	dev <devname> set meshid <meshid>
+	dev <devname> set monitor <flag>*
+		Set monitor flags. Valid flags are:
+		none:     no special flags
+		fcsfail:  show frames with FCS errors
+		control:  show control frames
+		otherbss: show frames from other BSSes
+		cook:     use cooked mode
+
+	dev <devname> set mesh_param <param>=<value> [<param>=<value>]*
+		Set mesh parameter (run command without any to see available ones).
+
+	dev <devname> set power_save <on|off>
+		Set power save state to on or off.
+
+	dev <devname> set bitrates [legacy-<2.4|5> <legacy rate in Mbps>*] [mcs-<2.4|5> <MCS index>*]
+		Sets up the specified rate masks.
+		Not passing any arguments would clear the existing mask (if any).
+
+	dev <devname> get mesh_param [<param>]
+		Retrieve mesh parameter (run command without any to see available ones).
+
+	dev <devname> get power_save <param>
+		Retrieve power save state.
+
+
+You can omit the 'phy' or 'dev' if the identification is unique,
+e.g. "iw wlan0 info" or "iw phy0 info". (Don't when scripting.)
+
+Do NOT screenscrape this tool, we don't consider its output stable.
+

data/test/fixture/iw/link

@@ -0,0 +1,11 @@
+Connected to 00:14:bf:0c:e7:a4 (on wlan0)
+	SSID: dd-wrt
+	freq: 2427
+	RX: 1772745 bytes (25092 packets)
+	TX: 9473 bytes (111 packets)
+	signal: -37 dBm
+	tx bitrate: 1.0 MBit/s
+
+	bss flags:	short-preamble short-slot-time
+	dtim period:	0
+	beacon int:	100

data/test/fixture/lsmod

@@ -0,0 +1,106 @@
+Module                  Size  Used by
+ip6table_filter        12540  0 
+ip6_tables             22175  1 ip6table_filter
+iptable_filter         12536  0 
+ip_tables              22042  1 iptable_filter
+ebtable_nat            12580  0 
+ebtables               26235  1 ebtable_nat
+x_tables               19073  5 ebtables,ip_tables,iptable_filter,ip6_tables,ip6table_filter
+parport_pc             22364  0 
+ppdev                  12763  0 
+lp                     17149  0 
+parport                31858  3 lp,ppdev,parport_pc
+rfcomm                 33656  8 
+bnep                   17567  2 
+cpufreq_stats          12866  0 
+cpufreq_userspace      12576  0 
+cpufreq_powersave      12454  0 
+cpufreq_conservative    13147  0 
+pci_stub               12429  1 
+vboxpci                19066  0 
+autofs4                27582  2 
+vboxnetadp             25443  0 
+vboxnetflt             23571  0 
+vboxdrv               190105  3 vboxnetflt,vboxnetadp,vboxpci
+uinput                 17440  1 
+nfsd                  211858  2 
+nfs                   312243  0 
+nfs_acl                12511  2 nfs,nfsd
+auth_rpcgss            37143  2 nfs,nfsd
+fscache                36739  1 nfs
+lockd                  67328  2 nfs,nfsd
+sunrpc                173671  6 lockd,auth_rpcgss,nfs_acl,nfs,nfsd
+loop                   22641  0 
+fuse                   61981  1 
+kvm                   287662  0 
+snd_hda_codec_conexant    45252  1 
+joydev                 17266  0 
+arc4                   12458  2 
+coretemp               12898  0 
+crc32c_intel           12747  0 
+btusb                  17502  2 
+bluetooth             119406  23 btusb,bnep,rfcomm
+crc16                  12343  1 bluetooth
+snd_hda_intel          26345  0 
+ghash_clmulni_intel    13133  0 
+i2c_i801               16870  0 
+snd_hda_codec          78031  2 snd_hda_intel,snd_hda_codec_conexant
+snd_hwdep              13186  1 snd_hda_codec
+snd_pcm                63900  2 snd_hda_codec,snd_hda_intel
+snd_page_alloc         13003  2 snd_pcm,snd_hda_intel
+aesni_intel            50667  0 
+aes_x86_64             16796  1 aesni_intel
+pcspkr                 12579  0 
+psmouse                64455  0 
+thinkpad_acpi          61270  0 
+aes_generic            33026  2 aes_x86_64,aesni_intel
+nvram                  13049  1 thinkpad_acpi
+cryptd                 14517  2 aesni_intel,ghash_clmulni_intel
+serio_raw              12931  0 
+snd_seq                45093  0 
+evdev                  17562  15 
+snd_seq_device         13176  1 snd_seq
+snd_timer              22917  2 snd_seq,snd_pcm
+iwlwifi               170823  0 
+i915                  355994  3 
+mac80211              192768  1 iwlwifi
+snd                    52850  9 snd_timer,snd_seq_device,snd_seq,thinkpad_acpi,snd_pcm,snd_hwdep,snd_hda_codec,snd_hda_intel,snd_hda_codec_conexant
+cfg80211              137140  2 mac80211,iwlwifi
+drm_kms_helper         27227  1 i915
+iTCO_wdt               17081  0 
+iTCO_vendor_support    12704  1 iTCO_wdt
+drm                   167670  4 drm_kms_helper,i915
+soundcore              13065  1 snd
+battery                13109  0 
+rfkill                 19012  4 cfg80211,thinkpad_acpi,bluetooth
+i2c_algo_bit           12841  1 i915
+i2c_core               23876  5 i2c_algo_bit,drm,drm_kms_helper,i915,i2c_i801
+ac                     12624  0 
+power_supply           13475  2 ac,battery
+tpm_tis                17454  0 
+tpm                    17862  1 tpm_tis
+tpm_bios               12948  1 tpm
+video                  17628  1 i915
+wmi                    13243  0 
+acpi_cpufreq           12935  1 
+mperf                  12453  1 acpi_cpufreq
+button                 12937  1 i915
+processor              28157  1 acpi_cpufreq
+xfs                   594991  4 
+dm_mod                 63545  12 
+sd_mod                 36136  2 
+crc_t10dif             12348  1 sd_mod
+sdhci_pci              17976  0 
+ahci                   24997  1 
+libahci                22860  1 ahci
+xhci_hcd               73170  0 
+libata                140589  2 libahci,ahci
+sdhci                  27053  1 sdhci_pci
+mmc_core               72460  2 sdhci,sdhci_pci
+ehci_hcd               40215  0 
+scsi_mod              162372  2 libata,sd_mod
+usbcore               128498  4 ehci_hcd,xhci_hcd,btusb
+e1000e                120822  0 
+usb_common             12354  1 usbcore
+thermal                17383  0 
+thermal_sys            18040  3 thermal,processor,video

data/test/mock_helper.rb

@@ -0,0 +1,15 @@
+FIXTURE_DIR = "#{File.dirname(__FILE__)}/fixture"
+
+OmfCommon::Command = MiniTest::Mock.new
+
+def mock_execute(result, command_pattern)
+  OmfCommon::Command.expect :execute, result, [command_pattern]
+end
+
+def mock_verify_execute
+  OmfCommon::Command.verify
+end
+
+def fixture(name)
+  File.read("#{FIXTURE_DIR}/#{name.to_s}")
+end

data/test/omf_rc/resource_factory_spec.rb

@@ -1,13 +1,16 @@
 require 'test_helper'
+require 'mock_helper'
 require 'omf_rc/resource_factory'
 
 describe OmfRc::ResourceFactory do
   describe "when resource proxies loaded" do
     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

data/test/omf_rc/resource_proxy/abstract_resource_spec.rb

@@ -42,6 +42,11 @@ describe AbstractResource do
       @node.uid.must_match /.{8}-.{4}-.{4}-.{4}-.{12}/
       @node.request_uid.must_match /.{8}-.{4}-.{4}-.{4}-.{12}/
     end
+
+    it "could keep state inside 'property' instnace variable" do
+      @node.property.bob = "test"
+      @node.property.bob.must_equal "test"
+    end
   end
 
   describe "when asked to create another resource" do
@@ -59,7 +64,6 @@ describe AbstractResource do
   describe "when destroyed" do
     it "must destroy itself together with any resources created by it" do
       @node.release
-      @node.frozen?.must_equal true
       @node.children.must_be_empty
     end
   end
@@ -78,5 +82,3 @@ describe AbstractResource do
     end
   end
 end
-
-

data/test/omf_rc/resource_proxy/node_spec.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+require 'omf_rc/resource_proxy/node'
+
+describe OmfRc::ResourceProxy::Node do
+  describe "when included in the resource instance" do
+    it "must be able to tell registered proxies" do
+      OmfRc::ResourceFactory.new(:node, hrn: 'node_test').request_proxies.must_include :node
+    end
+  end
+end

data/test/omf_rc/resource_proxy_dsl_spec.rb

@@ -5,7 +5,6 @@ describe OmfRc::ResourceProxyDSL do
   before do
     module OmfRc::Util::MockUtility
       include OmfRc::ResourceProxyDSL
-      register_utility :mock_utility
       configure :alpha
       request :alpha
     end
@@ -16,9 +15,7 @@ describe OmfRc::ResourceProxyDSL do
       register_proxy :mock_proxy
       utility :mock_utility
 
-      hook :before_ready do
-        "bob"
-      end
+      hook :before_ready
       hook :before_release
       configure :bravo
       request :bravo
@@ -28,7 +25,6 @@ describe OmfRc::ResourceProxyDSL do
   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
-      OmfRc::ResourceFactory.utility_list.must_include :mock_utility
     end
 
     it "must be able to define methods" do

data/test/omf_rc/util/iw_spec.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+require 'mock_helper'
+
+mock_execute(fixture("iw/help"), "iw help")
+
+require 'omf_rc/util/iw'
+
+describe OmfRc::Util::Iw do
+  describe "when included in the resource instance" do
+    before do
+      module OmfRc::ResourceProxy::IwTest
+        include OmfRc::ResourceProxyDSL
+        register_proxy :iw_test
+        utility :iw
+      end
+    end
+
+    after do
+      mock_verify_execute
+    end
+
+    it "must provide features defined in proxy" do
+      %w(request_link configure_name configure_channel configure_bitrates).each do |m|
+        OmfRc::Util::Iw.method_defined?(m).must_equal true
+      end
+    end
+
+    it "could request properties of the wifi device" do
+      mock_execute(fixture("iw/link"), "iw wlan00 link")
+      OmfRc::ResourceFactory.new(:iw_test, hrn: 'wlan00').request_link.keys.must_include "ssid"
+    end
+
+    it "could configure the device's prorperty" do
+      mock_execute(nil, /iw wlan00 set */)
+      OmfRc::ResourceFactory.new(:iw_test, hrn: 'wlan00').configure_power_save.must_be_nil
+    end
+  end
+end

data/test/omf_rc/util/mod_spec.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+require 'mock_helper'
+require 'omf_rc/util/mod'
+
+describe OmfRc::Util::Mod do
+  describe "when included in the resource instance" do
+    before do
+      module OmfRc::ResourceProxy::ModTest
+        include OmfRc::ResourceProxyDSL
+        register_proxy :mod_test
+        utility :mod
+      end
+    end
+
+    after do
+      mock_verify_execute
+    end
+
+    it "will find out a list of modules" do
+      mock_execute(fixture("lsmod"), "lsmod")
+      OmfRc::ResourceFactory.new(:mod_test).request_modules.must_include "kvm"
+      OmfRc::ResourceFactory.new(:mod_test).request_modules.wont_include "Module"
+    end
+
+    it "could load a module" do
+      mock_execute(nil, /modprobe */)
+      OmfRc::ResourceFactory.new(:mod_test).configure_load_module('magic_module').must_be_nil
+    end
+  end
+end

data/test/test_helper.rb

@@ -5,7 +5,5 @@ require 'minitest/pride'
 require 'omf_rc'
 require 'omf_rc/resource_factory'
 
-OmfRc::ResourceFactory.load_default_resource_proxies
-
 # Shut up all the loggers
 Logging.logger.root.clear_appenders

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.4
+  version: 6.0.0.pre.5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -88,10 +88,17 @@ files:
 - lib/omf_rc/util/package.rb
 - lib/omf_rc/version.rb
 - omf_rc.gemspec
+- test/fixture/iw/help
+- test/fixture/iw/link
+- test/fixture/lsmod
+- test/mock_helper.rb
 - test/omf_rc/deferred_process_spec.rb
 - test/omf_rc/resource_factory_spec.rb
 - test/omf_rc/resource_proxy/abstract_resource_spec.rb
+- test/omf_rc/resource_proxy/node_spec.rb
 - test/omf_rc/resource_proxy_dsl_spec.rb
+- test/omf_rc/util/iw_spec.rb
+- test/omf_rc/util/mod_spec.rb
 - test/test_helper.rb
 homepage: https://www.mytestbed.net
 licenses: []
@@ -113,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_rc
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OMF resource controller
 test_files: []
-has_rdoc: