X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fns3%2Ffdudptunnel.py;h=5e766f1bf886f955e6684c130d6de2dba39e399c;hp=16816ef5ddac2928bff74ff31830887b4ee6339a;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hpb=cb5d027b813a27d7de263653e1a8e0cef5490f0a diff --git a/src/nepi/resources/linux/ns3/fdudptunnel.py b/src/nepi/resources/linux/ns3/fdudptunnel.py index 16816ef5..5e766f1b 100644 --- a/src/nepi/resources/linux/ns3/fdudptunnel.py +++ b/src/nepi/resources/linux/ns3/fdudptunnel.py @@ -93,7 +93,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel): if not devices or len(devices) != 2: msg = "linux::ns3::TunTapFdLink must be connected to exactly one FdNetDevice" self.error(msg) - raise RuntimeError, msg + raise RuntimeError(msg) self._fd1 = devices[0] self._fd2 = devices[1] @@ -112,7 +112,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel): self._fd2node.get("hostname"): msg = "linux::ns3::FdUdpTunnel requires endpoints on different hosts" self.error(msg) - raise RuntimeError, msg + raise RuntimeError(msg) return [self._fd1, self._fd2] @@ -275,7 +275,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel): else: msg = "Couldn't retrieve %s" % filename self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) return result @@ -304,7 +304,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel): if proc.poll(): self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) # Wait for pid file to be generated pid, ppid = node.wait_pid(run_home) @@ -317,7 +317,7 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel): if err: msg = " Failed to start command '%s' " % command self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) port = self.wait_local_port(endpoint)