Changes between Version 1 and Version 2 of GEC21Agenda/LabWiki/ModuleD

Timestamp:

10/15/14 20:00:17 (10 years ago)

Author:

divyashri.bhat@gmail.com

Comment:

--

GEC21Agenda/LabWiki/ModuleD

@@ -7 +7 @@
 {{{
 #!ruby
-defProperty('source1', "nodea-testGIMI", "ID of a resource")
-defProperty('source2', "switch1-testGIMI", "ID of a resource")
-defProperty('source3', "switch2-testGIMI", "ID of a resource") #NEW
+
+defProperty('resource1', "nodea", "ID of a resource")
+defProperty('resource2', "switch1", "ID of a resource")
+defProperty('resource3', "switch2", "ID of a resource")
+
 
 defProperty('sinkaddr12', '192.168.1.7', "Ping destination address")
 defProperty('sinkaddr13', '192.168.1.8', "Ping destination address")
 
-defProperty('sinkaddr21', '192.168.1.13', "Ping destination address") #NEW
-defProperty('sinkaddr23', '192.168.1.14', "Ping destination address") #NEW
-defProperty('sinkaddr24', '192.168.1.15', "Ping destination address") #NEW
+defProperty('sinkaddr21', '192.168.1.13', "Ping destination address")
+defProperty('sinkaddr23', '192.168.1.14', "Ping destination address")
+defProperty('sinkaddr24', '192.168.1.15', "Ping destination address")
 
 
@@ -33 +35 @@
   # sample from this MP will be composed of a 4-tuples (addr,ttl,rtt,rtt_unit)
   app.defMeasurement('ping') do |m|
-    m.defMetric('dest_addr',:string)
+    m.defMetric('remote',:string)
     m.defMetric('ttl',:uint32)
     m.defMetric('rtt',:double)
@@ -42 +44 @@
 defApplication('trema') do |app|
   app.description = 'This app runs trema from command line'
-  app.binary_path = '/usr/local/bin/rubydir/bin/trema run /root/learning-switch.rb'
+  app.binary_path = '/bin/sh /root/ovs-setup2.sh'
 end
-
-defGroup('Source2', property.source2, property.source3) do |node| #MODIFIED
+defGroup('Source2', property.resource2, property.resource3) do |node|
   node.addApplication("trema")
 end
-
-defGroup('Source1', property.source1) do |node|
+defGroup('Source1', property.resource1) do |node|
   node.addApplication("ping") do |app|
     app.setProperty('target', property.sinkaddr12)
@@ -62 +62 @@
     app.measure('ping', :samples => 1)
   end
-   node.addApplication("ping") do |app| #NEW
+   node.addApplication("ping") do |app|
     app.setProperty('target', property.sinkaddr21)
     app.setProperty('count', 30)
@@ -68 +68 @@
     app.measure('ping', :samples => 1)
   end
-   node.addApplication("ping") do |app| #NEW
+   node.addApplication("ping") do |app|
     app.setProperty('target', property.sinkaddr23)
     app.setProperty('count', 30)
@@ -74 +74 @@
     app.measure('ping', :samples => 1)
   end
-  node.addApplication("ping") do |app| #NEW
+  node.addApplication("ping") do |app|
     app.setProperty('target', property.sinkaddr24)
     app.setProperty('count', 30)
@@ -82 +82 @@
 end
 
+
 onEvent(:ALL_UP_AND_INSTALLED) do |event|
   info "Starting the ping"
@@ -87 +88 @@
     group('Source2').startApplications
   end
-  after 10 do
+  after 20 do
     group('Source1').startApplications
   end
@@ -98 +99 @@
 
 defGraph 'RTT' do |g|
-  g.ms('ping').select(:oml_seq, :dest_addr, :rtt) 
+  g.ms('ping').select(:oml_seq, :remote, :rtt) 
   g.caption "RTT of received packets."
   g.type 'line_chart3'
-  g.mapping :x_axis => :oml_seq, :y_axis => :rtt, :group_by => :dest_addr
+  g.mapping :x_axis => :oml_seq, :y_axis => :rtt, :group_by => :remote
   g.xaxis :legend => 'oml_seq'
   g.yaxis :legend => 'rtt', :ticks => {:format => 's'}
 end
+
 }}}