merge from onelab

diff --git a/tests/Makefile b/tests/Makefile
index f86262c..5c56250 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,7 +1,7 @@
 ### -*-Makefile-*-
 # $Id: Makefile 566 2007-06-20 14:44:13Z thierry $
-PLC1=caicol.inria.fr
-PLC2=jamaica.inria.fr
+PLC1=plc1.inria.fr
+PLC2=plc2.inria.fr
 
 CHROOTJAIL=/plc/root
 CHROOT=chroot $(CHROOTJAIL)

diff --git a/tests/TestPeers.py b/tests/TestPeers.py
index 2f64161..b6ba4b1 100755 (executable)
--- a/tests/TestPeers.py
+++ b/tests/TestPeers.py
@@ -39,11 +39,11 @@ except:
     
 ####################
 plc[1]={ 'plcname':'FederationTestPlc1',
-         'hostname':'caicol.inria.fr',
+         'hostname':'plc1.inria.fr',
          'url-format':'https://%s:443/PLCAPI/',
          'builtin-admin-id':'root@plc1.inria.fr',
          'builtin-admin-password':'root',
-         'peer-admin-name':'peer1@planet-lab.org',
+         'peer-admin-name':'peer1@planet-lab.eu',
          'peer-admin-password':'peer',
          'node-format':'n1-%03d.plc1.org',
          'plainname' : 'one',
@@ -55,11 +55,11 @@ plc[1]={ 'plcname':'FederationTestPlc1',
         'api-cacert':'api_plc2.crt',
        }
 plc[2]={ 'plcname':'FederationTestPlc2',
-         'hostname':'jamaica.inria.fr',
+         'hostname':'plc2.inria.fr',
          'url-format':'https://%s:443/PLCAPI/',
          'builtin-admin-id':'root@plc2.inria.fr',
          'builtin-admin-password':'root',
-         'peer-admin-name':'peer2@planet-lab.org',
+         'peer-admin-name':'peer2@planet-lab.eu',
          'peer-admin-password':'peer',
          'node-format':'n2-%03d.plc2.org',
          'plainname' : 'two',