X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fomf%2Fiminds_omf6_vlc.py;h=b312abdb5751097c97a80c1df7b524876cac9b4f;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=18f6ebd7bb4ea57b769b5867d614126ad99441a5;hpb=02869f33bedd89aa8371b84e8e3b059800e23f53;p=nepi.git diff --git a/examples/omf/iminds_omf6_vlc.py b/examples/omf/iminds_omf6_vlc.py index 18f6ebd7..b312abdb 100644 --- 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,29 +85,29 @@ 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") -ec.set(iface1, "essid", "ping") +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,50 +123,60 @@ 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", - "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority /root/vlc/vlc-1.1.13/cvlc /root/10-by-p0d.avi --sout '#rtp{dst=%s,port=5004,mux=ts}'" % client_ip) + "/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 and count the numer of bytes -## transmitted, using wc. -app2 = ec.register_resource("OMFApplication") +## Add a OMFApplication to run the client VLC +app2 = ec.register_resource("omf::Application") ## Send the transmitted video to a file. -ec.set(app2, "command", "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority /root/vlc/vlc-1.1.13/cvlc rtp://%s:5004 --sout '#standard{access=file,mux=ts,dst=/root/video}'" % client_ip) - -## Alternativelly, you can try to send the video to standard output and -## recover it using the stdout trace. However, it seems that sending -## binary messages back to the client is not well supported by the OMF 6 RC -#ec.set(app2, "command", "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority /root/vlc/vlc-1.1.13/cvlc rtp://%s:5004 --sout '#standard{access=file,mux=ts,dst=-}'" % client_ip) +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) -## stop app1 65s after it started -ec.register_condition(app1, ResourceAction.STOP, app1, ResourceState.STARTED , "65s") +## Add a OMFApplication to count the number of bytes in the transmitted video +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("omf::Application") +ec.set(app4, "command", "/usr/bin/killall vlc_app") +ec.register_connection(app4, node1) + +app5 = ec.register_resource("omf::Application") +ec.set(app5, "command", "/usr/bin/killall vlc_app") +ec.register_connection(app5, node2) + ## start app2 5s after app1 ec.register_condition(app2, ResourceAction.START, app1, ResourceState.STARTED , "5s") +# start app3 after app2 stopped +ec.register_condition(app3, ResourceAction.START, app2, ResourceState.STOPPED , "5s") +# start the kill of vlc processes after they stopped +ec.register_condition(app4, ResourceAction.START, app1, ResourceState.STOPPED , "5s") +ec.register_condition(app5, ResourceAction.START, app2, ResourceState.STOPPED , "5s") + +## We need to explicitly STOP all applications +## stop app1 65s after it started +ec.register_condition(app1, ResourceAction.STOP, app1, ResourceState.STARTED , "65s") ## stop app2 5 seconds after app2 ec.register_condition(app2, ResourceAction.STOP, app1, ResourceState.STOPPED , "5s") +# stop app3 after 5s +ec.register_condition(app3, ResourceAction.STOP, app3, ResourceState.STOPPED , "5s") +# stop app4 +ec.register_condition(app4, ResourceAction.STOP, app4, ResourceState.STARTED , "5s") +# stop app5 +ec.register_condition(app5, ResourceAction.STOP, app5, ResourceState.STARTED , "5s") # Deploy ec.deploy() -ec.wait_finished([app2]) - -# Retrieve the bytes transmitted count and print it -byte_count = ec.trace(app2, "stdout") -print "BYTES transmitted", byte_count +# DO NOT WAIT FOR THE VLC applications or it will never stop +ec.wait_finished([app4, app5]) -## If you redirected the video to standard output, you can try to -## retrieve the stdout of the VLC client -## video = ec.trace(app2, "stdout") -#f = open("video.ts", "w") -#f.write(video) -#f.close() - -# Stop Experiment -ec.shutdown() -# RESULT -print ec.trace(app1, "stdout") +# Retrieve the bytes transmitted output and print it +byte_count = ec.trace(app3, "stdout") +print("BYTES transmitted", byte_count) # Stop Experiment ec.shutdown()