omf_rc 6.0.0.pre.6 → 6.0.0.pre.7

data/lib/omf_rc/resource_proxy_dsl.rb

@@ -31,6 +31,7 @@ module OmfRc::ResourceProxyDSL
     #
     def register_proxy(name, opts = {})
       name = name.to_sym
+      opts = Hashie::Mash.new(opts)
       if opts[:create_by] && !opts[:create_by].kind_of?(Array)
         opts[:create_by] = [opts[:create_by]]
       end
@@ -44,6 +45,15 @@ module OmfRc::ResourceProxyDSL
     # * before_ready, called when a resource created, before creating an associated pubsub topic
     # * before_release, called before a resource released
     # * before_create, called before parent creates the child resource. (in the context of parent resource)
+    # * after_create, called after parent creates the child resource.
+    # * after_initial_configured, called after child resource created, and initial set of properties have been configured.
+    #
+    # The sequence of execution is:
+    # * before_create
+    # * before_ready
+    # * after_create
+    # * after_initial_configured
+    # * before_release
     #
     # @param [Symbol] name hook name. :before_create or :before_release
     # @yieldparam [AbstractResource] resource pass the current resource object to the block
@@ -74,13 +84,35 @@ module OmfRc::ResourceProxyDSL
     #      new_resource_options.property.node_info = "Node #{resource.uid}"
     #    end
     #
+    #    # after_create hook
+    #    #
+    #    # the optional block will have access to these variables:
+    #    # * 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}
+    #    end
+    #
+    #    # before_ready hook
+    #    #
+    #    # the optional block will have access to resource instance. Useful to initialise resource
     #    hook :before_ready do |resource|
     #      logger.info "#{resource.uid} is now ready"
     #    end
     #
+    #    # before_release hook
+    #    #
+    #    # the optional block will have access to resource instance. Useful to clean up resource before release it.
     #    hook :before_release do |resource|
     #      logger.info "#{resource.uid} is now released"
     #    end
+    #
+    #    # after_initial_configured hook
+    #    #
+    #    # the optional block will have access to resource instance. Useful for actions depends on certain configured property values.
+    #    hook :after_initial_configured do |resource|
+    #      logger.info "#{resource.uid} has an IP address" unless resource.request_ip_addr.nil?
+    #    end
     #   end
     def hook(name, &register_block)
       define_method(name) do |*args, &block|
@@ -123,6 +155,9 @@ module OmfRc::ResourceProxyDSL
 
     # Register a configurable property
     #
+    # Please note that the result of the last line in the configure block will be returned via 'inform' message.
+    # If you want to make sure that user get a proper notification about the configure operation, simply use the last line to return such notification
+    #
     # @param [Symbol] name of the property
     # @yieldparam [AbstractResource] resource pass the current resource object to the block
     # @yieldparam [Object] value pass the value to be configured
@@ -132,26 +167,25 @@ module OmfRc::ResourceProxyDSL
     #     include OmfRc::ResourceProxyDSL
     #
     #     configure :freq do |resource, value|
-    #       Command.execute("iw #{resource.hrn} set freq #{value}")
+    #       `iw #{resource.hrn} set freq #{value}`
+    #       "Frequency set to #{value}"
     #     end
     #
     #     # or use iterator to define multiple properties
     #     %w(freq channel type).each do |p|
     #       configure p do |resource, value|
-    #         Command.execute("iw #{resource.hrn} set freq #{value}")
+    #         `iw #{resource.hrn} set freq #{value}`
     #       end
     #     end
     #
     #     # or we can try to parse iw's help page to extract valid properties and then automatically register them
-    #     Command.execute("iw help").chomp.gsub(/^\t/, '').split("\n").map {|v| v.match(/[phy|dev] <.+> set (\w+) .*/) && $1 }.compact.uniq.each do |p|
+    #     `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|
-    #         Command.execute("iw #{resource.hrn} set #{p} #{value}")
+    #         `iw #{resource.hrn} set #{p} #{value}`
     #       end
     #     end
     #   end
     #
-    # @see OmfCommon::Command.execute
-    #
     def configure(name, &register_block)
       define_method("configure_#{name.to_s}") do |*args, &block|
         args[0] = Hashie::Mash.new(args[0]) if args[0].class == Hash
@@ -168,11 +202,11 @@ module OmfRc::ResourceProxyDSL
     #     include OmfRc::ResourceProxyDSL
     #
     #     request :freq do |resource|
-    #       Command.execute("iw #{resource.hrn} link").match(/^(freq):\W*(.+)$/) && $2
+    #       `iw #{resource.hrn} link`.match(/^(freq):\W*(.+)$/) && $2
     #     end
     #
     #     # or we can grab everything from output of iw link command and return as a hash(mash)
-    #     Command.execute("iw #{resource.hrn} link").chomp.gsub(/^\t/, '').split("\n").drop(1).each do |v|
+    #     `iw #{resource.hrn} link`.chomp.gsub(/^\t/, '').split("\n").drop(1).each do |v|
     #       v.match(/^(.+):\W*(.+)$/).tap do |m|
     #         m && known_properties[m[1].downcase.gsub(/\W+/, '_')] = m[2].gsub(/^\W+/, '')
     #       end
@@ -192,7 +226,7 @@ module OmfRc::ResourceProxyDSL
     # @example suppose we define a simple os checking method
     #
     #   work :os do
-    #     Command.execute("uname")
+    #     `uname`
     #   end
     #
     #   # then this os method will be available in all proxy definitions which includes this work method definition.
@@ -284,5 +318,13 @@ module OmfRc::ResourceProxyDSL
       alias_method "orig_request_#{request_name}", "request_#{request_name}"
     end
 
+    # Define internal property
+    def property(name, opts = {})
+      opts = Hashie::Mash.new(opts)
+
+      define_method("def_property_#{name}") do |*args, &block|
+        self.property[name] = opts[:default]
+      end
+    end
   end
 end

data/lib/omf_rc/util/iw.rb

@@ -12,13 +12,17 @@ module OmfRc::Util::Iw
 
   # Parse iw help page and set up all configure methods available for iw command
   #
-  CommandLine.new("iw", "help").run.chomp.gsub(/^\t/, '').split("\n").map {|v| v.match(/[phy|dev] <.+> set (\w+) .*/) && $1 }.compact.uniq.each do |p|
-    configure p do |device, value|
-      CommandLine.new("iw", "dev :dev set :property :value",
-                      :dev => device.hrn,
-                      :property => p,
-                      :value => value).run
+  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|
+      configure p do |device, value|
+        CommandLine.new("iw", "dev :dev set :property :value",
+                        :dev => device.hrn,
+                        :property => p,
+                        :value => value).run
+      end
     end
+  rescue Cocaine::CommandNotFoundError
+    logger.warn "Command iw not found"
   end
 
   # Parse iw link command output and return as a mash

data/lib/omf_rc/util/mod.rb

@@ -1,13 +1,41 @@
+require 'hashie'
+require 'cocaine'
+
 module OmfRc::Util::Mod
   include OmfRc::ResourceProxyDSL
+  include Cocaine
+  include Hashie
 
   request :modules do
-    OmfCommon::Command.execute('lsmod').split("\n").map do |v|
+    CommandLine.new('lsmod').run.split("\n").map do |v|
       v.match(/^(\w+).+$/) && $1
     end.compact.tap { |ary| ary.shift }
   end
 
   configure :load_module do |resource, value|
-    OmfCommon::Command.execute("modprobe #{value}")
+    raise ArgumentError, "Please provide at least module name" if value.name.nil?
+
+    flags_string = nil
+
+    if !value.flags.nil?
+      if value.flags.kind_of?(Hash)
+        flags_string = value.flags.keys.map do |k|
+          "--#{k} #{value.flags[k]}"
+        end.join(" ")
+      else
+        raise ArgumentError, "Please provide modprobe flags as a hash"
+      end
+    end
+
+    if value.unload
+      CommandLine.new("modprobe", "-r :mod_names", :mod_names => [value.unload].flatten.join(' ')).run
+    end
+
+    CommandLine.new("modprobe", ":flags :mod_name :module_parameters",
+                    :mod_name => value.name.to_s,
+                    :flags => flags_string,
+                    :module_parameters => value.mod_params.to_s).run
+
+    "#{value.name} loaded"
   end
 end

data/lib/omf_rc/util/openflow_tools.rb

@@ -3,7 +3,7 @@ require 'xmlrpc/client'
 module OmfRc::Util::OpenflowTools
   include OmfRc::ResourceProxyDSL
 
-  # The version of the flowvisor that this resource is able to control 
+  # The version of the flowvisor that this resource is able to control
   FLOWVISOR_VERSION = "FV version=flowvisor-0.8.4"
 
   # Parts of the regular expression that describes a flow entry for flowvisor
@@ -18,7 +18,7 @@ module OmfRc::Util::OpenflowTools
   # The regular expression that describes a flow entry for flowvisor
   FLOWVISOR_FLOWENTRY_REGEXP = /FlowEntry\[#{FLOWVISOR_FLOWENTRY_REGEXP_DEVIDED.join(',')},\]/
 
-  # The names of the flow (or flow entry) features 
+  # The names of the flow (or flow entry) features
   FLOW_FEATURES = %w{device match slice actions id priority}
 
   # The names of the flow (or flow entry) features that are specified by the "match" feature
@@ -52,9 +52,9 @@ module OmfRc::Util::OpenflowTools
     result = resource.flowvisor_connection.call("api.listFlowSpace")
     result.map! do |line|
       array_values = line.match(FLOWVISOR_FLOWENTRY_REGEXP)[1..-1]
-        # Example of above array's content: %w{00:00:...:01 in_port=1 test 4 30 10}  
+        # Example of above array's content: %w{00:00:...:01 in_port=1 test 4 30 10}
       array_features_values_zipped = FLOW_FEATURES.zip(array_values)
-        # Example of above array's content: %w{device 00:00:...:01 match in_port=1 slice test actions 4 id 30 priority 10}  
+        # Example of above array's content: %w{device 00:00:...:01 match in_port=1 slice test actions 4 id 30 priority 10}
       hash = Hashie::Mash.new(Hash[array_features_values_zipped])
       # The following code adds extra features that are specified by the "match" feature
       hash["match"].split(",").each do |couple|
@@ -64,7 +64,7 @@ module OmfRc::Util::OpenflowTools
       hash
     end
     result.delete_if {|hash| hash["slice"] != resource.property.name} if resource.type.to_sym == :openflow_slice
-    FLOW_FEATURES.each do |feature| 
+    FLOW_FEATURES.each do |feature|
       result.delete_if {|hash| hash[feature] != filter[feature].to_s} if filter[feature]
     end if filter
     result
@@ -90,13 +90,13 @@ module OmfRc::Util::OpenflowTools
       result << h
     when "remove"
       resource.flows(parameters).each do |f|
-        if f.match == match 
+        if f.match == match
           h = Hashie::Mash.new
           h.operation = parameters.operation.upcase
           h.id = f.id
           result << h
-        end 
-      end    
+        end
+      end
     end
     result
   end

data/lib/omf_rc/util/platform_tools.rb

@@ -28,7 +28,7 @@ module OmfRc::Util::PlatformTools
   include OmfRc::ResourceProxyDSL
 
   utility :common_tools
-  
+
   # This utility block logs attempts to detect the OS platform on which it is
   # currently running. Right now it can recognise the following platform:
   # - Ubuntu (by looking for an Ubuntu string in /etc/*release files)
@@ -38,22 +38,22 @@ module OmfRc::Util::PlatformTools
   #
   # [Symbol] either :unknown | :ubuntu | :fedora
   #
-  work('detect_platform') do 
+  work('detect_platform') do
     r = `cat /etc/*release`.upcase
     platform = :unknown
     platform = :ubuntu if r.include?('UBUNTU')
     platform = :fedora if r.include?('FEDORA')
-    platform 
+    platform
   end
- 
+
   # This utility block logs attempts to validate if a given package name is
-  # a valid one or not. Right now it checks the following: 
+  # a valid one or not. Right now it checks the following:
   # - if the given pkg name is not nil
   # - if the given pkg name has a size > 0
   #
-  # Further checks may be implemented later 
+  # Further checks may be implemented later
   # (e.g. is the pkg provided by any known repository, etc...)
-  # 
+  #
   # @yieldparam [String] pkg_name the package name to check
   #
   # [Boolean] true or fals
@@ -70,7 +70,7 @@ module OmfRc::Util::PlatformTools
 
   # This utility block install a package on an Ubuntu platform using
   # the underlying apt-get tool
-  # 
+  #
   # @yieldparam [String] pkg_name the package name to install
   #
   work('install_ubuntu') do |res, pkg_name|
@@ -85,7 +85,7 @@ module OmfRc::Util::PlatformTools
 
   # This utility block install a package on an Fedora platform using
   # the underlying yum tool
-  # 
+  #
   # @yieldparam [String] pkg_name the package name to install
   #
   work('install_fedora') do |res, pkg_name|
@@ -95,13 +95,13 @@ module OmfRc::Util::PlatformTools
                 "/usr/bin/yum -y install #{pkg_name}")
   end
 
-  # This utility block install a software from a tarball archive. It first 
-  # tries to download the tarball at a given URI (if it has not been 
+  # This utility block install a software from a tarball archive. It first
+  # tries to download the tarball at a given URI (if it has not been
   # downloaded earlier), then it unarchives it at the given install_path
   #
   # @yieldparam [String] pkg_name the package name to install
   # @yieldparam [String] install_path the path where to install this package
-  # 
+  #
   work('install_tarball') do |res, pkg_name, install_path|
     next false unless res.valid_pkg_name(pkg_name)
     require 'net/http'
@@ -132,7 +132,7 @@ module OmfRc::Util::PlatformTools
       next false
     end
 
-    # if we have the file and its ETag locally, 
+    # if we have the file and its ETag locally,
     # compare it to the ETag of the remote file
     if File.exists?(file) && File.exists?(eTagFile)
        f=File.open(eTagFile,'r')

data/lib/omf_rc/version.rb

@@ -1,3 +1,3 @@
 module OmfRc
-  VERSION = "6.0.0.pre.6"
+  VERSION = "6.0.0.pre.7"
 end

data/test/fixture/iw/help

@@ -33,14 +33,14 @@ Commands:
 	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]
@@ -128,12 +128,12 @@ Commands:
 
 	dev <devname> cqm rssi <threshold|off> [<hysteresis>]
 		Set connection quality monitor RSSI threshold.
-		
 
-	phy <phyname> wowlan show 
+
+	phy <phyname> wowlan show
 		Show WoWLAN status.
 
-	phy <phyname> wowlan disable 
+	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>*]
@@ -143,7 +143,7 @@ Commands:
 		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.

data/test/fixture/lsmod

@@ -1,106 +1,106 @@
 Module                  Size  Used by
-ip6table_filter        12540  0 
+ip6table_filter        12540  0
 ip6_tables             22175  1 ip6table_filter
-iptable_filter         12536  0 
+iptable_filter         12536  0
 ip_tables              22042  1 iptable_filter
-ebtable_nat            12580  0 
+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_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 
+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 
+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 
+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_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 
+aesni_intel            50667  0
 aes_x86_64             16796  1 aesni_intel
-pcspkr                 12579  0 
-psmouse                64455  0 
-thinkpad_acpi          61270  0 
+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 
+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 
+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_wdt               17081  0
 iTCO_vendor_support    12704  1 iTCO_wdt
 drm                   167670  4 drm_kms_helper,i915
 soundcore              13065  1 snd
-battery                13109  0 
+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 
+ac                     12624  0
 power_supply           13475  2 ac,battery
-tpm_tis                17454  0 
+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 
+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 
+xfs                   594991  4
+dm_mod                 63545  12
+sd_mod                 36136  2
 crc_t10dif             12348  1 sd_mod
-sdhci_pci              17976  0 
-ahci                   24997  1 
+sdhci_pci              17976  0
+ahci                   24997  1
 libahci                22860  1 ahci
-xhci_hcd               73170  0 
+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 
+ehci_hcd               40215  0
 scsi_mod              162372  2 libata,sd_mod
 usbcore               128498  4 ehci_hcd,xhci_hcd,btusb
-e1000e                120822  0 
+e1000e                120822  0
 usb_common             12354  1 usbcore
-thermal                17383  0 
+thermal                17383  0
 thermal_sys            18040  3 thermal,processor,video

data/test/fixture/oml.hash

@@ -0,0 +1,30 @@
+{
+  :experiment => 'my_foo_experiment',
+  :id => 'my_bar_application',
+  :collection => [
+    { :url => 'tcp://10.0.0.200:3003',
+      :streams => [
+        { :mp => 'radiotap', 
+          :interval => 2,
+          :filters => [
+            {:field => 'sig_strength_dBm', :operation => 'avg'},
+            {:field => 'noise_strength_dBm', :operation => 'avg'},
+            {:field => 'power', :operation => 'avg', :rename => 'energy'}
+          ]
+        },
+        { :mp => 'udp',
+          :samples => 10,
+          :filters => [{:field => 'pkt_len', :operation => 'stddev'}]
+        }
+      ]
+    },
+    { :url => 'tcp://srv.mytestbed.net:3003',
+      :streams => [
+        { :mp => 'tcp',
+          :interval => 5,
+          :filters => [{:field => 'throughput', :operation => 'avg'}]
+        }
+      ]
+    }
+  ]
+}

data/test/fixture/oml.spec

@@ -0,0 +1,15 @@
+{
+  :available_mps => [
+    { :mp => 'radiotap', 
+      :fields => [
+        {:field => 'sig_strength_dBm', :unit => 'dBm', :type => 'Fixnum'},
+        {:field => 'noise_strength_dBm', :unit => 'dBm', :type => 'Fixnum'},
+      ]
+    },
+    { :mp => 'udp', 
+      :fields => [
+        {:field => 'source', :type => 'String'},
+      ]
+    },
+  ]
+}

data/test/fixture/oml.xml

@@ -0,0 +1,17 @@
+<omlc experiment='my_foo_experiment' id='my_bar_application'>
+  <collect url='tcp://10.0.0.200:3003'>
+    <stream mp='radiotap' interval='2'>
+      <filter field='sig_strength_dBm' operation='avg' />
+      <filter field='noise_strength_dBm' operation='avg' />
+      <filter field='power' operation='avg' rename='energy' />
+    </stream>
+    <stream mp='udp' samples='10'>
+      <filter field='pkt_len' operation='stddev' />
+    </stream>
+  </collect>
+  <collect url='tcp://srv.mytestbed.net:3003'>
+    <stream mp='tcp' interval='5'>
+      <filter field='throughput' operation='avg' />
+    </stream>
+  </collect>
+</omlc>

data/test/omf_rc/resource_proxy/abstract_resource_spec.rb

@@ -58,7 +58,7 @@ describe AbstractResource do
     it "must add the resource to its created resource list" do
       child = @node.create(:wifi, { hrn: 'default_wifi' })
       @node.children.must_include child
-      @node.request_child_resources[child.uid].must_equal 'default_wifi'
+      @node.request_child_resources.find { |v| v.uid == child.uid }.name.must_equal 'default_wifi'
     end
   end
 
@@ -130,10 +130,12 @@ describe AbstractResource do
   describe "when request/configure property not pre-defined in proxy" do
     it "must try property hash" do
       @node.property[:bob] = "bob"
+      @node.property[:false] = false
       @node.request_bob.must_equal "bob"
+      @node.request_false.must_equal false
       @node.configure_bob("not_bob")
       @node.request_bob.must_equal "not_bob"
-      proc { @node.request_bobs_cousin }.must_raise NoMethodError
+      proc { @node.request_bobs_cousin }.must_raise OmfRc::UnknownPropertyError
       proc { @node.bobs_cousin }.must_raise NoMethodError
     end
   end