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/openssl-ikev2/alg-camellia/posttest.dat

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

testing/tests/openssl-ikev2/alg-camellia/pretest.dat

@@ -1,7 +1,7 @@
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
-moon::systemctl start strongswan-swanctl
-carol::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+carol::systemctl start strongswan
 moon::expect-connection net
 carol::expect-connection home
 carol::swanctl --initiate --child home 2> /dev/null

testing/tests/openssl-ikev2/alg-ecp-brainpool-high/posttest.dat

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

testing/tests/openssl-ikev2/alg-ecp-brainpool-high/pretest.dat

@@ -1,9 +1,9 @@
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
-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
 carol::swanctl --initiate --child home 2> /dev/null

testing/tests/openssl-ikev2/alg-ecp-brainpool-low/posttest.dat

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

testing/tests/openssl-ikev2/alg-ecp-brainpool-low/pretest.dat

@@ -1,9 +1,9 @@
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
-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
 carol::swanctl --initiate --child home 2> /dev/null

testing/tests/openssl-ikev2/alg-ecp-high/posttest.dat

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

testing/tests/openssl-ikev2/alg-ecp-high/pretest.dat

@@ -1,9 +1,9 @@
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
-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
 carol::swanctl --initiate --child home 2> /dev/null

testing/tests/openssl-ikev2/alg-ecp-low/posttest.dat

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

testing/tests/openssl-ikev2/alg-ecp-low/pretest.dat

@@ -1,9 +1,9 @@
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
-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
 carol::swanctl --initiate --child home 2> /dev/null

testing/tests/openssl-ikev2/critical-extension/posttest.dat

@@ -1,4 +1,4 @@
-moon::systemctl stop strongswan-swanctl
-sun::systemctl stop strongswan-swanctl
+moon::systemctl stop strongswan
+sun::systemctl stop strongswan
 moon::rm /etc/swanctl/x509/moonCert.der
 sun::rm /etc/swanctl/x509/sunCert.der

testing/tests/openssl-ikev2/critical-extension/pretest.dat

@@ -1,7 +1,7 @@
 moon::rm /etc/swanctl/x509/moonCert.pem
 sun::rm /etc/swanctl/x509/sunCert.pem
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection gw-gw
 sun::expect-connection gw-gw
 moon::swanctl --initiate --child net-net 2> /dev/null

testing/tests/openssl-ikev2/ecdsa-certs/posttest.dat

@@ -1,8 +1,8 @@
 carol::swanctl --terminate --ike home
 dave::swanctl --terminate --ike home
-carol::systemctl stop strongswan-swanctl
-dave::systemctl stop strongswan-swanctl
-moon::systemctl stop strongswan-swanctl
+carol::systemctl stop strongswan
+dave::systemctl stop strongswan
+moon::systemctl stop strongswan
 carol::rm /etc/swanctl/ecdsa/carolKey.pem
 dave::rm /etc/swanctl/ecdsa/daveKey.pem
 moon::rm /etc/swanctl/ecdsa/moonKey.pem

testing/tests/openssl-ikev2/ecdsa-certs/pretest.dat

@@ -4,9 +4,9 @@ dave::iptables-restore < /etc/iptables.rules
 carol::rm /etc/swanctl/rsa/carolKey.pem
 dave::rm /etc/swanctl/rsa/daveKey.pem
 moon::rm /etc/swanctl/rsa/moonKey.pem
-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
 carol::swanctl --initiate --child home 2> /dev/null

testing/tests/openssl-ikev2/ecdsa-pkcs8/posttest.dat

@@ -1,8 +1,8 @@
 carol::swanctl --terminate --ike home
 dave::swanctl --terminate --ike home
-carol::systemctl stop strongswan-swanctl
-dave::systemctl stop strongswan-swanctl
-moon::systemctl stop strongswan-swanctl
+carol::systemctl stop strongswan
+dave::systemctl stop strongswan
+moon::systemctl stop strongswan
 carol::rm /etc/swanctl/pkcs8/carolKey.pem
 dave::rm /etc/swanctl/pkcs8/daveKey.pem
 moon::rm /etc/swanctl/ecdsa/moonKey.pem

testing/tests/openssl-ikev2/ecdsa-pkcs8/pretest.dat

@@ -4,9 +4,9 @@ dave::iptables-restore < /etc/iptables.rules
 carol::rm /etc/swanctl/rsa/carolKey.pem
 dave::rm /etc/swanctl/rsa/daveKey.pem
 moon::rm /etc/swanctl/rsa/moonKey.pem
-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
 carol::swanctl --initiate --child home 2> /dev/null

testing/tests/openssl-ikev2/net2net-pkcs12/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::rm /etc/swanctl/pkcs12/moonCert.p12

testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat

@@ -2,8 +2,8 @@ moon::cd /etc/swanctl; rm rsa/moonKey.pem x509/moonCert.pem x509ca/strongswanCer
 sun::cd /etc/swanctl; rm rsa/sunKey.pem x509/sunCert.pem x509ca/strongswanCert.pem
 moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
-moon::systemctl start strongswan-swanctl
-sun::systemctl start strongswan-swanctl
+moon::systemctl start strongswan
+sun::systemctl start strongswan
 moon::expect-connection gw-gw
 sun::expect-connection gw-gw
 moon::swanctl --initiate --child net-net 2> /dev/null

testing/tests/openssl-ikev2/rw-cert/posttest.dat

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

testing/tests/openssl-ikev2/rw-cert/pretest.dat

@@ -1,9 +1,9 @@
 mmoon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
-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
 carol::swanctl --initiate --child home 2> /dev/null