X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fgretunnel.py;h=f422a63ec105e3302ec37f6587b2097e3072cf89;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=0d4962fa15dcbaa08c851f54e4f0fd60087f09b0;hpb=741b99fe027fe6b54846a0703d26510d9b40a135;p=nepi.git diff --git a/src/nepi/resources/linux/gretunnel.py b/src/nepi/resources/linux/gretunnel.py index 0d4962fa..f422a63e 100644 --- a/src/nepi/resources/linux/gretunnel.py +++ b/src/nepi/resources/linux/gretunnel.py @@ -3,9 +3,8 @@ # Copyright (C) 2013 INRIA # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation; # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -32,7 +31,6 @@ import os class LinuxGRETunnel(LinuxTunnel): _rtype = "linux::GRETunnel" _help = "Constructs a tunnel between two Linux endpoints using a UDP connection " - _backend = "linux" def log_message(self, msg): return " guid %d - GRE tunnel %s - %s - %s " % (self.guid, @@ -74,7 +72,7 @@ class LinuxGRETunnel(LinuxTunnel): if not m or int(m.groups()[0]) == 100: msg = " Error establishing GRE Tunnel" self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) def terminate_connection(self, endpoint, remote_endpoint): pass