X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fomf%2Fiminds_omf6_ping.py;h=d5e02c7357bf78c8d28d112791748346dd121053;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=327409da0653bc4565f041aad7b86e3d40d39dfc;hpb=02869f33bedd89aa8371b84e8e3b059800e23f53;p=nepi.git diff --git a/examples/omf/iminds_omf6_ping.py b/examples/omf/iminds_omf6_ping.py index 327409da..d5e02c73 100644 --- a/examples/omf/iminds_omf6_ping.py +++ b/examples/omf/iminds_omf6_ping.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 @@ -45,6 +44,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 @@ -79,14 +80,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") @@ -94,14 +95,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") @@ -109,13 +110,13 @@ 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) @@ -131,7 +132,7 @@ ec.wait_finished([app1]) # Retrieve the output of the ping command ping_output = ec.trace(app1, "stdout") -print "\n PING OUTPUT\n", ping_output, "\n" +print("\n PING OUTPUT\n", ping_output, "\n") # Stop Experiment ec.shutdown()