oml4r 2.10.4.20.g6503629 → 2.10.4.30.g89b8035

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cd8b6f5e465409927b5b77ac846b1d43d14a4b6c
+  data.tar.gz: 7ecd90004cbbe74cad0f59777f154848411f7f2a
+SHA512:
+  metadata.gz: 8119deb446648db71725aa85043ee6e9cf5bda2c03b50599372d18edde524880cde856102f68cb8786a62d53598ff3f7ae149c758d436defe6b52d5046a240a9
+  data.tar.gz: 13552cdb60d6f98357bc2140cdad612634e7ee017b8d3c08bc2662e02d0c45d35f601987dcc9c81ec66674a96d137f224c24bdf3cd838335b23c72941fb56a89

data/bin/ntpq-oml2

@@ -30,9 +30,9 @@
 require 'rubygems'
 require 'oml4r'
 
-@@bin = "ntpq"
-@@binopt = "-p -n"
-@@appname = @@bin + "-oml2"
+$bin = "ntpq"
+$binopt = "-p -n"
+$appname = $bin + "-oml2"
 # XXX: if when is expressed in days, we need to rescale it, see MP.cleanup
 @@regex = /^(?<rtype>\*|#|o|\+|x|.|-| )(?<remote>[^\s]+)\s+(?<refid>[^\s]+)\s+(?<stratum>\d+)\s+(?<type>l|u|m|b|-)\s+(?<when>\d+d?|-})\s+(?<poll>\d+)\s+(?<reach>\d+)\s+(?<delay>(\d|\.)+)\s+(?<offset>-?(\d|\.)+)\s+(?<jitter>(\d|\.)+)$/ 
 
@@ -40,7 +40,7 @@ require 'oml4r'
 # [rtype]remote, refid, st[ratum], t[ype], when, poll, reach, delay, offset, jitter [or dispersion]
 # [0] http://h30499.www3.hp.com/t5/System-Administration/Interpreting-NTPQ-output/m-p/3616540/highlight/true#M235154
 class MP < OML4R::MPBase
-  name @@bin
+  name $bin
 
   param :rtype, :type => :string	# 
   # Character that may be before hostname:
@@ -109,14 +109,14 @@ class Wrapper
     @loop_interval = 0
 
     begin
-      @leftover = OML4R::init(args, :appName => @@bin) do |argParser|
-	argParser.banner = "Runs the system #{@@bin}#{(@@binopt.nil?)?"":" (#{@@binopt})"} and reports measurements via OML\n Use -h or --help for a list of options\n\n"
+      @leftover = OML4R::init(args, :appName => $bin) do |argParser|
+	argParser.banner = "Runs the system #{$bin}#{($binopt.nil?)?"":" (#{$binopt})"} and reports measurements via OML\n Use -h or --help for a list of options\n\n"
 	argParser.on("-l","--loop-interval NUMBER","Interval between runs (seconds)"){ |interval| @loop_interval = interval.to_i()}
-	argParser.on("-q","--[no]-quiet ","Don't show #{@@bin} output on the console"){ @verbose = false }
+	argParser.on("-q","--[no]-quiet ","Don't show #{$bin} output on the console"){ @verbose = false }
       end
 
     rescue OML4R::MissingArgumentException => ex
-      OML4R.logger.warn "#{@@appname}: #{ex}"
+      OML4R.logger.warn "#{$appname}: #{ex}"
     end
 
   end
@@ -128,7 +128,7 @@ class Wrapper
   end
 
   def run()
-    @binio = IO.popen("#{@@bin} #{@@binopt} #{(@leftover.nil?)?"":@leftover.join(' ')}")
+    @binio = IO.popen("#{$bin} #{$binopt} #{(@leftover.nil?)?"":@leftover.join(' ')}")
     while true
       row = @binio.readline
       puts row if @verbose
@@ -159,7 +159,7 @@ class Wrapper
 end #end of class
 
 begin
-  OML4R.logger.info "#{@@appname} #{OML4R::VERSION}"
+  OML4R.logger.info "#{$appname} #{OML4R::VERSION}"
 
   app = Wrapper.new(ARGV)
 
@@ -191,7 +191,7 @@ rescue Interrupt
 rescue SystemExit
   OML4R.close
 rescue Exception => ex
-  OML4R.logger.error "#{@@appname}: #{ex}"
+  OML4R.logger.error "#{$appname}: #{ex}"
 end
 
 # Local Variables:

data/bin/ping-oml2

@@ -32,12 +32,13 @@
 require 'rubygems'
 require 'oml4r'
 
-@@bin = "ping"
-@@appname = @@bin + "-oml2"
+$bin = "ping"
+$appname = $bin + "-oml2"
 
 class MPStat < OML4R::MPBase
-  name @@bin
-  param :dest_addr, :type => :string
+  name $bin
+  param :remote, :type => :string
+  param :seq, :type => :uint32
   param :ttl, :type => :uint32
   param :rtt, :type => :double
   param :rtt_unit, :type => :string
@@ -74,7 +75,7 @@ class PingWrapper
     @binio = nil
 
     begin
-      leftover = OML4R::init(args, :appName => @@bin) do |argParser|
+      leftover = OML4R::init(args, :appName => $bin) do |argParser|
 	argParser.banner = "Runs the system ping and reports measurements via OML\n Use -h or --help for a list of options\n\n"
 	argParser.on("-a","--dest_addr ADDRESS","Address to ping (the -a switch is optional)") { |address| @addr = address.to_s() }
 	argParser.on("-b","--broadcast","Allow pinging a broadcast address") { @broadcast ='-b' }
@@ -86,7 +87,7 @@ class PingWrapper
       end
 
     rescue OML4R::MissingArgumentException => ex
-      OML4R.logger.warn "#{@@appname}: #{ex}"
+      OML4R.logger.warn "#{$appname}: #{ex}"
       leftover = []
     end
 
@@ -102,27 +103,35 @@ class PingWrapper
 
   def process_output(row)
     if not (parse =
-	    /^\d+ bytes from (.*):.*ttl=(\d+) time=([0-9.]+) ([a-zA-Z]+)/.match(row)
+	    /^\d+ bytes from (.*):.*icmp_seq=(\d+) ttl=(\d+) time=([0-9.]+) ([a-zA-Z]+)/.match(row)
 	   ).nil?  # One sample
-	   MPStat.inject(*parse[1..4])
+       MPStat.inject(*parse[1..5])
 
     elsif not (parse =
-	       /^(\d+).*transmitted, (\d+).*received, ([0-9.]+)%.*loss(, time ([0-9.]+) *([a-zA-Z]+))?/.match(row)
-	      ).nil?  # Summary
+	    /^PING .*\((?<dest_addr>[^\)]+)\) (?<packetsize>\d+)\((?<packetsize_total>\d+)\) bytes/.match(row)
+	   ).nil?  # First line
+
+      MPStat.inject_metadata('dest_addr',parse[:dest_addr])
+      MPStat.inject_metadata('packetsize_B',parse[:packetsize])
+      MPStat.inject_metadata('packetsize_total_B',parse[:packetsize_total])
+
+    elsif not (parse =
+	       /^(\d+).*transmitted, (\d+).*received,.* ([0-9.]+)%.*loss(, time ([0-9.]+) *([a-zA-Z]+))?/.match(row)
+	      ).nil?  # Summary XXX: ignore duplicates in, e.g., "3 packets transmitted, 3 received, +171 duplicates, 0% packet loss, time 2003ms"
         # time (matches 5 & 6) is not printed by ping on OSX
         # match 4 is unused
         q = parse.to_a[1..3] + parse.to_a[5..6]
-	      MPSummary.inject(*q)
+	MPSummary.inject(*q)
 
     elsif not (parse =
 	       /min.*= ([0-9.]+)\/([0-9.]+)\/([0-9.]+)\/([0-9.]+) ([a-zA-Z]+)/.match(row)
 	      ).nil?  # RTT statistics
-	      MPRTTStats.inject(*parse[1..5])
+      MPRTTStats.inject(*parse[1..5])
     end
   end
 
   def run()
-    @binio = IO.popen("#{@@bin}#{@inet6} #{@numeric} #{@count} #{@interval} #{@broadcast} #{@addr}")
+    @binio = IO.popen("#{$bin}#{@inet6} #{@numeric} #{@count} #{@interval} #{@broadcast} #{@addr}")
     while true
       row = @binio.readline
       puts row if @verbose
@@ -148,7 +157,7 @@ class PingWrapper
 end #end of class
 
 begin
-  OML4R.logger.info "#{@@appname} #{OML4R::VERSION}"
+  OML4R.logger.info "#{$appname} #{OML4R::VERSION}"
 
   app = PingWrapper.new(ARGV)
 
@@ -173,7 +182,7 @@ rescue Interrupt
 rescue SystemExit
   OML4R.close
 rescue Exception => ex
-  OML4R.logger.error "#{@@appname}: #{ex}"
+  OML4R.logger.error "#{$appname}: #{ex}"
 end
 
 # Local Variables:

data/bin/signalgen

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+#
+# Copyright (c) 2014 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
+# COPYING or at http://opensource.org/licenses/MIT. By downloading or
+# using this software you accept the terms and the liability disclaimer
+# in the License.
+#
+# ------------------
+#
+# = signalgen
+#
+# This is a simple OML4R example, which generates some signal values and 
+# sends them to an OML end-point (e.g. oml2 server)
+#
+require 'oml4r'
+
+# Some default parameter values
+APPNAME = 'signalgen'
+DEF_ODOMAIN = 'foo'
+DEF_OCOLLECT = 'file:-'
+DEF_FREQ = 2.0 # Hz
+DEF_INCREMENT = 15 # rad
+DEF_SAMPLE = 500 # samples
+
+# Define our Measurement Points
+class SinMP < OML4R::MPBase
+  name :sin
+  param :label # default type is String
+  param :phase, :type => :int32
+  param :value, :type => :double
+end
+
+class CosMP < OML4R::MPBase
+  name :cos
+  param :label # default type is String
+  param :value, :type => :double
+end
+
+# Initialise the OML4R module for our application
+# 'collect' could also be tcp:host:port
+opts = {:appName => APPNAME, :domain => DEF_ODOMAIN, :collect => DEF_OCOLLECT}
+
+begin
+  @freq = DEF_FREQ
+  @inc = DEF_INCREMENT
+  @sample = DEF_SAMPLE
+  OML4R::init(ARGV, opts) do |ap|
+    ap.banner = "A simple OML4R example, which generates some signal values."
+    ap.on("-f","--frequency F","Signal frequency [Hz]") { |f| @freq = f.to_f }
+    ap.on("-i","--increment A","Increment angle between samples [rad]") { |a| @inc = a.to_i }
+    ap.on("-n","--samples N","Number of samples to generate") { |n| @sample = n.to_i }
+  end
+rescue OML4R::MissingArgumentException => mex
+  $stderr.puts mex
+  exit
+end
+
+# Record some metadata
+puts "#{APPNAME} - Frequency: #{@freq} Hz - Increment: #{@inc} rad - Samples: #{@sample}"
+SinMP.inject_metadata('frequency',@freq)
+SinMP.inject_metadata('increment',@inc)
+SinMP.inject_metadata('samples',@sample)
+
+# Now collect and inject some measurements
+@sample.times do |i|
+  sleep 1./@freq
+  angle = @inc * i
+  SinMP.inject("label_#{angle}", angle, Math.sin(angle))
+  CosMP.inject("label_#{angle}", Math.cos(angle))
+end
+
+# Don't forget to close when you are finished
+OML4R::close()

data/lib/oml4r/version.rb

@@ -6,6 +6,10 @@
 
 module OML4R
 
+  # NOTE: The version number is now derived automatically from Git tags. This
+  # file needs not be modified.
+  # To create a new release, use git tag -asm "DESC" v2.m.r (make sure the
+  # feature set corresponds to that of liboml2-2.m).
   def self.version_of(name)
     git_tag  = `git describe --tags 2> /dev/null`.chomp
     git_root = `git rev-parse --show-toplevel 2> /dev/null`.chomp

data/omf/ping-oml2.rb

@@ -9,12 +9,11 @@
 #
 defApplication('oml:app:ping', 'ping') do |a|
 
-  a.version(2, 9, 0)
-  a.shortDescription = "Wrapper around ping"
+  # a.version(2, 9, 0) # Deprecated in OMF6
   a.description = %{This application runs the system ping, parses its output and
 reports the measurements via OML
   }
-  a.path = "/usr/local/bin/ping-oml2"
+  a.binary_path = "/usr/local/bin/ping-oml2"
 
   a.defProperty('dest_addr', 'Address to ping', nil,
 		:type => :string)
@@ -28,7 +27,8 @@ reports the measurements via OML
 		:type => :boolean)
 
   a.defMeasurement('ping') do |m|
-    m.defMetric('dest_addr',:string)
+    m.defMetric('remote',:string)
+    m.defMetric('seq',:uint32)
     m.defMetric('ttl',:uint32)
     m.defMetric('rtt',:double)
     m.defMetric('rtt_unit',:string)

data/omf/signalgen.rb

@@ -0,0 +1,60 @@
+# Copyright (c) 2014 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
+# COPYING or at http://opensource.org/licenses/MIT. By downloading or
+# using this software you accept the terms and the liability disclaimer
+# in the License.
+#
+
+defApplication('signalgen') do |a|
+  a.binary_path = "/usr/local/bin/signalgen"
+  a.description = "A simple signal generator reporting values into OML"
+
+  a.defProperty('frequency', 'Signal frequency [Hz]', '-f', :type => :numeric)
+  a.defProperty('increment', 'Increment angle between samples [rad]', '-i', :type => :numeric)
+  a.defProperty('samples', 'Number of samples to generate', '-n', :type => :numeric)
+
+  a.defMeasurement('sin') do |m|
+    m.defMetric('label', :string)
+    m.defMetric('phase', :int32)
+    m.defMetric('value', :double)
+  end
+
+  a.defMeasurement('cos') do |m|
+    m.defMetric('label', :string)
+    m.defMetric('value', :double)
+  end
+end
+
+# Example use with OMF v6:
+#
+# loadOEDL('https://raw.githubusercontent.com/mytestbed/oml4r/master/omf/signalgen.rb')
+#
+# defProperty('res1', "test1", "ID of a node")
+#
+# defGroup('Generator', property.res1) do |node|
+#   node.addApplication("signalgen") do |app|
+#     app.setProperty('samples', 10)
+#     app.measure('sin', samples: 1)
+#   end
+# end
+#
+# onEvent(:ALL_UP_AND_INSTALLED) do
+#   info "Starting a remote signal generator"
+#   allGroups.startApplications
+#
+#   after 30 do
+#     allGroups.stopApplications
+#     Experiment.done
+#   end
+# end
+# 
+# defGraph 'Sine' do |g|
+#   g.ms('sin').select {[ oml_ts_client.as(:ts), :value ]}
+#   g.caption "Generated Sine Signal"
+#   g.type 'line_chart3'
+#   g.mapping :x_axis => :ts, :y_axis => :value
+#   g.xaxis :legend => 'time [s]'
+#   g.yaxis :legend => 'Sine Signal', :ticks => {:format => 's'}
+# end
+

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oml4r
 version: !ruby/object:Gem::Version
-  version: 2.10.4.20.g6503629
-  prerelease: 10
+  version: 2.10.4.30.g89b8035
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies: []
 description: This is a simple client library for OML which does not use liboml2 and
   its filters, but connects directly to the server using the +text+ protocol.  User
@@ -27,6 +26,7 @@ executables:
 - oml4r-wlanconfig
 - oml4r-zabbix
 - ping-oml2
+- signalgen
 - test_types
 extensions: []
 extra_rdoc_files: []
@@ -46,6 +46,7 @@ files:
 - bin/oml4r-wlanconfig
 - bin/oml4r-zabbix
 - bin/ping-oml2
+- bin/signalgen
 - bin/test_types
 - examples/oml4r-logging.rb
 - examples/oml4r-multiple-channel-example.rb
@@ -64,30 +65,30 @@ files:
 - omf/README
 - omf/ntpq-oml2.rb
 - omf/ping-oml2.rb
+- omf/signalgen.rb
 - oml4r.gemspec
 homepage: http://oml.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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple OML client library and applications for Ruby
 test_files: []