# HG changeset patch # User Sebastien Decugis # Date 1298354099 -32400 # Node ID 6bc5df5d2da46e3580c908a898e779c6917dc00b # Parent fef572dfbd43216d9058170c2970d323412da0bf New configuration for Redirect tests diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/nas.a.rt.testbed.aaa/freeDiameter/CMakeFlags --- a/conf/nas.a.rt.testbed.aaa/freeDiameter/CMakeFlags Tue Jan 11 16:08:18 2011 +0900 +++ b/conf/nas.a.rt.testbed.aaa/freeDiameter/CMakeFlags Tue Feb 22 14:54:59 2011 +0900 @@ -1,5 +1,6 @@ -DBUILD_TEST_APP:BOOL=ON -DBUILD_TEST_RT_ANY:BOOL=ON +-DBUILD_RT_REDIRECT:BOOL=ON -DBUILD_DBG_MONITOR:BOOL=ON -DBUILD_DBG_INTERACTIVE:BOOL=ON -DBUILD_DBG_RT:BOOL=ON diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/nas.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf --- a/conf/nas.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Jan 11 16:08:18 2011 +0900 +++ b/conf/nas.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Feb 22 14:54:59 2011 +0900 @@ -1,65 +1,29 @@ -# This is a sample configuration file for freeDiameter daemon. -############################################################## -#Identity = "aaa.koganei.wide.ad.jp"; -#Realm = "wide.ad.jp"; - -############################################################## -#Port = 3868; -#SecPort = 3869; -#TLS_old_method; -#No_TCP; -#No_SCTP; -#Prefer_TCP; -#SCTP_streams = 30; SCTP_streams = 3; - -############################################################## -#No_IP; -#No_IPv6; -#ListenOn = "202.249.37.5"; -#ListenOn = "2001:200:903:2::202:1"; -#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0"; - -############################################################## TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem"; TLS_CA = "/root/ca_data/ca.pem"; -# TLS_CRL = "/root/ca_data/crl.pem"; - -#TLS_Prio = "NORMAL"; -#TLS_DH_Bits = 1024; - -############################################################## -#TcTimer = 30; -#TwTimer = 30; - -############################################################## NoRelay; -############################################################## -#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ; - -############################################################## -#ConnectPeer = "diameterid" [ params... ] ; -# params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS; -# Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL"; - - -############################################################## # -------- Test configuration --------- # LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx"; # LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx"; # LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx"; -#LoadExtension = "/root/freeDiameter/extensions/test_app.fdx" -# : "/root/conf/freeDiameter/test_app.conf"; + +LoadExtension = "/root/freeDiameter/extensions/test_app.fdx" + : "/root/conf/freeDiameter/test_app.conf"; +# LoadExtension = "/root/freeDiameter/extensions/dbg_interactive.fdx"; + + LoadExtension = "/root/freeDiameter/extensions/rt_default.fdx" : "/root/conf/freeDiameter/rtd.conf"; -LoadExtension = "/root/freeDiameter/extensions/dbg_interactive.fdx"; +ConnectPeer = "proxy.a.rt.testbed.aaa" ; + +# For failover testing: +#ConnectPeer = "proxy.b.rt.testbed.aaa" ; -# ConnectPeer = "serv.simple.testbed.aaa" ; -ConnectPeer = "proxy.a.rt.testbed.aaa" ; -ConnectPeer = "proxy.b.rt.testbed.aaa" ; +# For redirect testing: +ConnectPeer = "relay.a.rt.testbed.aaa" ; +LoadExtension = "/root/freeDiameter/extensions/rt_redirect.fdx"; - diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/nas.a.rt.testbed.aaa/freeDiameter/rtd.conf --- a/conf/nas.a.rt.testbed.aaa/freeDiameter/rtd.conf Tue Jan 11 16:08:18 2011 +0900 +++ b/conf/nas.a.rt.testbed.aaa/freeDiameter/rtd.conf Tue Feb 22 14:54:59 2011 +0900 @@ -1,3 +1,4 @@ -# Our local proxy is default route for all messages +# Our local relay is default route for all messages +* : "relay.a.rt.testbed.aaa" += 6; # This is "default + 1" so that it is prefered when possible * : "proxy.a.rt.testbed.aaa" += DEFAULT; * : "proxy.b.rt.testbed.aaa" += DEFAULT; diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/proxy.a.rt.testbed.aaa/freeDiameter/CMakeFlags --- a/conf/proxy.a.rt.testbed.aaa/freeDiameter/CMakeFlags Tue Jan 11 16:08:18 2011 +0900 +++ b/conf/proxy.a.rt.testbed.aaa/freeDiameter/CMakeFlags Tue Feb 22 14:54:59 2011 +0900 @@ -1,4 +1,3 @@ --DBUILD_TEST_RT_ANY:BOOL=ON \ -DBUILD_DBG_MONITOR:BOOL=ON \ -DBUILD_DBG_RT:BOOL=ON \ -DBUILD_TEST_NETEMUL:BOOL=ON \ diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/proxy.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf --- a/conf/proxy.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Jan 11 16:08:18 2011 +0900 +++ b/conf/proxy.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Feb 22 14:54:59 2011 +0900 @@ -1,62 +1,22 @@ -# This is a sample configuration file for freeDiameter daemon. -############################################################## -#Identity = "aaa.koganei.wide.ad.jp"; -#Realm = "wide.ad.jp"; - -############################################################## -#Port = 3868; -#SecPort = 3869; -#TLS_old_method; -#No_TCP; -#No_SCTP; -#Prefer_TCP; -#SCTP_streams = 30; SCTP_streams = 3; - -############################################################## -#No_IP; -#No_IPv6; -#ListenOn = "202.249.37.5"; -#ListenOn = "2001:200:903:2::202:1"; -#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0"; - -############################################################## TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem"; TLS_CA = "/root/ca_data/ca.pem"; -# TLS_CRL = "/root/ca_data/crl.pem"; - -#TLS_Prio = "NORMAL"; -#TLS_DH_Bits = 1024; - -############################################################## -#TcTimer = 30; -#TwTimer = 30; - -############################################################## #NoRelay; -############################################################## -#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ; - - -############################################################## -#ConnectPeer = "diameterid" [ params... ] ; -# params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS; -# Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL"; - - -############################################################## # -------- Test configuration --------- #LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx"; #LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx"; +#LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx"; + LoadExtension = "/root/freeDiameter/extensions/acl_wl.fdx" : "/root/conf/freeDiameter/acl_wl.conf"; -# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx"; +# For netemul tests: LoadExtension = "/root/freeDiameter/extensions/test_netemul.fdx" : "/root/conf/freeDiameter/netemul.conf"; - + ConnectPeer = "proxy.b.rt.testbed.aaa" ; +ConnectPeer = "serv.b.rt.testbed.aaa" ; diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/proxy.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf --- a/conf/proxy.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Jan 11 16:08:18 2011 +0900 +++ b/conf/proxy.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Feb 22 14:54:59 2011 +0900 @@ -1,62 +1,20 @@ -# This is a sample configuration file for freeDiameter daemon. - -############################################################## -#Identity = "aaa.koganei.wide.ad.jp"; -#Realm = "wide.ad.jp"; - -############################################################## -#Port = 3868; -#SecPort = 3869; -#TLS_old_method; -#No_TCP; -#No_SCTP; -#Prefer_TCP; -#SCTP_streams = 30; SCTP_streams = 3; - -############################################################## -#No_IP; -#No_IPv6; -#ListenOn = "202.249.37.5"; -#ListenOn = "2001:200:903:2::202:1"; -#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0"; - -############################################################## TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem"; TLS_CA = "/root/ca_data/ca.pem"; -# TLS_CRL = "/root/ca_data/crl.pem"; - -#TLS_Prio = "NORMAL"; -#TLS_DH_Bits = 1024; - -############################################################## -#TcTimer = 30; -#TwTimer = 30; - -############################################################## #NoRelay; -############################################################## -#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ; - - -############################################################## -#ConnectPeer = "diameterid" [ params... ] ; -# params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS; -# Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL"; - - -############################################################## # -------- Test configuration --------- #LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx"; #LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx"; +# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx"; + LoadExtension = "/root/freeDiameter/extensions/acl_wl.fdx" : "/root/conf/freeDiameter/acl_wl.conf"; -# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx"; LoadExtension = "/root/freeDiameter/extensions/test_netemul.fdx" : "/root/conf/freeDiameter/netemul.conf"; ConnectPeer = "proxy.a.rt.testbed.aaa" ; -Realm = "a.rt.testbed.aaa" ; +ConnectPeer = "serv.b.rt.testbed.aaa" ; +# Realm = "a.rt.testbed.aaa" ; diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/relay.a.rt.testbed.aaa/freeDiameter/CMakeFlags --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/conf/relay.a.rt.testbed.aaa/freeDiameter/CMakeFlags Tue Feb 22 14:54:59 2011 +0900 @@ -0,0 +1,4 @@ +-DBUILD_APP_REDIRECT:BOOL=ON +-DBUILD_TESTING:BOOL=OFF +-DCMAKE_BUILD_TYPE:STRING=Debug +-DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/relay.a.rt.testbed.aaa/freeDiameter/ard.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/conf/relay.a.rt.testbed.aaa/freeDiameter/ard.conf Tue Feb 22 14:54:59 2011 +0900 @@ -0,0 +1,1 @@ +# Redirects tests diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/relay.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf --- a/conf/relay.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Jan 11 16:08:18 2011 +0900 +++ b/conf/relay.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Feb 22 14:54:59 2011 +0900 @@ -1,58 +1,15 @@ -# This is a sample configuration file for freeDiameter daemon. - -############################################################## -#Identity = "aaa.koganei.wide.ad.jp"; -#Realm = "wide.ad.jp"; - -############################################################## -#Port = 3868; -#SecPort = 3869; -#TLS_old_method; -#No_TCP; -#No_SCTP; -#Prefer_TCP; -#SCTP_streams = 30; SCTP_streams = 3; - -############################################################## -#No_IP; -#No_IPv6; -#ListenOn = "202.249.37.5"; -#ListenOn = "2001:200:903:2::202:1"; -#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0"; - -############################################################## TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem"; TLS_CA = "/root/ca_data/ca.pem"; -# TLS_CRL = "/root/ca_data/crl.pem"; - -#TLS_Prio = "NORMAL"; -#TLS_DH_Bits = 1024; - -############################################################## -#TcTimer = 30; -#TwTimer = 30; - -############################################################## #NoRelay; ############################################################## -#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ; -############################################################## -#ConnectPeer = "diameterid" [ params... ] ; -# params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS; -# Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL"; - +# LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx"; +# LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx"; -############################################################## -# -------- Test configuration --------- +ConnectPeer = "nas.a.rt.testbed.aaa" ; +ConnectPeer = "proxy.a.rt.testbed.aaa" ; -LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx"; -LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx"; -# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx"; -#LoadExtension = "/root/freeDiameter/extensions/test_app.fdx" -# : "/root/conf/freeDiameter/test_app.conf"; - -# ConnectPeer = "serv.simple.testbed.aaa" ; - +LoadExtension = "/root/freeDiameter/extensions/app_redirect.fdx" + : "/root/conf/freeDiameter/ard.conf"; diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/serv.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf --- a/conf/serv.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Jan 11 16:08:18 2011 +0900 +++ b/conf/serv.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf Tue Feb 22 14:54:59 2011 +0900 @@ -1,59 +1,16 @@ -# This is a sample configuration file for freeDiameter daemon. - -############################################################## -#Identity = "aaa.koganei.wide.ad.jp"; -#Realm = "wide.ad.jp"; - -############################################################## -#Port = 3868; -#SecPort = 3869; -#TLS_old_method; -#No_TCP; -#No_SCTP; -#Prefer_TCP; -#SCTP_streams = 30; SCTP_streams = 3; - -############################################################## -#No_IP; -#No_IPv6; -#ListenOn = "202.249.37.5"; -#ListenOn = "2001:200:903:2::202:1"; -#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0"; - -############################################################## TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem"; TLS_CA = "/root/ca_data/ca.pem"; -# TLS_CRL = "/root/ca_data/crl.pem"; - -#TLS_Prio = "NORMAL"; -#TLS_DH_Bits = 1024; - -############################################################## -#TcTimer = 30; -#TwTimer = 30; - -############################################################## NoRelay; -############################################################## -#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ; - -############################################################## -#ConnectPeer = "diameterid" [ params... ] ; -# params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS; -# Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL"; - - -############################################################## # -------- Test configuration --------- #LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx"; # LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx"; # LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx"; + LoadExtension = "/root/freeDiameter/extensions/test_app.fdx" : "/root/conf/freeDiameter/test_app.conf"; ConnectPeer = "proxy.b.rt.testbed.aaa" ; ConnectPeer = "proxy.a.rt.testbed.aaa" ; - diff -r fef572dfbd43 -r 6bc5df5d2da4 conf/supauth.eap.testbed.aaa/wpasupplicant/wpa_supplicant.conf --- a/conf/supauth.eap.testbed.aaa/wpasupplicant/wpa_supplicant.conf Tue Jan 11 16:08:18 2011 +0900 +++ b/conf/supauth.eap.testbed.aaa/wpasupplicant/wpa_supplicant.conf Tue Feb 22 14:54:59 2011 +0900 @@ -11,6 +11,7 @@ eap=TLS identity="client@eap.testbed.aaa" +# identity="clientinvalid@eap.testbed.aaa" ca_cert="/home/aaa/ca/ca_data/mgr.testbed.aaa/public/cacert.pem" client_cert="/home/aaa/ca/ca_data/mgr.testbed.aaa/clients/client/cert.pem" private_key="/home/aaa/ca/ca_data/mgr.testbed.aaa/clients/client/privkey.pem" diff -r fef572dfbd43 -r 6bc5df5d2da4 mrb/routing_testbed.sh --- a/mrb/routing_testbed.sh Tue Jan 11 16:08:18 2011 +0900 +++ b/mrb/routing_testbed.sh Tue Feb 22 14:54:59 2011 +0900 @@ -19,6 +19,8 @@ # Maintenant on peut demarrer les autres VM en paralelle ./vm_start.sh "rt-nas.a.rt.testbed.aaa" & sleep 3 + ./vm_start.sh "rt-relay.a.rt.testbed.aaa" & + sleep 3 ./vm_start.sh "rt-proxy.a.rt.testbed.aaa" & sleep 3 ./vm_start.sh "rt-proxy.b.rt.testbed.aaa" & @@ -33,6 +35,7 @@ ./vm_pause.sh "__mgr.testbed.aaa" & ./vm_pause.sh "rt-rtmgr.testbed.aaa" & ./vm_pause.sh "rt-nas.a.rt.testbed.aaa" & + ./vm_pause.sh "rt-relay.a.rt.testbed.aaa" & ./vm_pause.sh "rt-proxy.a.rt.testbed.aaa" & ./vm_pause.sh "rt-proxy.b.rt.testbed.aaa" & ./vm_pause.sh "rt-serv.b.rt.testbed.aaa" & @@ -43,6 +46,7 @@ ./vm_stop.sh "__mgr.testbed.aaa" & ./vm_stop.sh "rt-rtmgr.testbed.aaa" & ./vm_stop.sh "rt-nas.a.rt.testbed.aaa" & + ./vm_stop.sh "rt-relay.a.rt.testbed.aaa" & ./vm_stop.sh "rt-proxy.a.rt.testbed.aaa" & ./vm_stop.sh "rt-proxy.b.rt.testbed.aaa" & ./vm_stop.sh "rt-serv.b.rt.testbed.aaa" & diff -r fef572dfbd43 -r 6bc5df5d2da4 scripts/freeDiameter-install.sh --- a/scripts/freeDiameter-install.sh Tue Jan 11 16:08:18 2011 +0900 +++ b/scripts/freeDiameter-install.sh Tue Feb 22 14:54:59 2011 +0900 @@ -1,7 +1,7 @@ #!/bin/bash -x # Install dependencies for freeDiameter -aptitude install flex bison libsctp1 libsctp-dev libgcrypt-dev libgcrypt11-dbg libgnutls26 libgnutls26-dbg libgnutls-dev mercurial cmake gdb python-dev swig +aptitude install flex bison libsctp1 libsctp-dev libgcrypt-dev libgcrypt11-dbg libgnutls26 libgnutls26-dbg libgnutls-dev mercurial cmake gdb python-dev swig libidn11-dev # Install the link to the configuration /home/aaa/installvm.sh conflink diff -r fef572dfbd43 -r 6bc5df5d2da4 scripts/freeDiameter-run.sh --- a/scripts/freeDiameter-run.sh Tue Jan 11 16:08:18 2011 +0900 +++ b/scripts/freeDiameter-run.sh Tue Feb 22 14:54:59 2011 +0900 @@ -11,4 +11,4 @@ popd echo fd-$HOST-$DATE.log > /home/aaa/logs/LATEST-$HOST-fd.log -/root/freeDiameter/freeDiameter/freeDiameterd -dd $* 2>&1 | tee -i /home/aaa/logs/fd-$HOST-$DATE.log +/root/freeDiameter/freeDiameterd/freeDiameterd -dd $* 2>&1 | tee -i /home/aaa/logs/fd-$HOST-$DATE.log