From 7baa0b372392c85c1d6c835766274123b1cd05a8 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 25 Oct 2007 19:22:37 +0000 Subject: [PATCH] merge from onelab --- tests/Makefile | 4 ++-- tests/TestPeers.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index f86262c7..5c56250d 100644 --- 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 2f641611..b6ba4b11 100755 --- 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', -- 2.47.0