Changes between Version 7 and Version 8 of Old/NodeHandler/LaunchApps

Timestamp:

Jun 2, 2006, 3:05:34 AM (18 years ago)

Author:

max

Comment:

—

Old/NodeHandler/LaunchApps

@@ -19 +19 @@
 # Create an application representation from scratch
 #
-require 'handler/appDefinition'
 
-a = AppDefinition.create('test:app:tcpdump')
-a.name = "tcpdump"
-a.version(0, 0, 1)
-a.shortDescription = "Tcpdump application"
-a.description = <<TEXT
+defApplication('test:app:tcpdump', "tcpdump") { |a|
+  a.version(0, 0, 1)
+  a.shortDescription = "Tcpdump application"
+  a.description = <<TEXT
 TCPDump application
 TEXT
 
-# addProperty(name, description, mnemonic, type, isDynamic = false, constraints = nil)
+  #Here ?i means tcpdump will be launched with -i <interface> option
+  a.defProperty('interface', 'Interface to run on', ?i, String, false)
 
-#Here ?i means tcpdump will be launched with -i <interface> option
-a.addProperty('interface', 'Interface to run on', ?i, String, false)
-
-# Path of your application on the node/image.
-a.path = "/usr/sbin/tcpdump"
-
-if $0 == __FILE__
-  require 'stringio'
-  require 'rexml/document'
-  include REXML
-
-  sio = StringIO.new()
-  a.to_xml.write(sio, 2)
-  sio.rewind
-  puts sio.read
-
-  sio.rewind
-  doc = Document.new(sio)
-  t = AppDefinition.from_xml(doc.root)
-
-  puts
-  puts "-------------------------"
-  puts
-  t.to_xml.write($stdout, 2)
-
-end
-
+  # Path of your application on the node/image.
+  a.path = "/usr/sbin/tcpdump"
+}
 }}}
  
 
 == Step 2: Prototype definition ==
-After informing nodeHandler about our new application, we then need to create a prototype using our application definition. 
+After informing nodeHandler about our new application, we then create a prototype using our application definition to allow for reuse. 
 
 '''Think about this as an instance of your above class'''
- * '''Put this file in your home directory as test_proto_tcpdumper.rb'''
+
+'''NOTE: Put this file in your home directory as test_proto_tcpdumper.rb'''
 {{{
 #
@@ -71 +47 @@
 #
 
-require 'handler/prototype'
-require 'handler/filter'
-require 'handler/appDefinition'
 
-p = Prototype.create("test:proto:tcpdumper")
-p.name = "TCPdump proto"
-p.description = "TCPdump"
-p.defProperty('interface', 'Interface to listen on')
+defPrototype("test:proto:tcpdumper", "TCPdump proto") { |p|
+  p.description = "TCPdump"
+  p.defProperty('interface', 'Interface to listen on')
 
 
-tcpd = p.addApplication('tcpd', "test:app:tcpdump")
-tcpd.bindProperty('interface')
-
-
-
-if $0 == __FILE__
-  p.to_xml.write($stdout, 2)
-  puts
-end
-
+  p.addApplication('tcpd', "test:app:tcpdump") { |tcpd|
+    tcpd.bindProperty('interface')
+  }
+}
 }}}
 
@@ -107 +73 @@
 # Define nodes used in experiment
 #
-defNodes('nodes', [[1,1],[1,2]]) {|node|
-  node.image = nil  # assume the right image to be on disk
-
-  node.prototype("test:proto:tcpdumper", {
+defNodes('nodes', [[1,1],[1,2]]) {|ns|
+  ns.prototype("test:proto:tcpdumper", {
     'interface' => 'eth1' #This is where we assign the interface for this specific instance
    })
-  node.net.w0.mode = "master"
-}
-
-
-allNodes.net.w0 { |w|
-  w.type = 'b'
-  w.essid = "helloworld"
-  w.ip = "%192.168.%x.%y"
+  ns.net.w0 { |w|
+    w.mode = "master"
+    w.type = 'b'
+    w.essid = "helloworld"
+    w.ip = "%192.168.%x.%y"
+  }
 }
 
@@ -130 +92 @@
 
   #startApplications will launch all the applications defined for the group "nodes"
-  NodeSet['nodes'].startApplications
-
- 
+  nodes('nodes').startApplications
 
   wait 180