diff --git a/tests/docker-ocserv/ocserv-pam.conf b/tests/docker-ocserv/ocserv-pam.conf index 448c336a..e7cc2b88 100644 --- a/tests/docker-ocserv/ocserv-pam.conf +++ b/tests/docker-ocserv/ocserv-pam.conf @@ -207,7 +207,7 @@ device = vpns default-domain = example.com # The pool of addresses that leases will be given from. -ipv4-network = 192.168.1.0 +ipv4-network = 192.168.56.0 ipv4-netmask = 255.255.255.0 # The advertized DNS server. Use multiple lines for @@ -219,7 +219,7 @@ ipv4-netmask = 255.255.255.0 #nbns = 192.168.1.3 # The IPv6 subnet that leases will be given from. -ipv6-network = fd91:6d87:7341:db6a:: +ipv6-network = fd91:6d87:7341:dc6b:: ipv6-prefix = 64 # The domains over which the provided DNS should be used. Use @@ -249,9 +249,9 @@ ping-leases = false # # To set the server as the default gateway for the client just # comment out all routes from the server. -route = 192.168.1.0/255.255.255.0 +route = 192.168.56.0/255.255.255.0 #route = 192.168.5.0/255.255.255.0 -route = fd91:6d87:7341:db6a::/64 +route = fd91:6d87:7341:dc6b::/64 # Configuration files that will be applied per user connection or # per group. Each file name on these directories must match the username diff --git a/tests/docker-ocserv/ocserv-radius.conf b/tests/docker-ocserv/ocserv-radius.conf index 770ebd10..18f3af24 100644 --- a/tests/docker-ocserv/ocserv-radius.conf +++ b/tests/docker-ocserv/ocserv-radius.conf @@ -210,7 +210,7 @@ device = vpns default-domain = example.com # The pool of addresses that leases will be given from. -ipv4-network = 192.168.1.0 +ipv4-network = 192.168.55.0 ipv4-netmask = 255.255.255.0 # The advertized DNS server. Use multiple lines for @@ -222,7 +222,7 @@ ipv4-netmask = 255.255.255.0 #nbns = 192.168.1.3 # The IPv6 subnet that leases will be given from. -ipv6-network = fd91:6d87:7341:db6a:: +ipv6-network = fd91:6d87:7341:dd6b:: ipv6-prefix = 64 # The domains over which the provided DNS should be used. Use @@ -252,9 +252,9 @@ ping-leases = false # # To set the server as the default gateway for the client just # comment out all routes from the server. -route = 192.168.1.0/255.255.255.0 +route = 192.168.55.0/255.255.255.0 #route = 192.168.5.0/255.255.255.0 -route = fd91:6d87:7341:db6a::/64 +route = fd91:6d87:7341:dd6b::/64 # Configuration files that will be applied per user connection or # per group. Each file name on these directories must match the username diff --git a/tests/pam-test b/tests/pam-test index c82e1d82..be3b7e90 100755 --- a/tests/pam-test +++ b/tests/pam-test @@ -77,21 +77,21 @@ rm -f pass-pam.tmp sleep 5 # The client IP depends on the username so it shouldn't change. -ping -w 5 192.168.1.1 +ping -w 5 192.168.56.1 if test $? != 0;then kill $PID echo "Cannot ping ocserv" stop fi -ping -w 5 192.168.1.1 -s 1500 +ping -w 5 192.168.56.1 -s 1500 if test $? != 0;then kill $PID echo "Cannot ping ocserv" stop fi -ping6 -w 5 fd91:6d87:7341:db6a::1 +ping6 -w 5 fd91:6d87:7341:dc6b::1 if test $? != 0;then kill $PID echo "Cannot ping the IPv6 of ocserv" @@ -105,14 +105,14 @@ printf "echo root" >>echo-admin.tmp printf "\n" >>echo-admin.tmp chmod 755 echo-admin.tmp export SSH_ASKPASS="./echo-admin.tmp" -setsid ssh -T -F config.tmp root@192.168.1.1 occtl show user testuser >out.tmp 2>&1 +setsid ssh -T -F config.tmp root@192.168.56.1 occtl show user testuser >out.tmp 2>&1 cat out.tmp printf "#\!/bin/sh\n" >echo-admin.tmp printf "echo root" >>echo-admin.tmp printf "\n" >>echo-admin.tmp chmod 755 echo-admin.tmp -setsid ssh -T -F config.tmp root@192.168.1.1 occtl show user testuser >out.tmp 2>&1 +setsid ssh -T -F config.tmp root@192.168.56.1 occtl show user testuser >out.tmp 2>&1 cat out.tmp rm -f echo-admin.tmp rm -f config.tmp @@ -130,14 +130,14 @@ rm -f out.tmp # There is an issue in nuttcp that makes it crash under docker if # /proc/sys/net/ipv4/tcp_adv_win_scale does not exist. if test "$FEDORA" = 1;then -nuttcp -T 10 -t 192.168.1.1 +nuttcp -T 10 -t 192.168.56.1 if test $? != 0;then kill $PID echo "Cannot send to ocserv" stop fi -nuttcp -T 10 -r 192.168.1.1 +nuttcp -T 10 -r 192.168.56.1 if test $? != 0;then kill $PID echo "Cannot recv from ocserv" diff --git a/tests/radius-test b/tests/radius-test index 05be1821..f33f2a2b 100755 --- a/tests/radius-test +++ b/tests/radius-test @@ -79,21 +79,21 @@ rm -f pass-radius.tmp sleep 5 # The client IP depends on the username so it shouldn't change. -ping -w 5 192.168.1.1 +ping -w 5 192.168.55.1 if test $? != 0;then kill $PID echo "Cannot ping ocserv" stop fi -ping -w 5 192.168.1.1 -s 1500 +ping -w 5 192.168.55.1 -s 1500 if test $? != 0;then kill $PID echo "Cannot ping ocserv" stop fi -ping6 -w 5 fd91:6d87:7341:db6a::1 +ping6 -w 5 fd91:6d87:7341:dd6b::1 if test $? != 0;then kill $PID echo "Cannot ping the IPv6 of ocserv" @@ -107,14 +107,14 @@ printf "echo root" >>echo-admin.tmp printf "\n" >>echo-admin.tmp chmod 755 echo-admin.tmp export SSH_ASKPASS="./echo-admin.tmp" -setsid ssh -T -F config.tmp root@192.168.1.1 occtl show user test >out.tmp 2>&1 +setsid ssh -T -F config.tmp root@192.168.55.1 occtl show user test >out.tmp 2>&1 cat out.tmp printf "#\!/bin/sh\n" >echo-admin.tmp printf "echo root" >>echo-admin.tmp printf "\n" >>echo-admin.tmp chmod 755 echo-admin.tmp -setsid ssh -T -F config.tmp root@192.168.1.1 occtl show user test >out.tmp 2>&1 +setsid ssh -T -F config.tmp root@192.168.55.1 occtl show user test >out.tmp 2>&1 cat out.tmp rm -f echo-admin.tmp rm -f config.tmp @@ -132,14 +132,14 @@ rm -f out.tmp # There is an issue in nuttcp that makes it crash under docker if # /proc/sys/net/ipv4/tcp_adv_win_scale does not exist. if test "$FEDORA" = 1;then -nuttcp -T 10 -t 192.168.1.1 +nuttcp -T 10 -t 192.168.55.1 if test $? != 0;then kill $PID echo "Cannot send to ocserv" stop fi -nuttcp -T 10 -r 192.168.1.1 +nuttcp -T 10 -r 192.168.55.1 if test $? != 0;then kill $PID echo "Cannot recv from ocserv"