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

Verify no migration started without valid network capabilties

Browse Source 
Bug: 269714970
Test: atest FrameworksNetTests
Change-Id: I0f1a8cbdcb0a8a102036388b39162dca775c3f5d
This commit is contained in:
chiachangwang
2023-03-07 06:33:33 +00:00
parent 3a91e2d4f6
commit 334b8dba3a
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2039,7 +2039,10 @@ public class VpnTest extends VpnTestBase {
false /* mtuSupportsIpv6 */); false /* mtuSupportsIpv6 */);
// Simulate a new network coming up // Simulate a new network coming up
vpnSnapShot.nwCb.onAvailable(TEST_NETWORK_2); vpnSnapShot.nwCb.onAvailable(TEST_NETWORK_2);
verify(mIkeSessionWrapper, never()).setNetwork(any(), anyInt(), anyInt(), anyInt());
vpnSnapShot.nwCb.onCapabilitiesChanged(
TEST_NETWORK_2, new NetworkCapabilities.Builder().build());
// Verify MOBIKE is triggered // Verify MOBIKE is triggered
verify(mIkeSessionWrapper).setNetwork(TEST_NETWORK_2, verify(mIkeSessionWrapper).setNetwork(TEST_NETWORK_2,
expectedIpVersion, expectedEncapType, expectedKeepalive); expectedIpVersion, expectedEncapType, expectedKeepalive);
@@ -2124,11 +2127,8 @@ public class VpnTest extends VpnTestBase {
// Simulate a new network coming up // Simulate a new network coming up
vpnSnapShot.nwCb.onAvailable(TEST_NETWORK_2); vpnSnapShot.nwCb.onAvailable(TEST_NETWORK_2);
// guessNattKeepaliveTimerForNetwork() will return AUTOMATIC_KEEPALIVE_DELAY_SECONDS // Migration will not be started until receiving network capabilities change.
// because mUnderlyingNetworkCapabilities is not set at the moment. verify(mIkeSessionWrapper, never()).setNetwork(any(), anyInt(), anyInt(), anyInt());
// TODO: Fix it to prevent setNetwork() being triggered w/o valid network capabilities.
verify(mIkeSessionWrapper).setNetwork(TEST_NETWORK_2,
ESP_IP_VERSION_AUTO, ESP_ENCAP_TYPE_AUTO, AUTOMATIC_KEEPALIVE_DELAY_SECONDS);
reset(mIkeSessionWrapper); reset(mIkeSessionWrapper);
mockCarrierConfig(TEST_SUB_ID, TEST_KEEPALIVE_TIMER, simState); mockCarrierConfig(TEST_SUB_ID, TEST_KEEPALIVE_TIMER, simState);
@@ -2171,7 +2171,10 @@ public class VpnTest extends VpnTestBase {
// Mock new network comes up and the cleanup task is cancelled // Mock new network comes up and the cleanup task is cancelled
vpnSnapShot.nwCb.onAvailable(TEST_NETWORK_2); vpnSnapShot.nwCb.onAvailable(TEST_NETWORK_2);
verify(mScheduledFuture).cancel(anyBoolean()); verify(mScheduledFuture).cancel(anyBoolean());
verify(mIkeSessionWrapper, never()).setNetwork(any(), anyInt(), anyInt(), anyInt());
vpnSnapShot.nwCb.onCapabilitiesChanged(TEST_NETWORK_2,
new NetworkCapabilities.Builder().build());
// Verify MOBIKE is triggered // Verify MOBIKE is triggered
verify(mIkeSessionWrapper).setNetwork(eq(TEST_NETWORK_2), verify(mIkeSessionWrapper).setNetwork(eq(TEST_NETWORK_2),
eq(ESP_IP_VERSION_AUTO) /* ipVersion */, eq(ESP_IP_VERSION_AUTO) /* ipVersion */,
@@ -2266,7 +2269,11 @@ public class VpnTest extends VpnTestBase {
// Mock network switch // Mock network switch
vpnSnapShot.nwCb.onLost(TEST_NETWORK); vpnSnapShot.nwCb.onLost(TEST_NETWORK);
vpnSnapShot.nwCb.onAvailable(TEST_NETWORK_2); vpnSnapShot.nwCb.onAvailable(TEST_NETWORK_2);
// The old IKE Session will not be killed until receiving network capabilities change.
verify(mIkeSessionWrapper, never()).kill();
vpnSnapShot.nwCb.onCapabilitiesChanged(
TEST_NETWORK_2, new NetworkCapabilities.Builder().build());
// Verify the old IKE Session is killed // Verify the old IKE Session is killed
verify(mIkeSessionWrapper).kill(); verify(mIkeSessionWrapper).kill();