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

Timestamp:

07/08/14 21:25:19 (10 years ago)

Author:

divyashri.bhat@gmail.com

Comment:

--

GENIFIRE/Labwiki/Part2a/Execute

@@ -58 +58 @@
 {{{
 
-defProperty('source1', "switch1-exttest7", "ID of a resource")
-defProperty('theSender1', "nodeb-exttest7", "ID of a resource")
-defProperty('theSender2', "nodec-exttest7", "ID of a resource")
-defProperty('theSender3', "noded-exttest7", "ID of a resource")
-defProperty('theSender4', "nodea-exttest7", "ID of a resource")
-defProperty('theSender5', "nodee-exttest7", "ID of a resource")
-defProperty('theReceiver', "nodef-exttest7", "ID of a resource")
+defProperty('slice', 'divdpart1', "slice name")
+defProperty('source1', "switch1", "ID of a resource")
+defProperty('theSender1', "nodeb", "ID of a resource")
+defProperty('theSender2', "nodec", "ID of a resource")
+defProperty('theSender3', "noded", "ID of a resource")
+defProperty('theSender4', "nodea", "ID of a resource")
+defProperty('theSender5', "nodee", "ID of a resource")
+defProperty('theReceiver', "nodef", "ID of a resource")
 
 defProperty('intervalcol',"1", "Interval to Tail")
 
 defProperty('pathfile', "/tmp/flowstats.out", "Path to file")
+
+source1 = property.source1.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
+theSender1 = property.theSender1.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
+theSender2 = property.theSender2.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
+theSender3 = property.theSender3.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
+theSender4 = property.theSender4.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
+theSender5 = property.theSender5.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
+theReceiver = property.theReceiver.to_s.split(',').map { |x| "#{x}-#{property.slice}" }
 
 defApplication('ofstats') do |app|
@@ -88 +97 @@
 defApplication('iperfclient') do |app|
   app.description = "manually run Iperf client"
-  app.binary_path = "/usr/bin/iperf -c 192.168.1.15 -t 200 -P 5 -i 2"
+  app.binary_path = "/usr/bin/iperf -c 192.168.1.15 -t 200 -i 2"
 end
 defApplication('clean_iperf') do |app|
@@ -95 +104 @@
   app.quiet = true
 end
-defGroup('Source3', property.source1) do |node|
+defGroup('Source3', *source1) do |node|
   node.addApplication("ofstats") do |app|
     app.setProperty('target', property.pathfile)
@@ -102 +111 @@
   end
 end
- defGroup('Sender1', property.theSender1) do |node|
-    node.addApplication("iperfclient") do |app|
-    end
-  end
-  defGroup('Sender2', property.theSender2) do |node|
-    node.addApplication("iperfclient") do |app|
-    end
-  end
-  defGroup('Sender3', property.theSender3) do |node|
-    node.addApplication("iperfclient") do |app|
-    end
-  end
-  defGroup('Sender4', property.theSender4) do |node|
-    node.addApplication("iperfclient") do |app|
-    end
-  end
-  defGroup('Sender5', property.theSender5) do |node|
-    node.addApplication("iperfclient") do |app|
-    end
-  end
-  defGroup('Receiver', property.theReceiver) do |node|
+ defGroup('Sender1', *theSender1) do |node|
+    node.addApplication("iperfclient") do |app|
+    end
+  end
+  defGroup('Sender2', *theSender2) do |node|
+    node.addApplication("iperfclient") do |app|
+    end
+  end
+  defGroup('Sender3', *theSender3) do |node|
+    node.addApplication("iperfclient") do |app|
+    end
+  end
+  defGroup('Sender4', *theSender4) do |node|
+    node.addApplication("iperfclient") do |app|
+    end
+  end
+  defGroup('Sender5', *theSender5) do |node|
+    node.addApplication("iperfclient") do |app|
+    end
+  end
+  defGroup('Receiver', *theReceiver) do |node|
     node.addApplication("iperfserv") do |app|
     end