LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test IP version and encap type set in non-auto IP selection mode

Browse Source 
Test: atest FrameworksNetTests
Change-Id: I8f4a54f7b35135806c940b5cee2c600f4454f2fb
This commit is contained in:
chiachangwang
2023-03-11 07:21:30 +00:00
parent 55dc7b6e9f
commit e1aacc797c
1 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
tests/unit/java/com/android/server/connectivity/VpnTest.java
View File

@@ -1955,43 +1955,54 @@ public class VpnTest extends VpnTestBase {
} }
@Test @Test
public void testMigrateIkeSession_FromIkeTunnConnParams_AutoTimerNoTimer() public void testMigrateIkeSession_FromIkeTunnConnParams_AutoTimerNoTimer() throws Exception {
throws Exception {
doTestMigrateIkeSession_FromIkeTunnConnParams( doTestMigrateIkeSession_FromIkeTunnConnParams(
false /* isAutomaticIpVersionSelectionEnabled */, false /* isAutomaticIpVersionSelectionEnabled */,
true /* isAutomaticNattKeepaliveTimerEnabled */, true /* isAutomaticNattKeepaliveTimerEnabled */,
TEST_KEEPALIVE_TIMEOUT_UNSET); TEST_KEEPALIVE_TIMEOUT_UNSET /* keepaliveInProfile */,
ESP_IP_VERSION_AUTO /* ipVersionInProfile */,
ESP_ENCAP_TYPE_AUTO /* encapTypeInProfile */);
} }
@Test @Test
public void testMigrateIkeSession_FromIkeTunnConnParams_AutoTimerTimerSet() public void testMigrateIkeSession_FromIkeTunnConnParams_AutoTimerTimerSet() throws Exception {
throws Exception {
doTestMigrateIkeSession_FromIkeTunnConnParams( doTestMigrateIkeSession_FromIkeTunnConnParams(
false /* isAutomaticIpVersionSelectionEnabled */, false /* isAutomaticIpVersionSelectionEnabled */,
true /* isAutomaticNattKeepaliveTimerEnabled */, true /* isAutomaticNattKeepaliveTimerEnabled */,
TEST_KEEPALIVE_TIMER); TEST_KEEPALIVE_TIMER /* keepaliveInProfile */,
ESP_IP_VERSION_AUTO /* ipVersionInProfile */,
ESP_ENCAP_TYPE_AUTO /* encapTypeInProfile */);
} }
@Test @Test
public void testMigrateIkeSession_FromIkeTunnConnParams_AutoIp() public void testMigrateIkeSession_FromIkeTunnConnParams_AutoIp() throws Exception {
throws Exception {
doTestMigrateIkeSession_FromIkeTunnConnParams( doTestMigrateIkeSession_FromIkeTunnConnParams(
true /* isAutomaticIpVersionSelectionEnabled */, true /* isAutomaticIpVersionSelectionEnabled */,
false /* isAutomaticNattKeepaliveTimerEnabled */, false /* isAutomaticNattKeepaliveTimerEnabled */,
TEST_KEEPALIVE_TIMEOUT_UNSET); TEST_KEEPALIVE_TIMEOUT_UNSET /* keepaliveInProfile */,
ESP_IP_VERSION_AUTO /* ipVersionInProfile */,
ESP_ENCAP_TYPE_AUTO /* encapTypeInProfile */);
} }
@Test @Test
public void testMigrateIkeSession_FromNotIkeTunnConnParams_AutoTimer() public void testMigrateIkeSession_FromIkeTunnConnParams_AssignedIpProtocol() throws Exception {
throws Exception { doTestMigrateIkeSession_FromIkeTunnConnParams(
false /* isAutomaticIpVersionSelectionEnabled */,
false /* isAutomaticNattKeepaliveTimerEnabled */,
TEST_KEEPALIVE_TIMEOUT_UNSET /* keepaliveInProfile */,
ESP_IP_VERSION_IPV4 /* ipVersionInProfile */,
ESP_ENCAP_TYPE_UDP /* encapTypeInProfile */);
}
@Test
public void testMigrateIkeSession_FromNotIkeTunnConnParams_AutoTimer() throws Exception {
doTestMigrateIkeSession_FromNotIkeTunnConnParams( doTestMigrateIkeSession_FromNotIkeTunnConnParams(
false /* isAutomaticIpVersionSelectionEnabled */, false /* isAutomaticIpVersionSelectionEnabled */,
true /* isAutomaticNattKeepaliveTimerEnabled */); true /* isAutomaticNattKeepaliveTimerEnabled */);
} }
@Test @Test
public void testMigrateIkeSession_FromNotIkeTunnConnParams_AutoIp() public void testMigrateIkeSession_FromNotIkeTunnConnParams_AutoIp() throws Exception {
throws Exception {
doTestMigrateIkeSession_FromNotIkeTunnConnParams( doTestMigrateIkeSession_FromNotIkeTunnConnParams(
true /* isAutomaticIpVersionSelectionEnabled */, true /* isAutomaticIpVersionSelectionEnabled */,
false /* isAutomaticNattKeepaliveTimerEnabled */); false /* isAutomaticNattKeepaliveTimerEnabled */);
@@ -2011,16 +2022,27 @@ public class VpnTest extends VpnTestBase {
final int expectedKeepalive = isAutomaticNattKeepaliveTimerEnabled final int expectedKeepalive = isAutomaticNattKeepaliveTimerEnabled
? AUTOMATIC_KEEPALIVE_DELAY_SECONDS ? AUTOMATIC_KEEPALIVE_DELAY_SECONDS
: DEFAULT_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT; : DEFAULT_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT;
doTestMigrateIkeSession(ikeProfile.toVpnProfile(), expectedKeepalive, doTestMigrateIkeSession(ikeProfile.toVpnProfile(),
isAutomaticIpVersionSelectionEnabled); expectedKeepalive,
ESP_IP_VERSION_AUTO /* expectedIpVersion */,
ESP_ENCAP_TYPE_AUTO /* expectedEncapType */);
} }
private void doTestMigrateIkeSession_FromIkeTunnConnParams( private void doTestMigrateIkeSession_FromIkeTunnConnParams(
boolean isAutomaticIpVersionSelectionEnabled, boolean isAutomaticIpVersionSelectionEnabled,
boolean isAutomaticNattKeepaliveTimerEnabled, boolean isAutomaticNattKeepaliveTimerEnabled,
int keepaliveInProfile) throws Exception { int keepaliveInProfile,
final IkeSessionParams ikeSessionParams = getTestIkeSessionParams(true /* testIpv6 */, int ipVersionInProfile,
int encapTypeInProfile) throws Exception {
// TODO: Update helper function in IkeSessionTestUtils to support building IkeSessionParams
// with IP version and encap type when mainline-prod branch support these two APIs.
final IkeSessionParams params = getTestIkeSessionParams(true /* testIpv6 */,
new IkeFqdnIdentification(TEST_IDENTITY), keepaliveInProfile); new IkeFqdnIdentification(TEST_IDENTITY), keepaliveInProfile);
final IkeSessionParams ikeSessionParams = new IkeSessionParams.Builder(params)
.setIpVersion(ipVersionInProfile)
.setEncapType(encapTypeInProfile)
.build();
final IkeTunnelConnectionParams tunnelParams = final IkeTunnelConnectionParams tunnelParams =
new IkeTunnelConnectionParams(ikeSessionParams, CHILD_PARAMS); new IkeTunnelConnectionParams(ikeSessionParams, CHILD_PARAMS);
final Ikev2VpnProfile ikeProfile = new Ikev2VpnProfile.Builder(tunnelParams) final Ikev2VpnProfile ikeProfile = new Ikev2VpnProfile.Builder(tunnelParams)
@@ -2032,17 +2054,18 @@ public class VpnTest extends VpnTestBase {
final int expectedKeepalive = isAutomaticNattKeepaliveTimerEnabled final int expectedKeepalive = isAutomaticNattKeepaliveTimerEnabled
? AUTOMATIC_KEEPALIVE_DELAY_SECONDS ? AUTOMATIC_KEEPALIVE_DELAY_SECONDS
: ikeSessionParams.getNattKeepAliveDelaySeconds(); : ikeSessionParams.getNattKeepAliveDelaySeconds();
final int expectedIpVersion = isAutomaticIpVersionSelectionEnabled
? ESP_IP_VERSION_AUTO
: ikeSessionParams.getIpVersion();
final int expectedEncapType = isAutomaticIpVersionSelectionEnabled
? ESP_ENCAP_TYPE_AUTO
: ikeSessionParams.getEncapType();
doTestMigrateIkeSession(ikeProfile.toVpnProfile(), expectedKeepalive, doTestMigrateIkeSession(ikeProfile.toVpnProfile(), expectedKeepalive,
isAutomaticIpVersionSelectionEnabled); expectedIpVersion, expectedEncapType);
} }
private void doTestMigrateIkeSession(VpnProfile profile, int expectedKeepalive, private void doTestMigrateIkeSession(VpnProfile profile,
boolean isAutomaticIpVersionSelectionEnabled) throws Exception { int expectedKeepalive, int expectedIpVersion, int expectedEncapType) throws Exception {
final int expectedIpVersion = isAutomaticIpVersionSelectionEnabled
? ESP_IP_VERSION_AUTO : ESP_IP_VERSION_AUTO;
final int expectedEncapType = isAutomaticIpVersionSelectionEnabled
? ESP_ENCAP_TYPE_AUTO : ESP_IP_VERSION_AUTO;
final PlatformVpnSnapshot vpnSnapShot = final PlatformVpnSnapshot vpnSnapShot =
verifySetupPlatformVpn(profile, verifySetupPlatformVpn(profile,
createIkeConfig(createIkeConnectInfo(), true /* isMobikeEnabled */), createIkeConfig(createIkeConnectInfo(), true /* isMobikeEnabled */),