Changes between Version 7 and Version 8 of GEC20Agenda/LabWiki/ModuleD


Ignore:
Timestamp:
06/19/14 15:37:40 (5 years ago)
Author:
zink@cs.umass.edu
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • GEC20Agenda/LabWiki/ModuleD

    v7 v8  
    66defProperty('source1', "nodea-testGIMI", "ID of a resource")
    77defProperty('source2', "switch1-testGIMI", "ID of a resource")
    8 defProperty('source3', "switch2-testGIMI", "ID of a resource")
     8defProperty('source3', "switch2-testGIMI", "ID of a resource") #NEW
    99
    1010defProperty('sinkaddr12', '192.168.1.7', "Ping destination address")
    1111defProperty('sinkaddr13', '192.168.1.8', "Ping destination address")
    1212
    13 defProperty('sinkaddr21', '192.168.1.13', "Ping destination address")
    14 defProperty('sinkaddr23', '192.168.1.14', "Ping destination address")
    15 defProperty('sinkaddr24', '192.168.1.15', "Ping destination address")
     13defProperty('sinkaddr21', '192.168.1.13', "Ping destination address") #NEW
     14defProperty('sinkaddr23', '192.168.1.14', "Ping destination address") #NEW
     15defProperty('sinkaddr24', '192.168.1.15', "Ping destination address") #NEW
    1616
    1717
     
    4242end
    4343
    44 defGroup('Source2', property.source2, property.source3) do |node|
     44defGroup('Source2', property.source2, property.source3) do |node| #MODIFIED
    4545  node.addApplication("trema")
    4646end
     
    5959    app.measure('ping', :samples => 1)
    6060  end
    61    node.addApplication("ping") do |app|
     61   node.addApplication("ping") do |app| #NEW
    6262    app.setProperty('target', property.sinkaddr21)
    6363    app.setProperty('count', 30)
     
    6565    app.measure('ping', :samples => 1)
    6666  end
    67    node.addApplication("ping") do |app|
     67   node.addApplication("ping") do |app| #NEW
    6868    app.setProperty('target', property.sinkaddr23)
    6969    app.setProperty('count', 30)
     
    7171    app.measure('ping', :samples => 1)
    7272  end
    73   node.addApplication("ping") do |app|
     73  node.addApplication("ping") do |app| #NEW
    7474    app.setProperty('target', property.sinkaddr24)
    7575    app.setProperty('count', 30)