X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fomf%2Fiminds_omf6_ping.py;h=b3b58859aa2100659206ea0948e7bf3ff9c62937;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=08c3efed9558599309bc8c45a44e74a1598bcf8b;hpb=7bc8f05fcadd8f2c9a636d35342d120d98fc50a4;p=nepi.git

diff --git a/examples/omf/iminds_omf6_ping.py b/examples/omf/iminds_omf6_ping.py
index 08c3efed..b3b58859 100644
--- a/examples/omf/iminds_omf6_ping.py
+++ b/examples/omf/iminds_omf6_ping.py
@@ -26,7 +26,7 @@
 # Topology
 #
 #
-#  Testbed : IMinds
+#  Testbed : iMinds
 #
 #     Node
 #     node0ZZ 
@@ -37,7 +37,6 @@
 #     Node
 #     node0ZZ 
 #     PING
-#     
 #   
 #      - Experiment:
 #        - t0 : Deployment
@@ -67,9 +66,6 @@ parser.add_option("-z", "--nodez", dest="nodez",
             " nodex.<experiment_id>.<project_id>.wilab2.ilabt.iminds.be"
             " all letters in lowercase )", 
         type="str")
-parser.add_option("-c", "--channel", dest="channel", 
-        help="Nitos reserved channel",
-        type="str")
 parser.add_option("-s", "--slice-name", dest="slicename", 
         help="Nitos slice name", type="str")
 (options, args) = parser.parse_args()
@@ -77,21 +73,20 @@ parser.add_option("-s", "--slice-name", dest="slicename",
 nodex = options.nodex
 nodez = options.nodez
 slicename = options.slicename
-chan = options.channel
 
 # Create the EC
 ec = ExperimentController(exp_id="iminds_omf6_ping")
 
 # Create and Configure the Nodes
 
-node1 = ec.register_resource("OMFNode")
+node1 = ec.register_resource("omf::Node")
 ec.set(node1, "hostname", nodex)
 ec.set(node1, "xmppUser", slicename)
 ec.set(node1, "xmppServer", "xmpp.ilabt.iminds.be")
 ec.set(node1, "xmppPort", "5222")
 ec.set(node1, "xmppPassword", "1234")
 
-iface1 = ec.register_resource("OMFWifiInterface")
+iface1 = ec.register_resource("omf::WifiInterface")
 ec.set(iface1, "name", "wlan0")
 ec.set(iface1, "mode", "adhoc")
 ec.set(iface1, "hw_mode", "g")
@@ -99,14 +94,14 @@ ec.set(iface1, "essid", "ping")
 ec.set(iface1, "ip", "192.168.0.1/24")
 ec.register_connection(iface1, node1)
 
-node2 = ec.register_resource("OMFNode")
+node2 = ec.register_resource("omf::Node")
 ec.set(node2, "hostname", nodez)
 ec.set(node2, "xmppUser", slicename)
 ec.set(node2, "xmppServer", "xmpp.ilabt.iminds.be")
 ec.set(node2, "xmppPort", "5222")
 ec.set(node2, "xmppPassword", "1234")
 
-iface2 = ec.register_resource("OMFWifiInterface")
+iface2 = ec.register_resource("omf::WifiInterface")
 ec.set(iface2, "name", "wlan0")
 ec.set(iface2, "mode", "adhoc")
 ec.set(iface2, "hw_mode", "g")
@@ -114,26 +109,29 @@ ec.set(iface2, "essid", "ping")
 ec.set(iface2, "ip", "192.168.0.2/24")
 ec.register_connection(iface2, node2)
 
-channel = ec.register_resource("OMFChannel")
+channel = ec.register_resource("omf::Channel")
 ec.set(channel, "channel", "6")
 ec.register_connection(iface1, channel)
 ec.register_connection(iface2, channel)
 
 # Create and Configure the Application
-app1 = ec.register_resource("OMFApplication")
+app1 = ec.register_resource("omf::Application")
 ec.set(app1, "command", "ping -c3 192.168.0.2") 
 ec.register_connection(app1, node1)
 
-ec.register_condition([app1], ResourceAction.STOP, [app1], 
+## Make sure the ping stops after 30 seconds
+ec.register_condition(app1, ResourceAction.STOP, app1, 
         ResourceState.STARTED , "30s")
 
 # Deploy
 ec.deploy()
 
+# Wait until the VLC client is finished
 ec.wait_finished([app1])
 
-# RESULT
-print ec.trace(app1, "stdout")
+# Retrieve the output of the ping command
+ping_output = ec.trace(app1, "stdout")
+print "\n PING OUTPUT\n", ping_output, "\n"
 
 # Stop Experiment
 ec.shutdown()