Merging with head

diff --combined src/nepi/util/proxy.py
index 2bb52ec,be08a68..c33f98a
--- 1/src/nepi/util/proxy.py
--- 2/src/nepi/util/proxy.py
+++ b/src/nepi/util/proxy.py
@@@ -237,7 -237,11 +237,11 @@@ def _build_testbed_controller(testbed_i
      if not mod_name in sys.modules:
          __import__(mod_name)
      module = sys.modules[mod_name]
-     return module.TestbedController(testbed_version)
+     tc = module.TestbedController()
+     if tc.testbed_version != testbed_version:
+         raise RuntimeError("Bad testbed version on testbed %s. Asked for %s, got %s" % \
+                 (testbed_id, testbed_version, tc.testbed_version))
+     return tc
  
  # Just a namespace class
  class Marshalling:
@@@ -547,17 -551,17 +551,17 @@@ class TestbedControllerServer(BaseServe
          self._testbed.defer_add_trace(guid, trace_id)
  
      @Marshalling.handles(ADD_ADDRESS)
 -    @Marshalling.args(int, str, int, str)
 +    @Marshalling.args(int, str, int, Marshalling.pickled_data)
      @Marshalling.retvoid
      def defer_add_address(self, guid, address, netprefix, broadcast):
          self._testbed.defer_add_address(guid, address, netprefix,
                  broadcast)
  
      @Marshalling.handles(ADD_ROUTE)
 -    @Marshalling.args(int, str, int, str)
 +    @Marshalling.args(int, str, int, str, int)
      @Marshalling.retvoid
 -    def defer_add_route(self, guid, destination, netprefix, nexthop):
 -        self._testbed.defer_add_route(guid, destination, netprefix, nexthop)
 +    def defer_add_route(self, guid, destination, netprefix, nexthop, metric):
 +        self._testbed.defer_add_route(guid, destination, netprefix, nexthop, metric)
  
      @Marshalling.handles(DO_SETUP)
      @Marshalling.args()