use print() - import print_function - should be fine for both py2 and py3

[nepi.git] / examples / omf / iminds_omf6_vlc.py

diff --git a/examples/omf/iminds_omf6_vlc.py b/examples/omf/iminds_omf6_vlc.py
index 2c4b474..b312abd 100644 (file)
--- a/examples/omf/iminds_omf6_vlc.py
+++ b/examples/omf/iminds_omf6_vlc.py
@@ -6,9 +6,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -46,6 +45,8 @@
 #        - t3 (t2 + 2s) : Kill the application
 #
 
+from __future__ import print_function
+
 from nepi.execution.resource import ResourceAction, ResourceState
 from nepi.execution.ec import ExperimentController
 
@@ -84,14 +85,14 @@ 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 +100,14 @@ ec.set(iface1, "essid", "vlc")
 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,7 +115,7 @@ ec.set(iface2, "essid", "vlc")
 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)
@@ -122,28 +123,28 @@ ec.register_connection(iface2, channel)
 client_ip = "192.168.0.2" 
 
 # Create and Configure the Application
-app1 = ec.register_resource("OMFApplication")
+app1 = ec.register_resource("omf::Application")
 ec.set(app1, "command", 
     "/root/vlc/vlc-1.1.13/cvlc /root/10-by-p0d.avi --sout '#rtp{dst=%s,port=5004,mux=ts}'" % client_ip) 
 ec.register_connection(app1, node1)
 
 ## Add a OMFApplication to run the client VLC
-app2 = ec.register_resource("OMFApplication")
+app2 = ec.register_resource("omf::Application")
 ## Send the transmitted video to a file.
 ec.set(app2, "command", "/root/vlc/vlc-1.1.13/cvlc rtp://%s:5004 --sout '#standard{access=file,mux=ts,dst=/root/video.ts}'" % client_ip)
 ec.register_connection(app2, node2)
 
 ## Add a OMFApplication to count the number of bytes in the transmitted video
-app3 = ec.register_resource("OMFApplication")
+app3 = ec.register_resource("omf::Application")
 ## Send the transmitted video to a file.
 ec.set(app3, "command", "ls -lah /root/video.ts")
 ec.register_connection(app3, node2)
 
-app4 = ec.register_resource("OMFApplication")
+app4 = ec.register_resource("omf::Application")
 ec.set(app4, "command", "/usr/bin/killall vlc_app")
 ec.register_connection(app4, node1)
 
-app5 = ec.register_resource("OMFApplication")
+app5 = ec.register_resource("omf::Application")
 ec.set(app5, "command", "/usr/bin/killall vlc_app")
 ec.register_connection(app5, node2)
 
@@ -175,7 +176,7 @@ ec.wait_finished([app4, app5])
 
 # Retrieve the bytes transmitted output and print it
 byte_count = ec.trace(app3, "stdout")
-print "BYTES transmitted", byte_count
+print("BYTES transmitted", byte_count)
 
 # Stop Experiment
 ec.shutdown()