# 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
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
-from nepi.execution.resource import clsinit_copy, ResourceState, \
- reschedule_delay
+from nepi.execution.resource import clsinit_copy, ResourceState
from nepi.resources.linux.tunnel import LinuxTunnel
from nepi.util.sshfuncs import ProcStatus
from nepi.util.timefuncs import tnow, tdiffsec
@clsinit_copy
class LinuxGRETunnel(LinuxTunnel):
- _rtype = "LinuxGRETunnel"
+ _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,
# other endpoint
connection_run_home = self.run_home(endpoint)
connection_app_home = self.app_home(endpoint)
- data = endpoint.gre_connect(remote_endpoint, connection_run_home,
- connection_app_home)
+ data = endpoint.gre_connect(remote_endpoint,
+ connection_app_home,
+ connection_run_home)
return data
def establish_connection(self, endpoint, remote_endpoint, data):
m = re.search("(\d+)% packet loss", str(out))
if not m or int(m.groups()[0]) == 100:
- msg = " Erroro establishing GRE Tunnel"
+ msg = " Error establishing GRE Tunnel"
self.error(msg, out, err)
- raise RuntimeError, msg
+ raise RuntimeError(msg)
def terminate_connection(self, endpoint, remote_endpoint):
pass