git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied the except and raise fixers to the master branch to close the gap with py3
[nepi.git]
/
src
/
nepi
/
resources
/
linux
/
ns3
/
fdudptunnel.py
diff --git
a/src/nepi/resources/linux/ns3/fdudptunnel.py
b/src/nepi/resources/linux/ns3/fdudptunnel.py
index
16816ef
..
5e766f1
100644
(file)
--- 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)
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]
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)
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]
return [self._fd1, self._fd2]
@@
-275,7
+275,7
@@
class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
else:
msg = "Couldn't retrieve %s" % filename
self.error(msg, out, err)
else:
msg = "Couldn't retrieve %s" % filename
self.error(msg, out, err)
- raise RuntimeError
, msg
+ raise RuntimeError
(msg)
return result
return result
@@
-304,7
+304,7
@@
class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
if proc.poll():
self.error(msg, out, err)
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)
# 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)
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)
port = self.wait_local_port(endpoint)