omf_ec 6.0.0.pre.3 → 6.0.0.pre.4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.3
+  version: 6.0.0.pre.4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70297155976580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
+  version_requirements: *70297155976580
 - !ruby/object:Gem::Dependency
   name: omf_common
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70297155974820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,105 +32,63 @@ dependencies:
         version: 6.0.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.0.0.pre
+  version_requirements: *70297155974820
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70297155973900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+        version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+  version_requirements: *70297155973900
 description: Experiment controller of OMF, a generic framework for controlling and
   managing networking testbeds.
 email:
 - omf-user@lists.nicta.com.au
 executables:
-- omf_pre
+- omf_ec
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
 - Rakefile
-- bin/omf
-- bin/omf_pre
-- bin/omf_test
+- bin/omf_ec
 - config/ec.yml
-- example/net_devices.rb
-- exp_repo/system/exp/eventlib.rb
-- exp_repo/system/exp/imageNode.rb
-- exp_repo/system/exp/reset.rb
-- exp_repo/system/exp/saveNode.rb
-- exp_repo/system/exp/stat.rb
-- exp_repo/system/exp/stdlib.rb
-- exp_repo/system/exp/tell.rb
-- exp_repo/system/exp/testlib.rb
-- exp_repo/system/exp/winlib.rb
-- exp_repo/system/topo/active.rb
-- exp_repo/system/topo/all.rb
-- exp_repo/system/topo/circle.rb
-- exp_repo/test/app/aodvd.rb
-- exp_repo/test/app/appDef1.rb
-- exp_repo/test/app/athstats.rb
-- exp_repo/test/app/echo.rb
-- exp_repo/test/app/gennyReceiverAppDef.rb
-- exp_repo/test/app/gennySenderAppDef.rb
-- exp_repo/test/app/itgdec.rb
-- exp_repo/test/app/itgr.rb
-- exp_repo/test/app/itgs.rb
-- exp_repo/test/app/nop.rb
-- exp_repo/test/app/otg2.rb
-- exp_repo/test/app/otg2_mp.rb
-- exp_repo/test/app/otr2.rb
-- exp_repo/test/app/otr2_mp.rb
-- exp_repo/test/app/trace_oml2.rb
-- exp_repo/test/app/wlanconfig_oml2.rb
-- exp_repo/test/exp/conf-room-demo.rb
-- exp_repo/test/exp/planetlab.rb
-- exp_repo/test/exp/test01.rb
-- exp_repo/test/exp/test02.rb
-- exp_repo/test/exp/test03.rb
-- exp_repo/test/exp/test04.rb
-- exp_repo/test/exp/test05.rb
-- exp_repo/test/exp/test06.rb
-- exp_repo/test/exp/tutorial/hello-world-wired.rb
-- exp_repo/test/exp/tutorial/hello-world-wireless.rb
-- exp_repo/test/exp/tutorial/using-filters.rb
-- exp_repo/test/exp/tutorial/using-groups.rb
-- exp_repo/test/exp/tutorial/using-properties.rb
-- exp_repo/test/exp/tutorial/using-prototypes.rb
-- exp_repo/test/proto/aodvrouter.rb
-- exp_repo/test/proto/driverqueryapp.rb
-- exp_repo/test/proto/forwarder.rb
-- exp_repo/test/proto/itgcbrsender.rb
-- exp_repo/test/proto/itgdecoder.rb
-- exp_repo/test/proto/itgreceiver.rb
-- exp_repo/test/proto/itgvoipsender.rb
-- exp_repo/test/proto/listener2.rb
-- exp_repo/test/proto/nop.rb
-- exp_repo/test/proto/probelink.rb
-- exp_repo/test/proto/raw_receiver.rb
-- exp_repo/test/proto/receiver2_mp.rb
-- exp_repo/test/proto/sender2_mp.rb
-- exp_repo/test/proto/udp_receiver.rb
-- exp_repo/test/proto/udp_sender.rb
+- example/engine_oedl.rb
+- example/engine_test.rb
+- example/test_exp/test00.rb
+- example/test_exp/test01.rb
+- example/test_exp/test02.rb
+- example/test_exp/test03.rb
+- example/test_exp/test04.rb
+- example/test_exp/test05.rb
+- example/test_exp/test06.rb
+- example/test_exp/test07.rb
 - lib/omf_ec.rb
+- lib/omf_ec/app_definition.rb
+- lib/omf_ec/backward/app_definition.rb
+- lib/omf_ec/backward/core_ext/array.rb
+- lib/omf_ec/backward/default_events.rb
+- lib/omf_ec/backward/dsl.rb
+- lib/omf_ec/backward/exp/testbed.rb
+- lib/omf_ec/backward/group.rb
+- lib/omf_ec/context.rb
+- lib/omf_ec/context/app_context.rb
+- lib/omf_ec/context/def_app_context.rb
+- lib/omf_ec/context/group_context.rb
+- lib/omf_ec/context/net_context.rb
+- lib/omf_ec/dsl.rb
+- lib/omf_ec/experiment.rb
+- lib/omf_ec/group.rb
 - lib/omf_ec/version.rb
 - omf_ec.gemspec
+- test/omf_ec/context_spec.rb
+- test/omf_ec/group_spec.rb
+- test/test_helper.rb
 homepage: https://www.mytestbed.net
 licenses: []
 post_install_message: 
@@ -156,9 +109,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: OMF experiment controller
-test_files: []
-has_rdoc: 
+test_files:
+- test/omf_ec/context_spec.rb
+- test/omf_ec/group_spec.rb
+- test/test_helper.rb

data/bin/omf

@@ -1,147 +0,0 @@
-#!/usr/bin/env ruby
-#
-require 'gli'
-require 'omf_ec'
-
-include GLI::App
-
-program_desc "Run a command on the testbed(s)"
-
-version OmfEc::VERSION
-
-desc "Debug (this script only, not passed to omf exec)"
-switch [:d, :debug]
-
-desc "Execute an experiment script"
-arg_name 'Describe arguments to exec here'
-command :exec do |c|
-  c.desc 'Describe a switch to exec'
-  c.switch :s
-
-  c.desc 'Describe a flag to exec'
-  c.default_value 'default'
-  c.flag :f
-  c.action do |global_options,options,args|
-
-    # Your command logic here
-
-    # If you have any errors, just raise them
-    # raise "that command made no sense"
-  end
-end
-
-desc "Load a disk image on a given set of nodes"
-command :load do |c|
-  c.desc 'Describe a flag to exec'
-  c.default_value 'default'
-  c.flag :f
-
-  c.desc "Aggregate Name"
-  c.arg_name "AGGREGATE"
-  c.flag [:c, :config]
-
-  c.desc "A valid topology file or description. If a file 'TOPOLOGY' doesn't exist, interpret it as a comma-separated list of nodes)"
-  c.default_value "system:topo:all"
-  c.arg_name "TOPOLOGY"
-  c.flag [:t, :topology]
-
-  c.desc "Disk image to load"
-  c.default_value "baseline.ndz"
-  c.arg_name "IMAGE"
-  c.flag [:i, :image]
-
-  c.desc "A duration (in sec.) after which imageNodes should stop waiting for nodes that have not finished their image installation"
-  c.default_value "800"
-  c.arg_name "SECONDS"
-  c.flag [:o, :timeout]
-
-  c.desc "Path where the resulting Topologies should be saved"
-  c.default_value "/tmp"
-  c.arg_name "PATH"
-  c.flag [:outpath]
-
-  c.desc "Prefix to use for naming the resulting Topologies"
-  c.default_value "your experiment ID"
-  c.arg_name "PREFIX"
-  c.flag [:outprefix]
-
-  c.action do |global_options,options,args|
-  end
-end
-
-desc "Save a disk image from a given node into a file"
-command :save do |c|
-  c.desc "Aggregate Name"
-  c.arg_name "AGGREGATE"
-  c.flag [:c, :config]
-
-  c.desc "Save image node"
-  c.arg_name "NODE"
-  c.flag [:n, :node]
-
-  c.action do |global_options,options,args|
-  end
-end
-
-desc "Switch a given set of nodes ON/OFF or reboot them"
-long_desc <<-DESC
-  Specify a CMC action:
-
-  on      - turn node(s) ON
-
-  offs    - turn node(s) OFF (soft)
-
-  offh    - turn node(s) OFF (hard)
-
-  reboot  - treboots node(s) (soft)
-
-  reset   - tresets node(s) (hard)
-DESC
-command :tell do |c|
-  c.desc "A valid topology file or description. If a file 'TOPOLOGY' doesn't exist, interpret it as a comma-separated list of nodes)"
-  c.default_value "system:topo:all"
-  c.arg_name "TOPOLOGY"
-  c.flag [:t, :topology]
-
-  c.desc "Aggregate Name"
-  c.arg_name "AGGREGATE"
-  c.flag [:c, :config]
-
-  c.desc "CMC action"
-  c.arg_name "ACTION"
-  c.flag [:a, :action], :must_match => %w(on offs offh reboot reset)
-
-  c.action do |global_options,options,args|
-  end
-end
-
-desc "Returns the status of a given set of nodes"
-command :stat do |c|
-  c.desc "Print a summary of the node status for the testbed"
-  c.switch [:s, :summary]
-
-  c.desc "A valid topology file or description. If a file 'TOPOLOGY' doesn't exist, interpret it as a comma-separated list of nodes)"
-  c.default_value "system:topo:all"
-  c.arg_name "TOPOLOGY"
-  c.flag [:t, :topology]
-
-  c.desc "Aggregate Name"
-  c.arg_name "AGGREGATE"
-  c.flag [:c, :config]
-
-  c.action do |global_options,options,args|
-  end
-end
-
-pre do |global,command,options,args|
-  true
-end
-
-post do |global,command,options,args|
-end
-
-on_error do |exception|
-  true
-end
-
-exit run(ARGV)

data/bin/omf_pre

@@ -1,76 +0,0 @@
-#!/usr/bin/env ruby
-#
-require 'gli'
-require 'omf_ec'
-require 'omf_common'
-$stdout.sync = true
-
-include GLI::App
-include OmfCommon
-
-program_desc "Run a command on the testbed(s)"
-
-version OmfEc::VERSION
-desc "Debug mode (printing debug logging messages)"
-switch [:d, :debug]
-
-desc "Execute an experiment script"
-arg_name 'path_to_script_file'
-command :exec do |c|
-  c.desc "XMPP user name"
-  c.arg_name "USER"
-  c.flag [:u, :user]
-
-  c.desc "XMPP user password"
-  c.arg_name "PASSWORD"
-  c.flag [:p, :password]
-
-  c.desc "XMPP server domain"
-  c.arg_name "DOMAIN"
-  c.flag [:s, :server]
-
-  c.desc "Check script version (you need to define OMF_VERSIONS in your script"
-  c.switch [:c, :check]
-
-  c.action do |global_options,options,args|
-    if global_options[:debug]
-      Logging.logger.root.level = :debug
-      Blather.logger = logger
-    end
-    unless options[:user] && options[:password] && options[:server]
-      help_now! "Incomplete options"
-    end
-    @opts = options
-    @comm = Comm.new(:xmpp)
-
-    # Check version
-    if options[:check]
-      File.open(args[0], 'r') do |f|
-        f.read.chomp.match(/OMF_VERSIONS\W*=\W*(.*)/)
-        versions = $1
-        unless versions && versions.split(',').include?(PROTOCOL_VERSION)
-          raise StandardError, "Could not find compatibile protocol version number in your script"
-        end
-      end
-    end
-
-    begin
-      load args[0], true
-    rescue => e
-      logger.fatal e.message
-      logger.fatal e.backtrace.join("\n")
-    end
-
-    EM.run do
-      @comm.connect(@opts[:user], @opts[:password], @opts[:server])
-      trap(:INT) { @comm.disconnect }
-      trap(:TERM) { @comm.disconnect }
-    end
-  end
-end
-
-on_error do |exception|
-  true
-end
-
-exit run(ARGV)

data/bin/omf_test

@@ -1,161 +0,0 @@
-#!/usr/bin/env ruby
-
-require "optparse"
-require 'omf_common'
-$stdout.sync = true
-
-options = {
-  dsl: 'xmpp',
-  pubsub_host: 'pubsub',
-}
-
-executable_name = File.basename($PROGRAM_NAME)
-
-option_parser = OptionParser.new do |opts|
-  opts.banner = "usage: #{executable_name} [options]"
-
-  opts.on("-u USER", "Username") do |user|
-    options[:user] = user
-  end
-
-  opts.on("-p PASSWORD", "Password") do |password|
-    options[:password] = password
-  end
-
-  opts.on("-s SERVER", "XMPP server") do |server|
-    options[:server] = server
-  end
-
-  opts.on("-n NODE", "PubSub node to subscribe") do |node|
-    options[:uid] = node
-  end
-
-  opts.on("-d", "--debug", "Debug mode") do
-    options[:debug] = true
-  end
-end
-
-begin
-  option_parser.parse!
-rescue => e
-  puts e.message
-  puts ""
-  puts option_parser.help
-  exit(1)
-end
-
-unless options[:server] && options[:user] && options[:server]
-  puts option_parser.help
-  exit(1)
-end
-
-Logging.logger.root.level = :debug if options[:debug]
-Blather.logger = logger
-
-comm = OmfCommon::Comm.new(options[:dsl])
-host = nil
-
-# Create a resource of type mock
-create_msg = OmfCommon::Message.create { |v| v.property('type', 'mock') }
-
-create_wifi_msg = OmfCommon::Message.create do |v|
-  v.property('hrn', 'wlan0')
-  v.property('type', 'wifi')
-end
-
-# A request message to be sent to mock
-request_mock_property = OmfCommon::Message.request do |v|
-  v.property('available_properties')
-  v.property('kernel_version')
-  v.property('resource_proxy_list')
-  v.property('resource_utility_list')
-  v.property('bob')
-end
-
-request_wifi_property = OmfCommon::Message.request do |v|
-  v.property('link')
-  v.property('available_properties')
-end
-
-# A request message to be sent to node
-request_node_property = OmfCommon::Message.request do |v|
-  v.property('available_properties')
-  v.property('proxies')
-end
-
-# A configure message to be sent to mock
-configure_mock_property = OmfCommon::Message.configure do |v|
-  v.property('hrn', 'human_readable_name')
-end
-
-# Simple release message
-release_message = OmfCommon::Message.release
-
-# For simplicity, use comm instance directly
-comm.when_ready do
-  logger.info "CONNECTED: #{comm.jid.inspect}"
-  host = "#{options[:pubsub_host]}.#{comm.jid.domain}"
-
-  # We assume the node where RC runs started already
-  comm.subscribe(options[:uid], host) do |e|
-    if e.error?
-      comm.disconnect(host)
-    else
-      # Publish the create message to RC's pubsub topic
-      comm.publish(options[:uid], request_node_property, host)
-      comm.publish(options[:uid], create_wifi_msg, host)
-    end
-  end
-end
-
-# Fired when messages published to the nodes I subscribed to
-comm.node_event do |e|
-  e.items.each do |item|
-    begin
-      # Parse the message (pubsub item payload)
-      message = OmfCommon::Message.parse(item.payload)
-      context_id = message.read_content("context_id")
-
-      # We are only interested in inform messages for the moment
-      if message.operation == :inform
-        inform_type = message.read_content("inform_type")
-
-        case inform_type
-        when 'CREATED'
-          resource_id = message.read_content("resource_id")
-          logger.info "Resource #{resource_id} created"
-
-          comm.subscribe(resource_id, host) do |m|
-            EM.add_periodic_timer(2) do
-              comm.publish(resource_id, request_wifi_property, host)
-              #comm.publish(resource_id, request_mock_property, host)
-              #comm.publish(resource_id, configure_mock_property, host)
-            end
-          end
-
-        when 'STATUS'
-          message.read_element("//property").each do |p|
-            logger.info "#{p.attr('key')} => #{p.content.strip}"
-          end
-        when 'RELEASED'
-          logger.info "Resource #{message.read_content("resource_id")} released"
-        when 'FAILED'
-          logger.error message.read_content("error_message")
-        end
-      end
-    rescue => e
-      logger.error "#{e.message}\n#{e.backtrace.join("\n")}"
-    end
-  end
-end
-
-trap(:INT) { comm.disconnect(host) }
-trap(:TERM) { comm.disconnect(host) }
-
-EM.run do
-  comm.connect(options[:user], options[:password], options[:server])
-
-  EM.add_timer(5) do
-    comm.publish(options[:uid], release_message, host)
-  end
-end

data/example/net_devices.rb

@@ -1,75 +0,0 @@
-# @comm is default communicator defined in script runner
-#
-@node = @comm.get_topic(`hostname`.chomp)
-
-@node.on_message lambda {|m| m.operation == :inform && m.read_content('inform_type') == 'FAILED' } do |message|
-  logger.error message
-end
-
-device_request = @comm.request_message([:devices])
-
-device_request.on_inform_status do |message|
-  @devices = message.read_property('devices').items
-
-  logger.info <<-LOG
-DEVICES ->
-#{@devices.map { |item| "Name: #{item.name}, Driver: #{item.driver}, Proxy: #{item.proxy}"}.join("\n") }
-  LOG
-
-  first_wlan = @devices.find { |v| v.proxy == 'wlan' }
-  first_eth = @devices.find { |v| v.proxy == 'net' }
-
-  wlan_create = @comm.create_message([type: first_wlan.proxy, hrn: first_wlan.name])
-  eth_create = @comm.create_message([type: first_eth.proxy, hrn: first_eth.name])
-
-  wlan_create.on_inform_created do |message|
-    @wlan = @comm.get_topic(message.resource_id)
-
-    @wlan.subscribe do
-      wlan_p = @comm.request_message([:link, :ip_addr])
-
-      wlan_p.on_inform_status do |message|
-        freq = message.read_property(:link).freq
-        ip_addr = message.read_property(:ip_addr)
-        logger.info "WLAN : #{freq}, #{ip_addr}"
-      end
-
-      wlan_p.publish @wlan.id
-    end
-  end
-
-  eth_create.on_inform_created do |message|
-    @eth = @comm.get_topic(message.resource_id)
-    @eth.on_message lambda {|m| m.operation == :inform && m.read_content('inform_type') == 'FAILED' } do |message|
-      logger.error message.read_content(:reason)
-    end
-
-    @eth.subscribe do
-      eth_ip = @comm.request_message([:ip_addr])
-
-      eth_ip.on_inform_status do |m|
-        logger.info "ETH #{m.read_property(:ip_addr)}"
-      end
-
-      eth_ip_conf = @comm.configure_message([{ip_addr: '192.168.7.1'}])
-
-      eth_ip.on_inform_status do |m|
-        logger.info "ETH #{m.read_property(:ip_addr)}"
-      end
-
-      eth_ip.publish @eth.id
-      eth_ip_conf.publish @eth.id
-    end
-  end
-
-  wlan_create.publish @node.id
-  eth_create.publish @node.id
-end
-
-@comm.when_ready do
-  logger.info "CONNECTED: #{@comm.jid.inspect}"
-
-  @node.subscribe do
-    device_request.publish @node.id
-  end
-end