testing: Use renamed systemd unit

While the alias is available after enabling the unit, we don't
actually do that in our testing environment (adding a symlink manually
would work too, then again, why not just use the proper name?).

testing/tests/ipv6/host2host-ikev1/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
 moon::ip6tables-restore < /etc/ip6tables.flush

testing/tests/ipv6/host2host-ikev1/pretest.dat

@@ -2,8 +2,8 @@ moon::iptables-restore < /etc/iptables.drop
 sun::iptables-restore < /etc/iptables.drop
 moon::ip6tables-restore < /etc/ip6tables.rules
 sun::ip6tables-restore < /etc/ip6tables.rules
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 sun::expect-connection host-host
 moon::expect-connection host-host
 moon::swanctl --initiate --child host-host 2> /dev/null

testing/tests/ipv6/host2host-ikev2/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
 moon::ip6tables-restore < /etc/ip6tables.flush

testing/tests/ipv6/host2host-ikev2/pretest.dat

@@ -2,8 +2,8 @@ moon::iptables-restore < /etc/iptables.drop
 sun::iptables-restore < /etc/iptables.drop
 moon::ip6tables-restore < /etc/ip6tables.rules
 sun::ip6tables-restore < /etc/ip6tables.rules
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection host-host
 sun::expect-connection host-host
 moon::swanctl --initiate --child host-host 2> /dev/null

testing/tests/ipv6/net2net-ikev1/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 alice::"ip route del fec2:\:/16 via fec1:\:1"
 moon::"ip route del fec2:\:/16 via fec0:\:2"
 sun::"ip route del fec1:\:/16 via fec0:\:1"

testing/tests/ipv6/net2net-ikev1/pretest.dat

@@ -6,8 +6,8 @@ alice::"ip route add fec2:\:/16 via fec1:\:1"
 moon::"ip route add fec2:\:/16 via fec0:\:2"
 sun::"ip route add fec1:\:/16 via fec0:\:1"
 bob::"ip route add fec1:\:/16 via fec2:\:1"
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection net-net
 sun::expect-connection net-net
 moon::swanctl --initiate --child net-net 2> /dev/null

testing/tests/ipv6/net2net-ikev2/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 alice::"ip route del fec2:\:/16 via fec1:\:1"
 moon::"ip route del fec2:\:/16 via fec0:\:2"
 sun::"ip route del fec1:\:/16 via fec0:\:1"

testing/tests/ipv6/net2net-ikev2/pretest.dat

@@ -6,8 +6,8 @@ alice::"ip route add fec2:\:/16 via fec1:\:1"
 moon::"ip route add fec2:\:/16 via fec0:\:2"
 sun::"ip route add fec1:\:/16 via fec0:\:1"
 bob::"ip route add fec1:\:/16 via fec2:\:1"
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection net-net
 sun::expect-connection net-net
 moon::swanctl --initiate --child net-net

testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
 moon::ip6tables-restore < /etc/ip6tables.flush

testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/pretest.dat

@@ -2,8 +2,8 @@ moon::iptables-restore < /etc/iptables.drop
 sun::iptables-restore < /etc/iptables.drop
 moon::ip6tables-restore < /etc/ip6tables.rules
 sun::ip6tables-restore < /etc/ip6tables.rules
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection net-net
 sun::expect-connection net-net
 moon::swanctl --initiate --child net-net

testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
 moon::ip6tables-restore < /etc/ip6tables.flush

testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/pretest.dat

@@ -2,8 +2,8 @@ moon::iptables-restore < /etc/iptables.drop
 sun::iptables-restore < /etc/iptables.drop
 moon::ip6tables-restore < /etc/ip6tables.rules
 sun::ip6tables-restore < /etc/ip6tables.rules
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection net-net
 sun::expect-connection net-net
 moon::swanctl --initiate --child net-net

testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 alice::"ip route del fec2:\:/16 via fec1:\:1"
 moon::"ip route del fec2:\:/16 via fec0:\:2"
 sun::"ip route del fec1:\:/16 via fec0:\:1"

testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/pretest.dat

@@ -6,8 +6,8 @@ alice::"ip route add fec2:\:/16 via fec1:\:1"
 moon::"ip route add fec2:\:/16 via fec0:\:2"
 sun::"ip route add fec1:\:/16 via fec0:\:1"
 bob::"ip route add fec1:\:/16 via fec2:\:1"
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection net-net
 sun::expect-connection net-net
 moon::swanctl --initiate --child net-net

testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 alice::"ip route del fec2:\:/16 via fec1:\:1"
 moon::"ip route del fec2:\:/16 via fec0:\:2"
 sun::"ip route del fec1:\:/16 via fec0:\:1"

testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/pretest.dat

@@ -6,8 +6,8 @@ alice::"ip route add fec2:\:/16 via fec1:\:1"
 moon::"ip route add fec2:\:/16 via fec0:\:2"
 sun::"ip route add fec1:\:/16 via fec0:\:1"
 bob::"ip route add fec1:\:/16 via fec2:\:1"
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection net-net
 sun::expect-connection net-net
 moon::swanctl --initiate --child net-net

testing/tests/ipv6/net2net-rfc3779-ikev2/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 alice::"ip route del fec2:\:/16 via fec1:\:1"
 moon::"ip route del fec2:\:/16 via fec0:\:2"
 sun::"ip route del fec1:\:/16 via fec0:\:1"

testing/tests/ipv6/net2net-rfc3779-ikev2/pretest.dat

@@ -6,8 +6,8 @@ alice::"ip route add fec2:\:/16 via fec1:\:1"
 moon::"ip route add fec2:\:/16 via fec0:\:2"
 sun::"ip route add fec1:\:/16 via fec0:\:1"
 bob::"ip route add fec1:\:/16 via fec2:\:1"
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection net-net
 sun::expect-connection net-net
 moon::swanctl --initiate --child net-net

testing/tests/ipv6/rw-compress-ikev2/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-carol::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+carol::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 moon::ip6tables-restore < /etc/ip6tables.flush

testing/tests/ipv6/rw-compress-ikev2/pretest.dat

@@ -6,8 +6,8 @@ carol::ip6tables-restore < /etc/ip6tables.rules
 moon::ip6tables -I OUTPUT 1 -o eth1 -p icmpv6 --icmpv6-type 2 -j ACCEPT
 alice::"ip route add fec0:\:/16 via fec1:\:1"
 carol::"ip route add fec1:\:/16 via fec0:\:1"
-moon::systemctl start strongswan-swanctl
-carol::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+carol::systemctl start strongswan
 moon::expect-connection rw
 carol::expect-connection home
 carol::swanctl --initiate --child home

testing/tests/ipv6/rw-ikev1/posttest.dat

@@ -1,6 +1,6 @@
-moon::systemctl stop strongswan-swanctl
-carol::systemctl stop strongswan-swanctl
-dave::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+carol::systemctl stop strongswan
+dave::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush

testing/tests/ipv6/rw-ikev1/pretest.dat

@@ -7,9 +7,9 @@ dave::ip6tables-restore < /etc/ip6tables.rules
 alice::"ip route add fec0:\:/16 via fec1:\:1"
 carol::"ip route add fec1:\:/16 via fec0:\:1"
 dave::"ip route add fec1:\:/16 via fec0:\:1"
-moon::systemctl start strongswan-swanctl
-carol::systemctl start strongswan-swanctl
-dave::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+carol::systemctl start strongswan
+dave::systemctl start strongswan
 moon::expect-connection rw
 carol::expect-connection home
 dave::expect-connection home

testing/tests/ipv6/rw-ikev2/posttest.dat

@@ -1,6 +1,6 @@
-moon::systemctl stop strongswan-swanctl
-carol::systemctl stop strongswan-swanctl
-dave::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+carol::systemctl stop strongswan
+dave::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush

testing/tests/ipv6/rw-ikev2/pretest.dat

@@ -7,9 +7,9 @@ dave::ip6tables-restore < /etc/ip6tables.rules
 alice::"ip route add fec0:\:/16 via fec1:\:1"
 carol::"ip route add fec1:\:/16 via fec0:\:1"
 dave::"ip route add fec1:\:/16 via fec0:\:1"
-moon::systemctl start strongswan-swanctl
-carol::systemctl start strongswan-swanctl
-dave::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+carol::systemctl start strongswan
+dave::systemctl start strongswan
 moon::expect-connection rw
 carol::expect-connection home
 dave::expect-connection home

testing/tests/ipv6/rw-ip6-in-ip4-ikev1/posttest.dat

@@ -1,6 +1,6 @@
-moon::systemctl stop strongswan-swanctl
-carol::systemctl stop strongswan-swanctl
-dave::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+carol::systemctl stop strongswan
+dave::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush

testing/tests/ipv6/rw-ip6-in-ip4-ikev1/pretest.dat

@@ -5,9 +5,9 @@ moon::ip6tables-restore < /etc/ip6tables.rules
 carol::ip6tables-restore < /etc/ip6tables.rules
 dave::ip6tables-restore < /etc/ip6tables.rules
 alice::"ip route add fec3:\:/16 via fec1:\:1"
-moon::systemctl start strongswan-swanctl
-carol::systemctl start strongswan-swanctl
-dave::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+carol::systemctl start strongswan
+dave::systemctl start strongswan
 moon::expect-connection rw
 carol::expect-connection home
 dave::expect-connection home

testing/tests/ipv6/rw-ip6-in-ip4-ikev2/posttest.dat

@@ -1,6 +1,6 @@
-moon::systemctl stop strongswan-swanctl
-carol::systemctl stop strongswan-swanctl
-dave::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+carol::systemctl stop strongswan
+dave::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush

testing/tests/ipv6/rw-ip6-in-ip4-ikev2/pretest.dat

@@ -5,9 +5,9 @@ moon::ip6tables-restore < /etc/ip6tables.rules
 carol::ip6tables-restore < /etc/ip6tables.rules
 dave::ip6tables-restore < /etc/ip6tables.rules
 alice::"ip route add fec3:\:/16 via fec1:\:1"
-moon::systemctl start strongswan-swanctl
-carol::systemctl start strongswan-swanctl
-dave::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+carol::systemctl start strongswan
+dave::systemctl start strongswan
 moon::expect-connection rw
 carol::expect-connection home
 dave::expect-connection home

testing/tests/ipv6/rw-psk-ikev1/posttest.dat

@@ -1,6 +1,6 @@
-moon::systemctl stop strongswan-swanctl
-carol::systemctl stop strongswan-swanctl
-dave::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+carol::systemctl stop strongswan
+dave::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush

testing/tests/ipv6/rw-psk-ikev1/pretest.dat

@@ -10,9 +10,9 @@ dave::"ip route add fec1:\:/16 via fec0:\:1"
 moon::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
 carol::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
 dave::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
-moon::systemctl start strongswan-swanctl
-carol::systemctl start strongswan-swanctl
-dave::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+carol::systemctl start strongswan
+dave::systemctl start strongswan
 moon::expect-connection rw
 carol::expect-connection home
 dave::expect-connection home

testing/tests/ipv6/rw-psk-ikev2/posttest.dat

@@ -1,6 +1,6 @@
-moon::systemctl stop strongswan-swanctl
-carol::systemctl stop strongswan-swanctl
-dave::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+carol::systemctl stop strongswan
+dave::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush

testing/tests/ipv6/rw-psk-ikev2/pretest.dat

@@ -10,9 +10,9 @@ dave::"ip route add fec1:\:/16 via fec0:\:1"
 moon::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
 carol::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
 dave::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
-moon::systemctl start strongswan-swanctl
-carol::systemctl start strongswan-swanctl
-dave::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+carol::systemctl start strongswan
+dave::systemctl start strongswan
 moon::expect-connection rw
 carol::expect-connection home
 dave::expect-connection home

testing/tests/ipv6/rw-rfc3779-ikev2/posttest.dat

@@ -1,6 +1,6 @@
-moon::systemctl stop strongswan-swanctl
-carol::systemctl stop strongswan-swanctl
-dave::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+carol::systemctl stop strongswan
+dave::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 carol::iptables-restore < /etc/iptables.flush
 dave::iptables-restore < /etc/iptables.flush

testing/tests/ipv6/rw-rfc3779-ikev2/pretest.dat

@@ -7,9 +7,9 @@ dave::ip6tables-restore < /etc/ip6tables.rules
 alice::"ip route add fec0:\:/16 via fec1:\:1"
 carol::"ip route add fec1:\:/16 via fec0:\:1"
 dave::"ip route add fec1:\:/16 via fec0:\:1"
-moon::systemctl start strongswan-swanctl
-carol::systemctl start strongswan-swanctl
-dave::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+carol::systemctl start strongswan
+dave::systemctl start strongswan
 moon::expect-connection rw
 carol::expect-connection home
 dave::expect-connection home

testing/tests/ipv6/transport-ikev1/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
 moon::ip6tables-restore < /etc/ip6tables.flush

testing/tests/ipv6/transport-ikev1/pretest.dat

@@ -2,8 +2,8 @@ moon::iptables-restore < /etc/iptables.drop
 sun::iptables-restore < /etc/iptables.drop
 moon::ip6tables-restore < /etc/ip6tables.rules
 sun::ip6tables-restore < /etc/ip6tables.rules
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection host-host
 sun::expect-connection host-host
 moon::swanctl --initiate --child host-host 2> /dev/null

testing/tests/ipv6/transport-ikev2/posttest.dat

@@ -1,5 +1,5 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 moon::iptables-restore < /etc/iptables.flush
 sun::iptables-restore < /etc/iptables.flush
 moon::ip6tables-restore < /etc/ip6tables.flush

testing/tests/ipv6/transport-ikev2/pretest.dat

@@ -2,8 +2,8 @@ moon::iptables-restore < /etc/iptables.drop
 sun::iptables-restore < /etc/iptables.drop
 moon::ip6tables-restore < /etc/ip6tables.rules
 sun::ip6tables-restore < /etc/ip6tables.rules
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection host-host
 sun::expect-connection host-host
 moon::swanctl --initiate --child host-host