X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fplanetlab%2Fudptunnel.py;h=167052b9f72e95ffa3bd0e5ffef771c9d3790c5e;hb=b6c4948fd994223cff257cbdae7146da1339b58d;hp=da077181a6e83b2a10f2beb28c6cff72c1fef711;hpb=dceafc553de152296b99e8c2f4b3fef1321bd7ef;p=nepi.git

diff --git a/test/resources/planetlab/udptunnel.py b/test/resources/planetlab/udptunnel.py
index da077181..167052b9 100755
--- a/test/resources/planetlab/udptunnel.py
+++ b/test/resources/planetlab/udptunnel.py
@@ -34,7 +34,8 @@ class PlanetlabUdpTunnelTestCase(unittest.TestCase):
         self.host1 = "planetlab1.informatik.uni-erlangen.de"
         self.host2 = "planck227ple.test.ibbt.be"
         self.user = "inria_nepi"
-        self.identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
+        #self.identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
+        self.identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
         #self.netblock = "192.168.1"
         self.netblock = "192.168.3"
 
@@ -42,39 +43,37 @@ class PlanetlabUdpTunnelTestCase(unittest.TestCase):
     def t_tap_udp_tunnel(self, user1, host1, identity1, user2, host2, 
             identity2):
 
-        ec = ExperimentController(exp_id = "test-tap-udp-tunnel")
+        ec = ExperimentController(exp_id="test-tap-udp-tunnel")
         
-        node1 = ec.register_resource("PlanetlabNode")
+        node1 = ec.register_resource("planetlab::Node")
         ec.set(node1, "hostname", host1)
         ec.set(node1, "username", user1)
         ec.set(node1, "identity", identity1)
-        #ec.set(node1, "cleanHome", True)
         ec.set(node1, "cleanExperiment", True)
         ec.set(node1, "cleanProcesses", True)
 
-        tap1 = ec.register_resource("PlanetlabTap")
-        ec.set(tap1, "ip4", "%s.1" % self.netblock)
-        ec.set(tap1, "prefix4", 24)
+        tap1 = ec.register_resource("planetlab::Tap")
+        ec.set(tap1, "ip", "%s.1" % self.netblock)
+        ec.set(tap1, "prefix", "24")
         ec.register_connection(tap1, node1)
 
-        node2 = ec.register_resource("PlanetlabNode")
+        node2 = ec.register_resource("planetlab::Node")
         ec.set(node2, "hostname", host2)
         ec.set(node2, "username", user2)
         ec.set(node2, "identity", identity2)
-        #ec.set(node2, "cleanHome", True)
         ec.set(node2, "cleanExperiment", True)
         ec.set(node2, "cleanProcesses", True)
 
-        tap2 = ec.register_resource("PlanetlabTap")
-        ec.set(tap2, "ip4", "%s.2" % self.netblock)
-        ec.set(tap2, "prefix4", 24)
+        tap2 = ec.register_resource("planetlab::Tap")
+        ec.set(tap2, "ip", "%s.2" % self.netblock)
+        ec.set(tap2, "prefix", "24")
         ec.register_connection(tap2, node2)
 
-        udptun = ec.register_resource("LinuxUdpTunnel")
+        udptun = ec.register_resource("linux::UdpTunnel")
         ec.register_connection(tap1, udptun)
         ec.register_connection(tap2, 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)
@@ -98,39 +97,37 @@ class PlanetlabUdpTunnelTestCase(unittest.TestCase):
     @skipIfAnyNotAliveWithIdentity
     def t_tun_udp_tunnel(self, user1, host1, identity1, user2, host2, identity2):
 
-        ec = ExperimentController(exp_id = "test-tun-udp-tunnel")
+        ec = ExperimentController(exp_id="test-tun-udp-tunnel")
         
-        node1 = ec.register_resource("PlanetlabNode")
+        node1 = ec.register_resource("planetlab::Node")
         ec.set(node1, "hostname", host1)
         ec.set(node1, "username", user1)
         ec.set(node1, "identity", identity1)
-        #ec.set(node1, "cleanHome", True)
         ec.set(node1, "cleanExperiment", True)
         ec.set(node1, "cleanProcesses", True)
 
-        tun1 = ec.register_resource("PlanetlabTun")
-        ec.set(tun1, "ip4", "%s.1" % self.netblock)
-        ec.set(tun1, "prefix4", 24)
+        tun1 = ec.register_resource("planetlab::Tun")
+        ec.set(tun1, "ip", "%s.1" % self.netblock)
+        ec.set(tun1, "prefix", "24")
         ec.register_connection(tun1, node1)
 
-        node2 = ec.register_resource("PlanetlabNode")
+        node2 = ec.register_resource("planetlab::Node")
         ec.set(node2, "hostname", host2)
         ec.set(node2, "username", user2)
         ec.set(node2, "identity", identity2)
-        #ec.set(node2, "cleanHome", True)
         ec.set(node2, "cleanExperiment", True)
         ec.set(node2, "cleanProcesses", True)
 
-        tun2 = ec.register_resource("PlanetlabTun")
-        ec.set(tun2, "ip4", "%s.2" % self.netblock)
-        ec.set(tun2, "prefix4", 24)
+        tun2 = ec.register_resource("planetlab::Tun")
+        ec.set(tun2, "ip", "%s.2" % self.netblock)
+        ec.set(tun2, "prefix", "24")
         ec.register_connection(tun2, node2)
 
-        udptun = ec.register_resource("LinuxUdpTunnel")
+        udptun = ec.register_resource("linux::UdpTunnel")
         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)