some scenario fixes

testing/tests/ikev2/config-payload-swapped/hosts/moon/etc/ipsec.conf

@@ -13,7 +13,6 @@ conn %default
 	keyexchange=ikev2
 	right=PH_IP_MOON
 	rightsubnet=10.1.0.0/16
-	rightsourceip=PH_IP_MOON1
 	rightcert=moonCert.pem
 	[email protected]
 	rightfirewall=yes

testing/tests/ikev2/config-payload/hosts/moon/etc/ipsec.conf

@@ -13,7 +13,6 @@ conn %default
 	keyexchange=ikev2
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
-	leftsourceip=PH_IP_MOON1
 	leftcert=moonCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev2/mobike-nat/hosts/alice/etc/ipsec.conf

@@ -14,7 +14,7 @@ conn %default
 
 conn mobike
 	left=PH_IP_ALICE1
-	leftsourceip=10.3.0.3
+	leftsourceip=%config
 	leftcert=aliceCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev2/mobike-nat/hosts/sun/etc/ipsec.conf

@@ -19,6 +19,6 @@ conn mobike
 	leftfirewall=yes
 	leftsubnet=10.2.0.0/16
 	right=%any
-	rightsourceip=%config
+	rightsourceip=10.3.0.3
 	[email protected]
 	auto=add

testing/tests/ikev2/mobike-virtual-ip/hosts/alice/etc/ipsec.conf

@@ -14,7 +14,7 @@ conn %default
 
 conn mobike
 	left=PH_IP_ALICE1
-	leftsourceip=10.3.0.3
+	leftsourceip=%config
 	leftcert=aliceCert.pem
 	[email protected]
 	leftfirewall=yes

testing/tests/ikev2/mobike-virtual-ip/hosts/sun/etc/ipsec.conf

@@ -19,6 +19,6 @@ conn mobike
 	leftfirewall=yes
 	leftsubnet=10.2.0.0/16
 	right=PH_IP_ALICE1
-	rightsourceip=%config
+	rightsourceip=10.3.0.3
 	[email protected]
 	auto=add