some scenario fixes

diff --git a/testing/tests/ikev2/config-payload-swapped/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/config-payload-swapped/hosts/moon/etc/ipsec.conf
index 8458724..2226737 100755 (executable)
--- a/testing/tests/ikev2/config-payload-swapped/hosts/moon/etc/ipsec.conf
+++ b/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
        keyexchange=ikev2
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16

-       rightsourceip=PH_IP_MOON1

        rightcert=moonCert.pem
        rightid=@moon.strongswan.org
        rightfirewall=yes
        rightcert=moonCert.pem
        rightid=@moon.strongswan.org
        rightfirewall=yes

diff --git a/testing/tests/ikev2/config-payload/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/config-payload/hosts/moon/etc/ipsec.conf
index bafd1b1..bb558fe 100755 (executable)
--- a/testing/tests/ikev2/config-payload/hosts/moon/etc/ipsec.conf
+++ b/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
        keyexchange=ikev2
        left=PH_IP_MOON
        leftsubnet=10.1.0.0/16

-       leftsourceip=PH_IP_MOON1

        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
        leftfirewall=yes
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
        leftfirewall=yes

diff --git a/testing/tests/ikev2/mobike-nat/hosts/alice/etc/ipsec.conf b/testing/tests/ikev2/mobike-nat/hosts/alice/etc/ipsec.conf
index e9abfda..5c93d14 100755 (executable)
--- a/testing/tests/ikev2/mobike-nat/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/ikev2/mobike-nat/hosts/alice/etc/ipsec.conf
@@ -14,7 +14,7 @@ conn %default
 
 conn mobike
        left=PH_IP_ALICE1
 
 conn mobike
        left=PH_IP_ALICE1

-       leftsourceip=10.3.0.3
+       leftsourceip=%config

        leftcert=aliceCert.pem
        leftid=alice@strongswan.org
        leftfirewall=yes
        leftcert=aliceCert.pem
        leftid=alice@strongswan.org
        leftfirewall=yes

diff --git a/testing/tests/ikev2/mobike-nat/hosts/sun/etc/ipsec.conf b/testing/tests/ikev2/mobike-nat/hosts/sun/etc/ipsec.conf
index 6944749..d612151 100755 (executable)
--- a/testing/tests/ikev2/mobike-nat/hosts/sun/etc/ipsec.conf
+++ b/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
        leftfirewall=yes
        leftsubnet=10.2.0.0/16
        right=%any

-       rightsourceip=%config
+       rightsourceip=10.3.0.3

        rightid=alice@strongswan.org
        auto=add
        rightid=alice@strongswan.org
        auto=add

diff --git a/testing/tests/ikev2/mobike-virtual-ip/hosts/alice/etc/ipsec.conf b/testing/tests/ikev2/mobike-virtual-ip/hosts/alice/etc/ipsec.conf
index e9abfda..5c93d14 100755 (executable)
--- a/testing/tests/ikev2/mobike-virtual-ip/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/ikev2/mobike-virtual-ip/hosts/alice/etc/ipsec.conf
@@ -14,7 +14,7 @@ conn %default
 
 conn mobike
        left=PH_IP_ALICE1
 
 conn mobike
        left=PH_IP_ALICE1

-       leftsourceip=10.3.0.3
+       leftsourceip=%config

        leftcert=aliceCert.pem
        leftid=alice@strongswan.org
        leftfirewall=yes
        leftcert=aliceCert.pem
        leftid=alice@strongswan.org
        leftfirewall=yes

diff --git a/testing/tests/ikev2/mobike-virtual-ip/hosts/sun/etc/ipsec.conf b/testing/tests/ikev2/mobike-virtual-ip/hosts/sun/etc/ipsec.conf
index 64a659f..18a67cd 100755 (executable)
--- a/testing/tests/ikev2/mobike-virtual-ip/hosts/sun/etc/ipsec.conf
+++ b/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
        leftfirewall=yes
        leftsubnet=10.2.0.0/16
        right=PH_IP_ALICE1

-       rightsourceip=%config
+       rightsourceip=10.3.0.3

        rightid=alice@strongswan.org
        auto=add
        rightid=alice@strongswan.org
        auto=add