fixed shebangs in non executable .py files

diff --git a/examples/Multicast/multicast_experiment.py b/examples/Multicast/multicast_experiment.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/examples/POPI/run_one_experiment.py b/examples/POPI/run_one_experiment.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/examples/POPI/run_popi_experiments.py b/examples/POPI/run_popi_experiments.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/examples/multicast_overlay.py b/examples/multicast_overlay.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/examples/roads09.py b/examples/roads09.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/examples/vlc_wireless_netns_ns3.py b/examples/vlc_wireless_netns_ns3.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/examples/wimax_ns3.py b/examples/wimax_ns3.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/examples/wimax_overlay.py b/examples/wimax_overlay.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/examples/wireless_overlay.py b/examples/wireless_overlay.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/nepi/core/attributes.py b/src/nepi/core/attributes.py
index 3de13cf..063aeac 100644 (file)
--- a/src/nepi/core/attributes.py
+++ b/src/nepi/core/attributes.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 class Attribute(object):

diff --git a/src/nepi/core/connector.py b/src/nepi/core/connector.py
index ded9eda..0d1888f 100644 (file)
--- a/src/nepi/core/connector.py
+++ b/src/nepi/core/connector.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """

diff --git a/src/nepi/core/design.py b/src/nepi/core/design.py
index 11b9d7b..a045de3 100644 (file)
--- a/src/nepi/core/design.py
+++ b/src/nepi/core/design.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """

diff --git a/src/nepi/core/execute.py b/src/nepi/core/execute.py
index e08e20f..9f034cb 100644 (file)
--- a/src/nepi/core/execute.py
+++ b/src/nepi/core/execute.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from nepi.core.attributes import Attribute, AttributesMap

diff --git a/src/nepi/core/factory.py b/src/nepi/core/factory.py
index eee07f0..50243e4 100644 (file)
--- a/src/nepi/core/factory.py
+++ b/src/nepi/core/factory.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from nepi.core.attributes import AttributesMap, Attribute

diff --git a/src/nepi/core/metadata.py b/src/nepi/core/metadata.py
index 05d36f4..0dbf39e 100644 (file)
--- a/src/nepi/core/metadata.py
+++ b/src/nepi/core/metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from nepi.core.attributes import Attribute, AttributesMap

diff --git a/src/nepi/core/testbed_impl.py b/src/nepi/core/testbed_impl.py
index 4ee3110..ade1ccc 100644 (file)
--- a/src/nepi/core/testbed_impl.py
+++ b/src/nepi/core/testbed_impl.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from nepi.core import execute

diff --git a/src/nepi/testbeds/netns/__init__.py b/src/nepi/testbeds/netns/__init__.py
index a30e0a9..d3ef5dd 100644 (file)
--- a/src/nepi/testbeds/netns/__init__.py
+++ b/src/nepi/testbeds/netns/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_ID

diff --git a/src/nepi/testbeds/netns/constants.py b/src/nepi/testbeds/netns/constants.py
index 119891c..a173c62 100644 (file)
--- a/src/nepi/testbeds/netns/constants.py
+++ b/src/nepi/testbeds/netns/constants.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 TESTBED_ID = "netns"

diff --git a/src/nepi/testbeds/netns/execute.py b/src/nepi/testbeds/netns/execute.py
index 020b97f..d1b0d39 100644 (file)
--- a/src/nepi/testbeds/netns/execute.py
+++ b/src/nepi/testbeds/netns/execute.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/src/nepi/testbeds/netns/metadata.py b/src/nepi/testbeds/netns/metadata.py
index 9364293..5d1e838 100644 (file)
--- a/src/nepi/testbeds/netns/metadata.py
+++ b/src/nepi/testbeds/netns/metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/src/nepi/testbeds/ns3/__init__.py b/src/nepi/testbeds/ns3/__init__.py
index 29cb993..45a2de9 100644 (file)
--- a/src/nepi/testbeds/ns3/__init__.py
+++ b/src/nepi/testbeds/ns3/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/src/nepi/testbeds/ns3/attributes_metadata.py b/src/nepi/testbeds/ns3/attributes_metadata.py
index 41ac5ac..a0c065a 100644 (file)
--- a/src/nepi/testbeds/ns3/attributes_metadata.py
+++ b/src/nepi/testbeds/ns3/attributes_metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from factories_metadata import wifi_standards, l4_protocols, \

diff --git a/src/nepi/testbeds/ns3/connection_metadata.py b/src/nepi/testbeds/ns3/connection_metadata.py
index f68b31c..f93e372 100644 (file)
--- a/src/nepi/testbeds/ns3/connection_metadata.py
+++ b/src/nepi/testbeds/ns3/connection_metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID

diff --git a/src/nepi/testbeds/ns3/constants.py b/src/nepi/testbeds/ns3/constants.py
index 7a1f4c5..27fb726 100644 (file)
--- a/src/nepi/testbeds/ns3/constants.py
+++ b/src/nepi/testbeds/ns3/constants.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 TESTBED_ID = "ns3"

diff --git a/src/nepi/testbeds/ns3/execute.py b/src/nepi/testbeds/ns3/execute.py
index 0635f26..9c60e05 100644 (file)
--- a/src/nepi/testbeds/ns3/execute.py
+++ b/src/nepi/testbeds/ns3/execute.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from nepi.core import testbed_impl

diff --git a/src/nepi/testbeds/ns3/factories_metadata.py b/src/nepi/testbeds/ns3/factories_metadata.py
index c2a2bd2..6f0d42f 100644 (file)
--- a/src/nepi/testbeds/ns3/factories_metadata.py
+++ b/src/nepi/testbeds/ns3/factories_metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from nepi.util import tags

diff --git a/src/nepi/testbeds/ns3/metadata.py b/src/nepi/testbeds/ns3/metadata.py
index 94fb9fb..1766e6a 100644 (file)
--- a/src/nepi/testbeds/ns3/metadata.py
+++ b/src/nepi/testbeds/ns3/metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/src/nepi/testbeds/ns3/traces_metadata.py b/src/nepi/testbeds/ns3/traces_metadata.py
index d9a4df5..e8859a8 100644 (file)
--- a/src/nepi/testbeds/ns3/traces_metadata.py
+++ b/src/nepi/testbeds/ns3/traces_metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 traces = dict({

diff --git a/src/nepi/testbeds/ns3/validation.py b/src/nepi/testbeds/ns3/validation.py
index 80831f6..baf8911 100644 (file)
--- a/src/nepi/testbeds/ns3/validation.py
+++ b/src/nepi/testbeds/ns3/validation.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # TODO: Allow netrefs!

diff --git a/src/nepi/testbeds/planetlab/__init__.py b/src/nepi/testbeds/planetlab/__init__.py
index 1ea99bd..f3e1ac0 100644 (file)
--- a/src/nepi/testbeds/planetlab/__init__.py
+++ b/src/nepi/testbeds/planetlab/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/src/nepi/testbeds/planetlab/application.py b/src/nepi/testbeds/planetlab/application.py
index e883439..892073d 100644 (file)
--- a/src/nepi/testbeds/planetlab/application.py
+++ b/src/nepi/testbeds/planetlab/application.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID

diff --git a/src/nepi/testbeds/planetlab/constants.py b/src/nepi/testbeds/planetlab/constants.py
index ee2c706..e749e93 100644 (file)
--- a/src/nepi/testbeds/planetlab/constants.py
+++ b/src/nepi/testbeds/planetlab/constants.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 TESTBED_ID = "planetlab"

diff --git a/src/nepi/testbeds/planetlab/execute.py b/src/nepi/testbeds/planetlab/execute.py
index da5f2f8..67b76d2 100644 (file)
--- a/src/nepi/testbeds/planetlab/execute.py
+++ b/src/nepi/testbeds/planetlab/execute.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/src/nepi/testbeds/planetlab/interfaces.py b/src/nepi/testbeds/planetlab/interfaces.py
index e3668ec..cc8d179 100644 (file)
--- a/src/nepi/testbeds/planetlab/interfaces.py
+++ b/src/nepi/testbeds/planetlab/interfaces.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID

diff --git a/src/nepi/testbeds/planetlab/metadata.py b/src/nepi/testbeds/planetlab/metadata.py
index cd01367..d099a8c 100644 (file)
--- a/src/nepi/testbeds/planetlab/metadata.py
+++ b/src/nepi/testbeds/planetlab/metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import time

diff --git a/src/nepi/testbeds/planetlab/multicast.py b/src/nepi/testbeds/planetlab/multicast.py
index e6869bb..7394e67 100644 (file)
--- a/src/nepi/testbeds/planetlab/multicast.py
+++ b/src/nepi/testbeds/planetlab/multicast.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID

diff --git a/src/nepi/testbeds/planetlab/node.py b/src/nepi/testbeds/planetlab/node.py
index 1d4d5ca..4b1cf0c 100644 (file)
--- a/src/nepi/testbeds/planetlab/node.py
+++ b/src/nepi/testbeds/planetlab/node.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID

diff --git a/src/nepi/testbeds/planetlab/resourcealloc.py b/src/nepi/testbeds/planetlab/resourcealloc.py
index 915f88c..23add87 100644 (file)
--- a/src/nepi/testbeds/planetlab/resourcealloc.py
+++ b/src/nepi/testbeds/planetlab/resourcealloc.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import itertools

diff --git a/src/nepi/testbeds/planetlab/tunproto.py b/src/nepi/testbeds/planetlab/tunproto.py
index 84972a6..be09ee1 100644 (file)
--- a/src/nepi/testbeds/planetlab/tunproto.py
+++ b/src/nepi/testbeds/planetlab/tunproto.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import weakref

diff --git a/src/nepi/testbeds/planetlab/util.py b/src/nepi/testbeds/planetlab/util.py
index 41b32aa..a91b026 100644 (file)
--- a/src/nepi/testbeds/planetlab/util.py
+++ b/src/nepi/testbeds/planetlab/util.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/src/nepi/util/constants.py b/src/nepi/util/constants.py
index b765134..08c5f39 100644 (file)
--- a/src/nepi/util/constants.py
+++ b/src/nepi/util/constants.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 AF_INET = 0

diff --git a/src/nepi/util/environ.py b/src/nepi/util/environ.py
index 743cd88..0f2e455 100644 (file)
--- a/src/nepi/util/environ.py
+++ b/src/nepi/util/environ.py
@@ -1,4 +1,3 @@
-# vim:ts=4:sw=4:et:ai:sts=4
 
 import os, subprocess, os.path
 

diff --git a/src/nepi/util/graphical_info.py b/src/nepi/util/graphical_info.py
index 2a09ba2..04f93fe 100644 (file)
--- a/src/nepi/util/graphical_info.py
+++ b/src/nepi/util/graphical_info.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# vim:ts=4:sw=4:et:ai:sts=4
 
 class GraphicalInfo(object):
     """ This class allows to describe the position and dimensions of a 

diff --git a/src/nepi/util/guid.py b/src/nepi/util/guid.py
index 3198e25..7f5ea3c 100644 (file)
--- a/src/nepi/util/guid.py
+++ b/src/nepi/util/guid.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 class GuidGenerator(object):

diff --git a/src/nepi/util/ipaddr2.py b/src/nepi/util/ipaddr2.py
index 436979f..2bfa0c9 100644 (file)
--- a/src/nepi/util/ipaddr2.py
+++ b/src/nepi/util/ipaddr2.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
 import struct
 import random
 import socket

diff --git a/src/nepi/util/parallel.py b/src/nepi/util/parallel.py
index bd0616c..95baad7 100644 (file)
--- a/src/nepi/util/parallel.py
+++ b/src/nepi/util/parallel.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import threading

diff --git a/src/nepi/util/parser/_xml.py b/src/nepi/util/parser/_xml.py
index 39bb637..a1a8a59 100644 (file)
--- a/src/nepi/util/parser/_xml.py
+++ b/src/nepi/util/parser/_xml.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from nepi.core.attributes import Attribute

diff --git a/src/nepi/util/parser/base.py b/src/nepi/util/parser/base.py
index 3e28869..6da07db 100644 (file)
--- a/src/nepi/util/parser/base.py
+++ b/src/nepi/util/parser/base.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import sys

diff --git a/src/nepi/util/proxy.py b/src/nepi/util/proxy.py
index 282fd92..9545a5c 100644 (file)
--- a/src/nepi/util/proxy.py
+++ b/src/nepi/util/proxy.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import base64

diff --git a/src/nepi/util/server.py b/src/nepi/util/server.py
index 6f69577..6ce1176 100644 (file)
--- a/src/nepi/util/server.py
+++ b/src/nepi/util/server.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from nepi.util.constants import DeploymentConfiguration as DC

diff --git a/src/nepi/util/tags.py b/src/nepi/util/tags.py
index 5e72440..4cd4c38 100644 (file)
--- a/src/nepi/util/tags.py
+++ b/src/nepi/util/tags.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 MOBILE = "mobile"

diff --git a/src/nepi/util/validation.py b/src/nepi/util/validation.py
index 69ee73b..f94c248 100644 (file)
--- a/src/nepi/util/validation.py
+++ b/src/nepi/util/validation.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import ipaddr

diff --git a/test/core/design.py b/test/core/design.py
index b8f04f1..800643d 100755 (executable)
--- a/test/core/design.py
+++ b/test/core/design.py
@@ -9,6 +9,7 @@ import unittest
 
 class DesignTestCase(unittest.TestCase):
     def setUp(self):
+        # hack to add the mock testbed on the correct module path
         sys.modules["nepi.testbeds.mock.metadata"] = mock.metadata
 
     def test_design(self):

diff --git a/test/core/execute.py b/test/core/execute.py
index de8de1b..5e42a33 100755 (executable)
--- a/test/core/execute.py
+++ b/test/core/execute.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import getpass
 from nepi.util import tags
 from nepi.util.constants import ApplicationStatus as AS
-import getpass
 import mock
 import mock.metadata 
 import sys

diff --git a/test/core/integration.py b/test/core/integration.py
index d627a4e..df4f211 100755 (executable)
--- a/test/core/integration.py
+++ b/test/core/integration.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import getpass
 from nepi.core.design import ExperimentDescription, FactoriesProvider
 from nepi.util import proxy
 from nepi.util.constants import DeploymentConfiguration as DC
-import getpass
 import mock
 import mock.metadata
 import mock2

diff --git a/test/lib/mock/__init__.py b/test/lib/mock/__init__.py
index 1ea99bd..f3e1ac0 100644 (file)
--- a/test/lib/mock/__init__.py
+++ b/test/lib/mock/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/test/lib/mock/constants.py b/test/lib/mock/constants.py
index 7640c66..54fe6da 100644 (file)
--- a/test/lib/mock/constants.py
+++ b/test/lib/mock/constants.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 TESTBED_ID = "mock"

diff --git a/test/lib/mock/execute.py b/test/lib/mock/execute.py
index db7b01c..fc6f64a 100644 (file)
--- a/test/lib/mock/execute.py
+++ b/test/lib/mock/execute.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/test/lib/mock/metadata.py b/test/lib/mock/metadata.py
index 370af4d..35b7e44 100644 (file)
--- a/test/lib/mock/metadata.py
+++ b/test/lib/mock/metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/test/lib/mock2/__init__.py b/test/lib/mock2/__init__.py
index 1ea99bd..f3e1ac0 100644 (file)
--- a/test/lib/mock2/__init__.py
+++ b/test/lib/mock2/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/test/lib/mock2/constants.py b/test/lib/mock2/constants.py
index e1f9775..dae7bed 100644 (file)
--- a/test/lib/mock2/constants.py
+++ b/test/lib/mock2/constants.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 TESTBED_ID = "mock2"

diff --git a/test/lib/mock2/execute.py b/test/lib/mock2/execute.py
index db7b01c..fc6f64a 100644 (file)
--- a/test/lib/mock2/execute.py
+++ b/test/lib/mock2/execute.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/test/lib/mock2/metadata.py b/test/lib/mock2/metadata.py
index 7c294be..a258a4a 100644 (file)
--- a/test/lib/mock2/metadata.py
+++ b/test/lib/mock2/metadata.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from constants import TESTBED_ID, TESTBED_VERSION

diff --git a/test/lib/test_util.py b/test/lib/test_util.py
index 3373b8e..fbecdfc 100644 (file)
--- a/test/lib/test_util.py
+++ b/test/lib/test_util.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import nepi.util.environ
 import ctypes
 import imp

diff --git a/test/testbeds/netns/design.py b/test/testbeds/netns/design.py
index 4f3758f..b545e6f 100755 (executable)
--- a/test/testbeds/netns/design.py
+++ b/test/testbeds/netns/design.py
@@ -10,9 +10,10 @@ import uuid
 
 class NetnsDesignTestCase(unittest.TestCase):
     def test_design_if(self):
-        exp_desc = ExperimentDescription()
         testbed_id = "netns"
+        exp_desc = ExperimentDescription()
         provider = FactoriesProvider(testbed_id)
+        
         tstbd_desc = exp_desc.add_testbed_description(provider)
         tstbd_desc.set_attribute_value("enableDebug", True)
         node1 = tstbd_desc.create("Node")
@@ -34,6 +35,7 @@ class NetnsDesignTestCase(unittest.TestCase):
         app = tstbd_desc.create("Application")
         app.set_attribute_value("command", "ping -qc10 10.0.0.2")
         app.connector("node").connect(node1.connector("apps"))
+        
         xml = exp_desc.to_xml()
         exp_desc2 = ExperimentDescription()
         exp_desc2.from_xml(xml)

diff --git a/test/testbeds/netns/execute.py b/test/testbeds/netns/execute.py
index 7eaf332..ec27e9e 100755 (executable)
--- a/test/testbeds/netns/execute.py
+++ b/test/testbeds/netns/execute.py
@@ -48,6 +48,7 @@ class NetnsExecuteTestCase(unittest.TestCase):
         instance.do_configure()
         instance.do_prestart()
         instance.start()
+
         while instance.status(7) != AS.STATUS_FINISHED:
             time.sleep(0.5)
         ping_result = instance.trace(7, "stdout")
@@ -90,6 +91,7 @@ class NetnsExecuteTestCase(unittest.TestCase):
         instance.do_configure()
         instance.do_prestart()
         instance.start()
+
         while instance.status(6) != AS.STATUS_FINISHED:
             time.sleep(0.5)
         ping_result = instance.trace(6, "stdout")
@@ -151,6 +153,7 @@ class NetnsExecuteTestCase(unittest.TestCase):
         instance.do_configure()
         instance.do_prestart()
         instance.start()
+
         while instance.status(11) != AS.STATUS_FINISHED:
             time.sleep(0.5)
         ping_result = instance.trace(11, "stdout")
@@ -194,6 +197,7 @@ class NetnsExecuteTestCase(unittest.TestCase):
         instance.do_configure()
         instance.do_prestart()
         instance.start()
+
         while instance.status(6) != AS.STATUS_FINISHED:
             time.sleep(0.5)
         pcap_result = instance.trace(2, "pcap")

diff --git a/test/testbeds/netns/integration.py b/test/testbeds/netns/integration.py
index ae56375..6da9567 100755 (executable)
--- a/test/testbeds/netns/integration.py
+++ b/test/testbeds/netns/integration.py
@@ -19,10 +19,11 @@ class NetnsIntegrationTestCase(unittest.TestCase):
 
     def _test_switched(self, controller_access_config = None,
             testbed_access_config = None):
-        exp_desc = ExperimentDescription()
         testbed_id = "netns"
+        exp_desc = ExperimentDescription()
         user = getpass.getuser()
         netns_provider = FactoriesProvider(testbed_id)
+        
         netns_desc = exp_desc.add_testbed_description(netns_provider)
         netns_desc.set_attribute_value("homeDirectory", self.root_dir)
         #netns_desc.set_attribute_value("enableDebug", True)

diff --git a/test/testbeds/ns3/design.py b/test/testbeds/ns3/design.py
index de507b7..8d034cd 100755 (executable)
--- a/test/testbeds/ns3/design.py
+++ b/test/testbeds/ns3/design.py
@@ -10,8 +10,8 @@ import uuid
 
 class Ns3DesignTestCase(unittest.TestCase):
     def test_design_if(self):
-        exp_desc = ExperimentDescription()
         testbed_id = "ns3"
+        exp_desc = ExperimentDescription()
         provider = FactoriesProvider(testbed_id)
         tstbd_desc = exp_desc.add_testbed_description(provider)
 

diff --git a/test/testbeds/ns3/execute.py b/test/testbeds/ns3/execute.py
index 5eec42b..5445b4a 100755 (executable)
--- a/test/testbeds/ns3/execute.py
+++ b/test/testbeds/ns3/execute.py
@@ -70,6 +70,7 @@ class Ns3ExecuteTestCase(unittest.TestCase):
         instance.do_configure()
         instance.do_prestart()
         instance.start()
+
         while instance.status(17) != AS.STATUS_FINISHED:
             time.sleep(0.1)
         ping_result = instance.trace(14, "P2PAsciiTrace")

diff --git a/test/testbeds/ns3/execute2.py b/test/testbeds/ns3/execute2.py
index 854e02c..20a9bea 100755 (executable)
--- a/test/testbeds/ns3/execute2.py
+++ b/test/testbeds/ns3/execute2.py
@@ -105,6 +105,7 @@ class Ns3ExecuteTestCase(unittest.TestCase):
         instance.do_configure()
         instance.do_prestart()
         instance.start()
+
         while instance.status(27) != AS.STATUS_FINISHED:
             time.sleep(0.1)
         ping_result = instance.trace(24, "P2PAsciiTrace")

diff --git a/test/testbeds/ns3/integration.py b/test/testbeds/ns3/integration.py
index 248b9ae..1164c99 100755 (executable)
--- a/test/testbeds/ns3/integration.py
+++ b/test/testbeds/ns3/integration.py
@@ -20,8 +20,8 @@ class Ns3IntegrationTestCase(unittest.TestCase):
 
     def _test_fd_net_device(self, daemonize_testbed,
             controller_access_configuration):
-        exp_desc = ExperimentDescription()
         testbed_id = "ns3"
+        exp_desc = ExperimentDescription()
         ns3_provider = FactoriesProvider(testbed_id)
         ns3_desc1 = exp_desc.add_testbed_description(ns3_provider)
         root_dir1 = os.path.join(self.root_dir, "1")

diff --git a/test/testbeds/planetlab/design.py b/test/testbeds/planetlab/design.py
index 7caee34..24777ca 100755 (executable)
--- a/test/testbeds/planetlab/design.py
+++ b/test/testbeds/planetlab/design.py
@@ -6,8 +6,8 @@ import unittest
 
 class PlanetlabDesignTestCase(unittest.TestCase):
     def make_test_design(self):
-        exp_desc = ExperimentDescription()
         testbed_id = "planetlab"
+        exp_desc = ExperimentDescription()
         provider = FactoriesProvider(testbed_id)
         tstbd_desc = exp_desc.add_testbed_description(provider)
         tstbd_desc.set_attribute_value("slice", "inria_nepi")

diff --git a/test/testbeds/planetlab/execute.py b/test/testbeds/planetlab/execute.py
index 90aa062..90be38a 100755 (executable)
--- a/test/testbeds/planetlab/execute.py
+++ b/test/testbeds/planetlab/execute.py
@@ -5,13 +5,13 @@ import getpass
 from nepi.util.constants import ApplicationStatus as AS
 from nepi.testbeds import planetlab
 import os
+import re
 import shutil
+import sys
 import tempfile
+import test_util
 import time
 import unittest
-import re
-import test_util
-import sys
 
 class PlanetLabExecuteTestCase(unittest.TestCase):
     testbed_id = "planetlab"

diff --git a/test/testbeds/planetlab/integration.py b/test/testbeds/planetlab/integration.py
index d59e959..3c1ef11 100755 (executable)
--- a/test/testbeds/planetlab/integration.py
+++ b/test/testbeds/planetlab/integration.py
@@ -2,19 +2,19 @@
 # -*- coding: utf-8 -*-
 
 import getpass
+import logging
 from nepi.core.design import ExperimentDescription, FactoriesProvider
 from nepi.core.execute import ExperimentController
 from nepi.util import proxy
 from nepi.util.constants import DeploymentConfiguration as DC
 import os
+import re
 import shutil
+import sys
 import tempfile
 import test_util
 import time
 import unittest
-import re
-import sys
-import logging
 
 class PlanetLabIntegrationTestCase(unittest.TestCase):
     testbed_id = "planetlab"

diff --git a/test/testbeds/planetlab/integration_cross.py b/test/testbeds/planetlab/integration_cross.py
index a5e8216..9f15a43 100755 (executable)
--- a/test/testbeds/planetlab/integration_cross.py
+++ b/test/testbeds/planetlab/integration_cross.py
@@ -7,12 +7,12 @@ from nepi.core.execute import ExperimentController
 from nepi.util import proxy
 from nepi.util.constants import DeploymentConfiguration as DC, ATTR_NEPI_TESTBED_ENVIRONMENT_SETUP
 import os
+import re
 import shutil
 import tempfile
 import test_util
 import time
 import unittest
-import re
 
 class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
     testbed_id = "planetlab"

diff --git a/test/testbeds/planetlab/integration_multi.py b/test/testbeds/planetlab/integration_multi.py
index 6ed0aee..42d804f 100755 (executable)
--- a/test/testbeds/planetlab/integration_multi.py
+++ b/test/testbeds/planetlab/integration_multi.py
@@ -7,12 +7,12 @@ from nepi.core.execute import ExperimentController
 from nepi.util import proxy
 from nepi.util.constants import DeploymentConfiguration as DC, ATTR_NEPI_TESTBED_ENVIRONMENT_SETUP
 import os
+import re
 import shutil
 import tempfile
 import test_util
 import time
 import unittest
-import re
 
 class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
     testbed_id = "planetlab"

diff --git a/test/testbeds/planetlab/integration_ns3.py b/test/testbeds/planetlab/integration_ns3.py
index 9513a1a..7822e9d 100755 (executable)
--- a/test/testbeds/planetlab/integration_ns3.py
+++ b/test/testbeds/planetlab/integration_ns3.py
@@ -7,12 +7,12 @@ from nepi.core.execute import ExperimentController
 from nepi.util import proxy
 from nepi.util.constants import DeploymentConfiguration as DC, ATTR_NEPI_TESTBED_ENVIRONMENT_SETUP
 import os
+import re
 import shutil
 import tempfile
 import test_util
 import time
 import unittest
-import re
 
 class PlanetLabCrossIntegrationTestCase(unittest.TestCase):
     testbed_id = "planetlab"