X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fopenvswitch%2Fovs_ping.py;h=7f50846881d20f3d342d23e302212d25e0228edd;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=ab3ea2e0f5f1e3963f658e2bfb36be24d1859178;hpb=52e9a80764b98226727f1362d7c1f6246c06f92e;p=nepi.git diff --git a/examples/openvswitch/ovs_ping.py b/examples/openvswitch/ovs_ping.py index ab3ea2e0..7f508468 100644 --- a/examples/openvswitch/ovs_ping.py +++ b/examples/openvswitch/ovs_ping.py @@ -4,9 +4,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 @@ -33,6 +32,8 @@ # $ PYTHONPATH=$PYTHONPATH:src/ python examples/openvswitch/ovs_ping.py -n "192.168.3.0/24" -s -i /~/.ssh/id_rsa # +from __future__ import print_function + from nepi.execution.ec import ExperimentController import os @@ -62,8 +63,7 @@ def parse_args(): help="Overlay network address of the form x.x.x.x/yy. " "Must correspond to the vsys_vnet tag on the PlanetLab slice") parser.add_option("-C", "--controller", dest="controller", - help="IP address for the OpenFlow controller, if one has been deployed", - default="1.1.1.1") + help="IP address for the OpenFlow controller, if one has been deployed") parser.add_option("-s", "--slicename", dest="slicename", help="Name of PlanetLab slice", default=pl_slice) @@ -130,7 +130,6 @@ tap = ec.register_resource("planetlab::Tap") ec.set(tap, "ip", ip2) ec.set(tap, "prefix", prefix) ec.set(tap, "pointopoint", ip1) -ec.set(tap, "up", True) ec.register_connection(tap, node2) # Add ports on OVS @@ -156,9 +155,7 @@ ec.wait_finished([app]) # Retreive ping results and save them in a file ping = ec.trace(app, "stdout") -print ping +print(ping) # Delete the overlay network ec.shutdown() - -