# 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
import time
import unittest
+## TODO: VALIDATE THIS TEST!
+
class LinuxGRETunnelTestCase(unittest.TestCase):
def setUp(self):
- self.host1 = "roseval.pl.sophia.inria.fr"
- self.host2 = "truckers.pl.sophia.inria.fr"
- self.user1 = "inria_nepi"
- self.user2 = "aquereil"
- self.identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
+ self.host = "roseval.pl.sophia.inria.fr"
+ self.user = "inria_nepi"
+ self.identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
self.netblock = "192.168.1"
@skipIfAnyNotAliveWithIdentity
- def t_tap_gre_tunnel(self, user1, host1, identity1, user2, host2,
- identity2):
-
+ def t_tap_gre_tunnel(self, user, host, identity):
ec = ExperimentController(exp_id = "test-tap-gre-tunnel")
- node1 = ec.register_resource("LinuxNode")
- ec.set(node1, "hostname", host1)
- ec.set(node1, "username", user1)
- ec.set(node1, "identity", identity1)
- ec.set(node1, "cleanHome", True)
+ node1 = ec.register_resource("linux::Node")
+ ec.set(node1, "hostname", "localhost")
+ ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
- tap1 = ec.register_resource("LinuxTap")
- ec.set(tap1, "ip4", "%s.1" % self.netblock)
- ec.set(tap1, "prefix4", 24)
+ tap1 = ec.register_resource("linux::Tap")
+ ec.set(tap1, "ip", "%s.1" % self.netblock)
+ ec.set(tap1, "prefix", "32")
ec.register_connection(tap1, node1)
- node2 = ec.register_resource("LinuxNode")
- ec.set(node2, "hostname", host2)
- ec.set(node2, "username", user2)
- ec.set(node2, "identity", identity2)
- ec.set(node2, "cleanHome", True)
+ node2 = ec.register_resource("linux::Node")
+ ec.set(node2, "hostname", host)
+ ec.set(node2, "username", user)
+ ec.set(node2, "identity", identity)
+ ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
- tap2 = ec.register_resource("LinuxTap")
- ec.set(tap2, "ip4", "%s.2" % self.netblock)
- ec.set(tap2, "prefix4", 24)
+ tap2 = ec.register_resource("linux::Tap")
+ ec.set(tap2, "ip", "%s.2" % self.netblock)
+ ec.set(tap2, "prefix", "32")
ec.register_connection(tap2, node2)
- gretun = ec.register_resource("LinuxGRETunnel")
+ gretun = ec.register_resource("linux::GRETunnel")
ec.register_connection(tap1, gretun)
ec.register_connection(tap2, gretun)
- app = ec.register_resource("LinuxApplication")
+ app = ec.register_resource("linux::Application")
cmd = "ping -c3 %s.2" % self.netblock
ec.set(app, "command", cmd)
ec.register_connection(app, node1)
ec.shutdown()
@skipIfAnyNotAliveWithIdentity
- def t_tun_gre_tunnel(self, user1, host1, identity1, user2, host2,
- identity2):
-
+ def t_tun_gre_tunnel(self, user, host, identity):
ec = ExperimentController(exp_id = "test-tun-gre-tunnel")
- node1 = ec.register_resource("LinuxNode")
- ec.set(node1, "hostname", host1)
- ec.set(node1, "username", user1)
- ec.set(node1, "identity", identity1)
- ec.set(node1, "cleanHome", True)
+ node1 = ec.register_resource("linux::Node")
+ ec.set(node1, "hostname", "localhost")
+ ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
- tun1 = ec.register_resource("LinuxTun")
- ec.set(tun1, "ip4", "%s.1" % self.netblock)
- ec.set(tun1, "prefix4", 24)
+ tun1 = ec.register_resource("linux::Tun")
+ ec.set(tun1, "ip", "%s.1" % self.netblock)
+ ec.set(tun1, "prefix", "32")
ec.register_connection(tun1, node1)
- node2 = ec.register_resource("LinuxNode")
- ec.set(node2, "hostname", host2)
- ec.set(node2, "username", user2)
- ec.set(node2, "identity", identity2)
- ec.set(node2, "cleanHome", True)
+ node2 = ec.register_resource("linux::Node")
+ ec.set(node2, "hostname", host)
+ ec.set(node2, "username", user)
+ ec.set(node2, "identity", identity)
+ ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
- tun2 = ec.register_resource("LinuxTun")
- ec.set(tun2, "ip4", "%s.2" % self.netblock)
- ec.set(tun2, "prefix4", 24)
+ tun2 = ec.register_resource("linux::Tun")
+ ec.set(tun2, "ip", "%s.2" % self.netblock)
+ ec.set(tun2, "prefix", "32")
ec.register_connection(tun2, node2)
- udptun = ec.register_resource("LinuxGRETunnel")
+ udptun = ec.register_resource("linux::GRETunnel")
ec.register_connection(tun1, udptun)
ec.register_connection(tun2, udptun)
- app = ec.register_resource("LinuxApplication")
+ app = ec.register_resource("linux::Application")
cmd = "ping -c3 %s.2" % self.netblock
ec.set(app, "command", cmd)
ec.register_connection(app, node1)
ec.shutdown()
def test_tap_gre_tunnel(self):
- self.t_tap_gre_tunnel(self.user1, self.host1, self.identity,
- self.user2, self.host2, self.identity)
+ self.t_tap_gre_tunnel(self.user, self.host, self.identity)
- def test_tun_gre_tunnel(self):
- self.t_tun_gre_tunnel(self.user1, self.host1, self.identity,
- self.user2, self.host2, self.identity)
+ def ztest_tun_gre_tunnel(self):
+ self.t_tun_gre_tunnel(self.user, self.host, self.identity)
if __name__ == '__main__':
unittest.main()
git://git.onelab.eu / nepi.git / blobdiff