Changes between Version 5 and Version 6 of GENIFIRE/Labwiki/Part2a/Execute


Ignore:
Timestamp:
07/08/14 21:25:19 (5 years ago)
Author:
divyashri.bhat@gmail.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • GENIFIRE/Labwiki/Part2a/Execute

    v5 v6  
    5858{{{
    5959
    60 defProperty('source1', "switch1-exttest7", "ID of a resource")
    61 defProperty('theSender1', "nodeb-exttest7", "ID of a resource")
    62 defProperty('theSender2', "nodec-exttest7", "ID of a resource")
    63 defProperty('theSender3', "noded-exttest7", "ID of a resource")
    64 defProperty('theSender4', "nodea-exttest7", "ID of a resource")
    65 defProperty('theSender5', "nodee-exttest7", "ID of a resource")
    66 defProperty('theReceiver', "nodef-exttest7", "ID of a resource")
     60defProperty('slice', 'divdpart1', "slice name")
     61defProperty('source1', "switch1", "ID of a resource")
     62defProperty('theSender1', "nodeb", "ID of a resource")
     63defProperty('theSender2', "nodec", "ID of a resource")
     64defProperty('theSender3', "noded", "ID of a resource")
     65defProperty('theSender4', "nodea", "ID of a resource")
     66defProperty('theSender5', "nodee", "ID of a resource")
     67defProperty('theReceiver', "nodef", "ID of a resource")
    6768
    6869defProperty('intervalcol',"1", "Interval to Tail")
    6970
    7071defProperty('pathfile', "/tmp/flowstats.out", "Path to file")
     72
     73source1 = property.source1.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
     74theSender1 = property.theSender1.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
     75theSender2 = property.theSender2.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
     76theSender3 = property.theSender3.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
     77theSender4 = property.theSender4.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
     78theSender5 = property.theSender5.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
     79theReceiver = property.theReceiver.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
    7180
    7281defApplication('ofstats') do |app|
     
    8897defApplication('iperfclient') do |app|
    8998  app.description = "manually run Iperf client"
    90   app.binary_path = "/usr/bin/iperf -c 192.168.1.15 -t 200 -P 5 -i 2"
     99  app.binary_path = "/usr/bin/iperf -c 192.168.1.15 -t 200 -i 2"
    91100end
    92101defApplication('clean_iperf') do |app|
     
    95104  app.quiet = true
    96105end
    97 defGroup('Source3', property.source1) do |node|
     106defGroup('Source3', *source1) do |node|
    98107  node.addApplication("ofstats") do |app|
    99108    app.setProperty('target', property.pathfile)
     
    102111  end
    103112end
    104  defGroup('Sender1', property.theSender1) do |node|
    105     node.addApplication("iperfclient") do |app|
    106     end
    107   end
    108   defGroup('Sender2', property.theSender2) do |node|
    109     node.addApplication("iperfclient") do |app|
    110     end
    111   end
    112   defGroup('Sender3', property.theSender3) do |node|
    113     node.addApplication("iperfclient") do |app|
    114     end
    115   end
    116   defGroup('Sender4', property.theSender4) do |node|
    117     node.addApplication("iperfclient") do |app|
    118     end
    119   end
    120   defGroup('Sender5', property.theSender5) do |node|
    121     node.addApplication("iperfclient") do |app|
    122     end
    123   end
    124   defGroup('Receiver', property.theReceiver) do |node|
     113 defGroup('Sender1', *theSender1) do |node|
     114    node.addApplication("iperfclient") do |app|
     115    end
     116  end
     117  defGroup('Sender2', *theSender2) do |node|
     118    node.addApplication("iperfclient") do |app|
     119    end
     120  end
     121  defGroup('Sender3', *theSender3) do |node|
     122    node.addApplication("iperfclient") do |app|
     123    end
     124  end
     125  defGroup('Sender4', *theSender4) do |node|
     126    node.addApplication("iperfclient") do |app|
     127    end
     128  end
     129  defGroup('Sender5', *theSender5) do |node|
     130    node.addApplication("iperfclient") do |app|
     131    end
     132  end
     133  defGroup('Receiver', *theReceiver) do |node|
    125134    node.addApplication("iperfserv") do |app|
    126135    end