still making both branches closer
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 14 Oct 2015 15:04:49 +0000 (17:04 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 14 Oct 2015 15:04:49 +0000 (17:04 +0200)
commit58a2b493f8df1072a1faa653c8abb6a3f9ba21fa
treed5cc84581b2f48f7eabcb44e9a1cf5668068bc3c
parent97bbe01c9aba5192dc15ad1065ffaaf4468e0310
still making both branches closer
merge in master branch changes made on py3 that make total sense in py2
assertEquals will be handled separately
66 files changed:
examples/ccn_emu_live/dce.py
examples/ccn_emu_live/dce_4_nodes_linear.py
examples/ccn_emu_live/planetlab.py
examples/ccn_emu_live/planetlab_4_nodes_linear.py
examples/linux/ccn_transfer_using_linuxapp.py
examples/linux/testing/ccncat_2_nodes.py
examples/linux/testing/ccncat_extended_ring_topo.py
examples/omf/testing/nepi_omf5_nitos_ccncat.py
examples/omf/testing/nepi_omf5_nitos_ccnring.py
examples/omf/testing/nepi_omf5_plexus_ccncat_linear.py
examples/openvswitch/ovs_ping_3_switches.py
examples/planetlab/select_nodes.py
examples/planetlab/update_fedora_repo.py
src/nepi/data/processing/ccn/parser.py
src/nepi/execution/ec.py
src/nepi/execution/resource.py
src/nepi/resources/linux/application.py
src/nepi/resources/linux/ccn/ccnd.py
src/nepi/resources/linux/ccn/ccnr.py
src/nepi/resources/linux/debfuncs.py
src/nepi/resources/linux/netns/netnsclient.py
src/nepi/resources/linux/netns/netnsemulation.py
src/nepi/resources/linux/node.py
src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.py
src/nepi/resources/linux/ns3/ccn/ns3fibentrydceapplication.py
src/nepi/resources/linux/ns3/fdudptunnel.py
src/nepi/resources/linux/ns3/ns3client.py
src/nepi/resources/linux/ns3/ns3simulation.py
src/nepi/resources/linux/rpmfuncs.py
src/nepi/resources/linux/scripts/fd-udp-connect.py
src/nepi/resources/linux/scripts/linux-udp-connect.py
src/nepi/resources/linux/scripts/tunchannel.py
src/nepi/resources/linux/tap.py
src/nepi/resources/netns/netnsserver.py
src/nepi/resources/netns/netnswrapper.py
src/nepi/resources/netns/netnswrapper_debug.py
src/nepi/resources/ns3/ns3route.py
src/nepi/resources/ns3/ns3server.py
src/nepi/resources/ns3/ns3wrapper.py
src/nepi/resources/ns3/ns3wrapper_debug.py
src/nepi/resources/ns3/resource_manager_generator.py
src/nepi/resources/omf/messages_6.py
src/nepi/resources/omf/omf6_api.py
src/nepi/resources/omf/omf6_parser.py
src/nepi/resources/omf/wilabt_node.py
src/nepi/resources/planetlab/node.py
src/nepi/resources/planetlab/plcapi.py
src/nepi/resources/planetlab/sfa_node.py
src/nepi/resources/planetlab/tap.py
src/nepi/util/execfuncs.py
src/nepi/util/manifoldapi.py
src/nepi/util/netgraph.py
src/nepi/util/parallel.py
src/nepi/util/parsers/xml_parser.py
src/nepi/util/plotter.py
src/nepi/util/sfaapi.py
src/nepi/util/sshfuncs.py
test/execution/resource.py
test/execution/runner.py
test/lib/test_utils.py
test/resources/linux/application.py
test/util/parallel.py
test/util/plotter.py
test/util/serializer.py
test/util/sshfuncs.py