omf_ec 6.0.0.pre.4 → 6.0.0.pre.5

data/test/omf_ec/experiment_spec.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+require 'omf_ec/experiment'
+
+describe OmfEc::Experiment do
+  before do
+    @experiment = OmfEc::Experiment.instance
+  end
+
+  it "must return id" do
+    @experiment.id.wont_be_nil
+
+    @experiment.name = 'bob'
+    @experiment.id.must_match /bob-/
+  end
+
+  it "must be able to add event" do
+    trigger = proc { 1 }
+    @experiment.add_event('bob', trigger)
+    @experiment.event('bob')[:name].must_equal "bob"
+    @experiment.event('bob')[:trigger].call.must_equal 1
+  end
+
+  it "must be able to add sub group" do
+    @experiment.add_sub_group('bob')
+    @experiment.sub_group('bob').must_equal "bob"
+  end
+
+  it "must be able to add group" do
+    proc { @experiment.add_group('bob') }.must_raise ArgumentError
+    OmfEc.stub :subscribe_and_monitor, true do
+      @experiment.add_group(OmfEc::Group.new('bob'))
+      @experiment.group('bob').must_be_kind_of OmfEc::Group
+    end
+  end
+
+  it "must be able to add resource to state" do
+    @experiment.add_or_update_resource_state('bob', type: :test)
+    @experiment.resource_state('bob')[:uid].must_equal 'bob'
+    @experiment.resource_state('bob')[:type].must_equal :test
+  end
+end

data/test/omf_ec/group_spec.rb

@@ -4,11 +4,54 @@ require 'omf_ec/group'
 describe OmfEc::Group do
   describe "when initialised" do
     it "must be generate unique id if :unique option is on" do
-      OmfEc::Group.new('bob').id.wont_equal 'bob'
+      OmfEc.stub :subscribe_and_monitor, true do
+        OmfEc::Group.new('bob').id.wont_equal 'bob'
+      end
     end
 
     it "must use name as id if :unique option is off" do
-      OmfEc::Group.new('bob', unique: false).id.must_equal 'bob'
+      OmfEc.stub :subscribe_and_monitor, true do
+        OmfEc::Group.new('bob', unique: false).id.must_equal 'bob'
+      end
+    end
+  end
+
+  describe "when used to represent group resource" do
+    before do
+      @comm = MiniTest::Mock.new
+      OmfEc.stub :subscribe_and_monitor, true do
+        @group = OmfEc::Group.new('bob', unique: false)
+      end
+    end
+
+    it "must init default context related arrasy" do
+      @group.net_ifs.must_equal []
+      @group.members.must_equal []
+      @group.app_contexts.must_equal []
+    end
+
+    it "must be capable of adding existing resources to group" do
+      skip
+      OmfCommon.stub :comm, @comm do
+        @comm.expect(:subscribe, true, [Array])
+        @group.add_resource(['r1', 'r2'])
+        @comm.verify
+      end
+    end
+
+    it "must be capable of creating new resources and add them to group" do
+      skip
+      OmfCommon.stub :comm, @comm do
+        @comm.expect(:subscribe, true, [String])
+        @comm.expect(:create_topic, true, [String])
+        @group.create_resource('r1', { type: :test, p1: 'bob' })
+        @comm.verify
+      end
+    end
+
+    it "must create new group context when calling resources" do
+      @group.resources.must_be_kind_of OmfEc::Context::GroupContext
     end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.4
+  version: 6.0.0.pre.5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70297155976580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.2'
   type: :development
   prerelease: false
-  version_requirements: *70297155976580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: omf_common
-  requirement: &70297155974820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,18 +37,28 @@ dependencies:
         version: 6.0.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70297155974820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.0.0.pre
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70297155973900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70297155973900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.3
 description: Experiment controller of OMF, a generic framework for controlling and
   managing networking testbeds.
 email:
@@ -64,8 +79,6 @@ files:
 - 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
@@ -83,14 +96,19 @@ files:
 - lib/omf_ec/context/net_context.rb
 - lib/omf_ec/dsl.rb
 - lib/omf_ec/experiment.rb
+- lib/omf_ec/experiment_property.rb
 - lib/omf_ec/group.rb
 - lib/omf_ec/version.rb
 - omf_ec.gemspec
 - test/omf_ec/context_spec.rb
+- test/omf_ec/dsl_spec.rb
+- test/omf_ec/experiment_property_spec.rb
+- test/omf_ec/experiment_spec.rb
 - test/omf_ec/group_spec.rb
 - test/test_helper.rb
-homepage: https://www.mytestbed.net
-licenses: []
+homepage: http://omf.mytestbed.net
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -100,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,11 +127,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_ec
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: OMF experiment controller
-test_files:
-- test/omf_ec/context_spec.rb
-- test/omf_ec/group_spec.rb
-- test/test_helper.rb
+test_files: []
+has_rdoc: 

data/example/test_exp/test04.rb

@@ -1,105 +0,0 @@
-#
-# Test 4
-#
-# Testing 2 nodes in 2 groups running already installed OTG/OTR
-# Also testing dynamic experiment properties
-#
-
-PKTSIZE = 256
-
-defProperty('res1', "unconfigured-node-1", "ID of a node")
-defProperty('res2', "unconfigured-node-2", "ID of a node")
-defProperty('bitrate', 2048, "Bitrate (bit/s) from the sender node")
-defProperty('packetsize', PKTSIZE, "Packet size (byte) from the sender node")
-
-defGroup('Sender', property.res1) {|node|
-  node.addApplication("test:app:otg2") {|app|
-    app.setProperty('udp:local_host', '192.168.0.2')
-    app.setProperty('udp:dst_host', '192.168.0.3')
-    app.setProperty('udp:dst_port', 3000)
-    app.setProperty('cbr:rate', property.bitrate * 2)
-    app.setProperty('cbr:size', property.packetsize)
-    app.measure('udp_out', :interval => 3)
-  }
-  node.net.w0.mode = "adhoc"
-  node.net.w0.type = 'g'
-  node.net.w0.channel = '6'
-  node.net.w0.essid = "testing"
-  node.net.w0.ip = "192.168.0.2"
-}
-
-defGroup('Receiver', property.res2) {|node|
-  node.addApplication("test:app:otr2") {|app|
-    app.setProperty('udp:local_host', '192.168.0.3')
-    app.setProperty('udp:local_port', 3000)
-    app.measure('udp_in', :samples => 3)
-  }
-  node.net.w0.mode = "adhoc"
-  node.net.w0.type = 'g'
-  node.net.w0.channel = '6'
-  node.net.w0.essid = "testing"
-  node.net.w0.ip = "192.168.0.3"
-}
-
-onEvent(:ALL_UP_AND_INSTALLED) do |event|
-  wait 10
-  allGroups.startApplications
-  wait 15
-  info "------------------------------"
-  info "TEST - Dynamic property change"
-  info "TEST - Value before: #{property.packetsize}"
-  property.packetsize = 512
-  info "TEST - Value after: #{property.packetsize}"
-  wait 15
-  allGroups.stopApplications
-  Experiment.done
-end
-
-
-
-#
-# Checking the Execution
-# Here you do whatever is required to check that the above experiment went well
-# Then return true if you decided that it did, or false otherwise
-#
-# Experiment log file is at: property.logpath
-# Also you may want to look at system:exp:testlib
-#
-
-def check_outcome
-
-  # Test 04 is successfull if all of the following are true:
-  # 1) each resource reports that all its wireless property were configured OK
-  # 2) the applications (OTG,OTR,execs) started and finished properly
-  # file has a message from the AgentCommands module containing "DONE.OK"
-  # 3) a SQ3 database is produced with some entries in the OTG and OTR tables
-  # 4) the receiver table of the database has the packetsize value increasing
-  logfile = "#{property.logpath}/#{Experiment.ID}.log"
-  lines = IO.readlines("#{logfile}")
-  # 1)
-  match1 = lines.grep(/CONFIGURED\.OK/)
-  r1 = (match1.length >= 10) ? true : false
-  # 2)
-  match1 = lines.grep(/APP_EVENT\ STARTED/)
-  r2 = (match1.length == 2) ? true : false
-  match1 = lines.grep(/APP_EVENT DONE\.OK/)
-  match2 = match1.grep(/AgentCommands/)
-  r3 = (match2.length == 2) ? true : false
-  # 3)
-  cnt1 = cnt2 = 0
-  ms('udp_out').project(:oml_ts_server).each { |r| cnt1 =+1 }
-  ms('udp_in').project(:oml_ts_server).each { |r| cnt2 =+1 }
-  r4 = (cnt1 >= 1) ? true : false
-  r5 = (cnt2 >= 1) ? true : false
-  # 4)
-  max = PKTSIZE
-  ms('udp_in').project(:pkt_length_max).each do |r|
-    value = r.tuple
-    max = value[0]
-  end
-  r6 = (max > PKTSIZE) ? true : false
-
-  puts "Check Outcome [r1:#{r1} - r2:#{r2} - r3:#{r3} - r4:#{r4} - r5:#{r5} - r6:#{r6}]"
-  return true if r1 && r2 && r3 && r4 && r5 && r6
-  return false
-end

data/example/test_exp/test05.rb

@@ -1,87 +0,0 @@
-#
-# Test 5
-#
-# Testing one nodes in one group running a custom app
-# Also testing all the possible bindings between app arguments and OMF
-# Also testing app installation via TAR archive (containing the app and a payload data)
-#
-
-defProperty('res1', "unconfigured-node-1", "ID of a node")
-defProperty('res2', "unconfigured-node-2", "ID of a node")
-defProperty('pstring', "ABC", "1st string argument")
-defProperty('pboolean', true, "1st boolean argument")
-defProperty('pinteger', 123, "1st integer argument")
-
-defApplication('myAppURI', 'myAppName') { |app|
-  app.path = "/usr/bin/myApp"
-  app.appPackage = "http://omf.mytestbed.net/myApp.tar"
-
-  app.defProperty('arg1','Argument 1', '-s', {:order => 1, :type => :string, :dynamic => true})
-  app.defProperty('arg2','Argument 2', '--arg2', {:type => :string, :dynamic => false})
-  app.defProperty('arg3','Argument 3', '-b', {:type => :boolean, :dynamic => false})
-  app.defProperty('arg4','Argument 4', '--arg4', {:type => :boolean, :dynamic => true})
-  app.defProperty('arg5','Argument 5', '--arg5', {:type => :boolean, :dynamic => false})
-  app.defProperty('arg6','Argument 6', '-i', {:order => 2, :type => :integer, :dynamic => false})
-  app.defProperty('arg7','Argument 7', '--arg7', {:type => :integer, :dynamic => true})
-  app.defProperty('arg8','Argument 8', nil, {:type => :string, :dynamic => true})
-  app.defProperty('arg9','Argument 9', nil, {:type => :integer, :dynamic => false})
-}
-
-defGroup('Actor', property.res1) {|n|
-  n.addApplication("myAppURI") {|app|
-    app.setProperty('arg1', property.pstring)  # Displays "-s ABC" in first position!
-    app.setProperty('arg2', 'DEF') # Displays "--arg2 DEF"
-    app.setProperty('arg3', property.pboolean) # Displays "-b"
-    app.setProperty('arg4', true) # Displays "--arg4"
-    app.setProperty('arg5', false) # Displays nothing
-    app.setProperty('arg6', property.pinteger) # Displays "-i 123" in second position!
-    app.setProperty('arg7', 456) # Displays "--arg7 456"
-    app.setProperty('arg8', "ZZZ") # Displays "ZZZ"
-    app.setProperty('arg9', 000) # Displays "0"
-  }
-}
-
-onEvent(:ALL_UP_AND_INSTALLED) do |event|
-  wait 5
-  allGroups.startApplications
-  wait 5
-  Experiment.done
-end
-
-
-#
-# Checking the Execution
-# Here you do whatever is required to check that the above experiment went well
-# Then return true if you decided that it did, or false otherwise
-#
-# Experiment log file is at: property.logpath
-# Also you may want to look at system:exp:testlib
-#
-
-def check_outcome
-
-  # Test 03 is successfull if all of the following are true:
-  # 1) the tarball is installed OK AND the application runs OK
-  # 2) the application outputs the correct payload from the tarball
-  # 3) the application accepts and outputs the correct arguments
-  logfile = "#{property.logpath}/#{Experiment.ID}.log"
-  lines = IO.readlines("#{logfile}")
-  # 1)
-  match1 = lines.grep(/APP_EVENT\ STARTED/)
-  r1 = (match1.length == 2) ? true : false
-  match1 = lines.grep(/APP_EVENT DONE\.OK/)
-  match2 = match1.grep(/AgentCommands/)
-  r2 = (match2.length == 2) ? true : false
-  # 2)
-  match1 = lines.grep(/PAYLOAD\-1234567890\-PAYLOAD/)
-  match2 = match1.grep(/AgentCommands/)
-  r3 = (match2.length == 1) ? true : false
-  match1 = lines.grep(/\-s\ ABC\ \-i\ 123\ \-\-arg7\ 456\ \-b\ ZZZ\ 0\ \-\-arg4\ \-\-arg2\ DEF/)
-  match2 = match1.grep(/AgentCommands/)
-  r4 = (match2.length == 1) ? true : false
-
-  puts "Check Outcome [r1:#{r1} - r2:#{r2} - r3:#{r3} - r4:#{r4}]"
-  return true if r1 && r2 && r3 && r4
-  return false
-
-end