From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Thu, 25 Aug 2011 16:09:09 +0000 (+0200)
Subject: Avoid using PLE for tests
X-Git-Tag: nepi-3.0.0~263
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=75aa5280b13cd5ce2c631923f6b7987d9a90590b;p=nepi.git

Avoid using PLE for tests
---

diff --git a/test/testbeds/planetlab/execute.py b/test/testbeds/planetlab/execute.py
index f19bc86f..1205e9f7 100755
--- a/test/testbeds/planetlab/execute.py
+++ b/test/testbeds/planetlab/execute.py
@@ -498,11 +498,11 @@ echo 'OKIDOKI'
         self._pingtest("TapInterface", "udp", "AES", self.PLR50_C, self.PLR50_C, "plr=40", "plr=40")
 
     @test_util.skipUnless(test_util.pl_auth() is not None, "Test requires PlanetLab authentication info (PL_USER and PL_PASS environment variables)")
-    def test_tap_ping_udp_tos(self):
+    def test_tun_ping_udp_tos(self):
         self._pingtest("TunInterface", "udp", "AES", self.TOS_PY, self.TOS_PY, "size=1000", "size=1000", "0")
 
     @test_util.skipUnless(test_util.pl_auth() is not None, "Test requires PlanetLab authentication info (PL_USER and PL_PASS environment variables)")
-    def test_tap_ping_udp_class(self):
+    def test_tun_ping_udp_class(self):
         self._pingtest("TunInterface", "udp", "AES", self.CLS_PY, self.CLS_PY, "size=10", "size=10", "0")
 
     @test_util.skipUnless(test_util.pl_auth() is not None, "Test requires PlanetLab authentication info (PL_USER and PL_PASS environment variables)")
diff --git a/test/testbeds/planetlab/integration_multi.py b/test/testbeds/planetlab/integration_multi.py
index 505884bd..c3db7499 100755
--- a/test/testbeds/planetlab/integration_multi.py
+++ b/test/testbeds/planetlab/integration_multi.py
@@ -19,15 +19,17 @@ class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
     
     slicename1 = "inria_nepi"
     plchost1 = "nepiplc.pl.sophia.inria.fr"
+    plcvnet1 = "192.168.2"
 
     slicename2 = "inria_nepi2"
     plchost2 = "nepiplc.pl.sophia.inria.fr"
+    plcvnet2 = "192.168.3"
     
     host1pl1 = "nepi1.pl.sophia.inria.fr"
     host2pl1 = "nepi2.pl.sophia.inria.fr"
 
     host1pl2 = "nepi3.pl.sophia.inria.fr"
-    host2pl2 = "nepi4.pl.sophia.inria.fr"
+    host2pl2 = "nepi5.pl.sophia.inria.fr"
 
     port_base = 2000 + (os.getpid() % 1000) * 13
     
@@ -113,12 +115,14 @@ class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
         
         # Create PL node, ifaces, assign addresses
         node1, iface1, tap1, tap1ip, inet1 = self.make_pl_tapnode(pl, 
-            "192.168.2.2", self.host1pl1, "node1")
+            self.plcvnet1+".2", self.host1pl1, "node1")
         node2, iface2, tap2, tap2ip, inet2 = self.make_pl_tapnode(pl2, 
-            "192.168.2.3", self.host1pl2, "node2")
+            self.plcvnet2+".3", self.host1pl2, "node2")
             
         # Connect the two
         tap1.connector(proto).connect(tap2.connector(proto))
+        tap1.set_attribute_value("pointopoint", "{#[node2tap].addr[0].[Address]#}")
+        tap2.set_attribute_value("pointopoint", "{#[node1tap].addr[0].[Address]#}")
         
         # Disable encryption for GRE
         if proto == "gre":