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

Merge changes from topic "cs-generalize-underlying-networks" am: 678d27faca

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1526361

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5815ada76edd5d34c8cb8a184e7b1bc59fee005
This commit is contained in:
Lorenzo Colitti
2020-12-14 05:59:51 +00:00
committed by Automerger Merge Worker
parent 06513c4cd2 678d27faca
commit 7c822d82b7
1 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
View File

@@ -18,6 +18,8 @@ package android.net.cts
import android.app.Instrumentation import android.app.Instrumentation
import android.content.Context import android.content.Context
import android.net.ConnectivityManager import android.net.ConnectivityManager
import android.net.InetAddresses
import android.net.IpPrefix
import android.net.KeepalivePacketData import android.net.KeepalivePacketData
import android.net.LinkAddress import android.net.LinkAddress
import android.net.LinkProperties import android.net.LinkProperties
@@ -34,9 +36,20 @@ import android.net.NetworkAgent.INVALID_NETWORK
import android.net.NetworkAgent.VALID_NETWORK import android.net.NetworkAgent.VALID_NETWORK
import android.net.NetworkAgentConfig import android.net.NetworkAgentConfig
import android.net.NetworkCapabilities import android.net.NetworkCapabilities
import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET
import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED
import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED
import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING
import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED
import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN
import android.net.NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED
import android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED
import android.net.NetworkCapabilities.TRANSPORT_TEST
import android.net.NetworkCapabilities.TRANSPORT_VPN
import android.net.NetworkInfo import android.net.NetworkInfo
import android.net.NetworkProvider import android.net.NetworkProvider
import android.net.NetworkRequest import android.net.NetworkRequest
import android.net.RouteInfo
import android.net.SocketKeepalive import android.net.SocketKeepalive
import android.net.StringNetworkSpecifier import android.net.StringNetworkSpecifier
import android.net.Uri import android.net.Uri
@@ -81,7 +94,6 @@ import org.mockito.ArgumentMatchers.eq
import org.mockito.Mockito.doReturn import org.mockito.Mockito.doReturn
import org.mockito.Mockito.mock import org.mockito.Mockito.mock
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import java.net.InetAddress
import java.time.Duration import java.time.Duration
import java.util.Arrays import java.util.Arrays
import java.util.UUID import java.util.UUID
@@ -123,8 +135,8 @@ class NetworkAgentTest {
@Rule @JvmField @Rule @JvmField
val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = Build.VERSION_CODES.Q) val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = Build.VERSION_CODES.Q)
private val LOCAL_IPV4_ADDRESS = InetAddress.parseNumericAddress("192.0.2.1") private val LOCAL_IPV4_ADDRESS = InetAddresses.parseNumericAddress("192.0.2.1")
private val REMOTE_IPV4_ADDRESS = InetAddress.parseNumericAddress("192.0.2.2") private val REMOTE_IPV4_ADDRESS = InetAddresses.parseNumericAddress("192.0.2.2")
private val mCM = realContext.getSystemService(ConnectivityManager::class.java) private val mCM = realContext.getSystemService(ConnectivityManager::class.java)
private val mHandlerThread = HandlerThread("${javaClass.simpleName} handler thread") private val mHandlerThread = HandlerThread("${javaClass.simpleName} handler thread")
@@ -319,18 +331,19 @@ class NetworkAgentTest {
initialLp: LinkProperties? = null initialLp: LinkProperties? = null
): TestableNetworkAgent { ): TestableNetworkAgent {
val nc = initialNc ?: NetworkCapabilities().apply { val nc = initialNc ?: NetworkCapabilities().apply {
addTransportType(NetworkCapabilities.TRANSPORT_TEST) addTransportType(TRANSPORT_TEST)
removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED) removeCapability(NET_CAPABILITY_TRUSTED)
removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) removeCapability(NET_CAPABILITY_INTERNET)
addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED) addCapability(NET_CAPABILITY_NOT_SUSPENDED)
addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING) addCapability(NET_CAPABILITY_NOT_ROAMING)
addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) addCapability(NET_CAPABILITY_NOT_VPN)
if (null != name) { if (null != name) {
setNetworkSpecifier(StringNetworkSpecifier(name)) setNetworkSpecifier(StringNetworkSpecifier(name))
} }
} }
val lp = initialLp ?: LinkProperties().apply { val lp = initialLp ?: LinkProperties().apply {
addLinkAddress(LinkAddress(LOCAL_IPV4_ADDRESS, 0)) addLinkAddress(LinkAddress(LOCAL_IPV4_ADDRESS, 32))
addRoute(RouteInfo(IpPrefix("0.0.0.0/0"), null, null))
} }
val config = NetworkAgentConfig.Builder().build() val config = NetworkAgentConfig.Builder().build()
return TestableNetworkAgent(context, mHandlerThread.looper, nc, lp, config).also { return TestableNetworkAgent(context, mHandlerThread.looper, nc, lp, config).also {
@@ -342,7 +355,7 @@ class NetworkAgentTest {
Pair<TestableNetworkAgent, TestableNetworkCallback> { Pair<TestableNetworkAgent, TestableNetworkCallback> {
val request: NetworkRequest = NetworkRequest.Builder() val request: NetworkRequest = NetworkRequest.Builder()
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.build() .build()
val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS) val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
requestNetwork(request, callback) requestNetwork(request, callback)
@@ -387,7 +400,7 @@ class NetworkAgentTest {
val callbacks = thresholds.map { strength -> val callbacks = thresholds.map { strength ->
val request = NetworkRequest.Builder() val request = NetworkRequest.Builder()
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.setSignalStrength(strength) .setSignalStrength(strength)
.build() .build()
TestableNetworkCallback(DEFAULT_TIMEOUT_MS).also { TestableNetworkCallback(DEFAULT_TIMEOUT_MS).also {
@@ -487,10 +500,10 @@ class NetworkAgentTest {
it.getInterfaceName() == ifaceName it.getInterfaceName() == ifaceName
} }
val nc = NetworkCapabilities(agent.nc) val nc = NetworkCapabilities(agent.nc)
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED) nc.addCapability(NET_CAPABILITY_NOT_METERED)
agent.sendNetworkCapabilities(nc) agent.sendNetworkCapabilities(nc)
callback.expectCapabilitiesThat(agent.network) { callback.expectCapabilitiesThat(agent.network) {
it.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED) it.hasCapability(NET_CAPABILITY_NOT_METERED)
} }
} }
@@ -504,12 +517,12 @@ class NetworkAgentTest {
val name2 = UUID.randomUUID().toString() val name2 = UUID.randomUUID().toString()
val request1 = NetworkRequest.Builder() val request1 = NetworkRequest.Builder()
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.setNetworkSpecifier(StringNetworkSpecifier(name1)) .setNetworkSpecifier(StringNetworkSpecifier(name1))
.build() .build()
val request2 = NetworkRequest.Builder() val request2 = NetworkRequest.Builder()
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.setNetworkSpecifier(StringNetworkSpecifier(name2)) .setNetworkSpecifier(StringNetworkSpecifier(name2))
.build() .build()
val callback1 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS) val callback1 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
@@ -520,7 +533,7 @@ class NetworkAgentTest {
// Then file the interesting request // Then file the interesting request
val request = NetworkRequest.Builder() val request = NetworkRequest.Builder()
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.build() .build()
val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS) val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
requestNetwork(request, callback) requestNetwork(request, callback)
@@ -552,18 +565,18 @@ class NetworkAgentTest {
@IgnoreUpTo(Build.VERSION_CODES.R) @IgnoreUpTo(Build.VERSION_CODES.R)
fun testSetUnderlyingNetworks() { fun testSetUnderlyingNetworks() {
val request = NetworkRequest.Builder() val request = NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.addTransportType(NetworkCapabilities.TRANSPORT_VPN) .addTransportType(TRANSPORT_VPN)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) .removeCapability(NET_CAPABILITY_NOT_VPN)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED) // TODO: add to VPN! .removeCapability(NET_CAPABILITY_TRUSTED) // TODO: add to VPN!
.build() .build()
val callback = TestableNetworkCallback() val callback = TestableNetworkCallback()
registerNetworkCallback(request, callback) registerNetworkCallback(request, callback)
val nc = NetworkCapabilities().apply { val nc = NetworkCapabilities().apply {
addTransportType(NetworkCapabilities.TRANSPORT_TEST) addTransportType(TRANSPORT_TEST)
addTransportType(NetworkCapabilities.TRANSPORT_VPN) addTransportType(TRANSPORT_VPN)
removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) removeCapability(NET_CAPABILITY_NOT_VPN)
} }
val defaultNetwork = mCM.activeNetwork val defaultNetwork = mCM.activeNetwork
assertNotNull(defaultNetwork) assertNotNull(defaultNetwork)
@@ -578,8 +591,10 @@ class NetworkAgentTest {
// Check that the default network's transport is propagated to the VPN. // Check that the default network's transport is propagated to the VPN.
var vpnNc = mCM.getNetworkCapabilities(agent.network) var vpnNc = mCM.getNetworkCapabilities(agent.network)
assertNotNull(vpnNc) assertNotNull(vpnNc)
assertTrue(NetworkCapabilities.TRANSPORT_VPN in vpnNc.transportTypes)
assertFalse(vpnNc.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) val testAndVpn = intArrayOf(TRANSPORT_TEST, TRANSPORT_VPN)
assertTrue(hasAllTransports(vpnNc, testAndVpn))
assertFalse(vpnNc.hasCapability(NET_CAPABILITY_NOT_VPN))
assertTrue(hasAllTransports(vpnNc, defaultNetworkTransports), assertTrue(hasAllTransports(vpnNc, defaultNetworkTransports),
"VPN transports ${Arrays.toString(vpnNc.transportTypes)}" + "VPN transports ${Arrays.toString(vpnNc.transportTypes)}" +
" lacking transports from ${Arrays.toString(defaultNetworkTransports)}") " lacking transports from ${Arrays.toString(defaultNetworkTransports)}")
@@ -587,12 +602,12 @@ class NetworkAgentTest {
// Check that when no underlying networks are announced the underlying transport disappears. // Check that when no underlying networks are announced the underlying transport disappears.
agent.setUnderlyingNetworks(listOf<Network>()) agent.setUnderlyingNetworks(listOf<Network>())
callback.expectCapabilitiesThat(agent.network!!) { callback.expectCapabilitiesThat(agent.network!!) {
it.transportTypes.size == 1 && it.hasTransport(NetworkCapabilities.TRANSPORT_VPN) it.transportTypes.size == 2 && hasAllTransports(it, testAndVpn)
} }
// Put the underlying network back and check that the underlying transport reappears. // Put the underlying network back and check that the underlying transport reappears.
val expectedTransports = (defaultNetworkTransports.toSet() + val expectedTransports = (defaultNetworkTransports.toSet() + TRANSPORT_TEST + TRANSPORT_VPN)
NetworkCapabilities.TRANSPORT_VPN).toIntArray() .toIntArray()
agent.setUnderlyingNetworks(null) agent.setUnderlyingNetworks(null)
callback.expectCapabilitiesThat(agent.network!!) { callback.expectCapabilitiesThat(agent.network!!) {
it.transportTypes.size == expectedTransports.size && it.transportTypes.size == expectedTransports.size &&
@@ -604,9 +619,9 @@ class NetworkAgentTest {
// underlying networks, and because not congested, not roaming, and not suspended are the // underlying networks, and because not congested, not roaming, and not suspended are the
// default anyway. It's still useful as an extra check though. // default anyway. It's still useful as an extra check though.
vpnNc = mCM.getNetworkCapabilities(agent.network) vpnNc = mCM.getNetworkCapabilities(agent.network)
for (cap in listOf(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED, for (cap in listOf(NET_CAPABILITY_NOT_CONGESTED,
NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, NET_CAPABILITY_NOT_ROAMING,
NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED)) { NET_CAPABILITY_NOT_SUSPENDED)) {
val capStr = valueToString(NetworkCapabilities::class.java, "NET_CAPABILITY_", cap) val capStr = valueToString(NetworkCapabilities::class.java, "NET_CAPABILITY_", cap)
if (defaultNetworkCapabilities.hasCapability(cap) && !vpnNc.hasCapability(cap)) { if (defaultNetworkCapabilities.hasCapability(cap) && !vpnNc.hasCapability(cap)) {
fail("$capStr not propagated from underlying: $defaultNetworkCapabilities") fail("$capStr not propagated from underlying: $defaultNetworkCapabilities")
@@ -705,7 +720,7 @@ class NetworkAgentTest {
// First create a request to make sure the network is kept up // First create a request to make sure the network is kept up
val request1 = NetworkRequest.Builder() val request1 = NetworkRequest.Builder()
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.build() .build()
val callback1 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS).also { val callback1 = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS).also {
registerNetworkCallback(request1, it) registerNetworkCallback(request1, it)
@@ -715,7 +730,7 @@ class NetworkAgentTest {
// Then file the interesting request // Then file the interesting request
val request = NetworkRequest.Builder() val request = NetworkRequest.Builder()
.clearCapabilities() .clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.build() .build()
val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS) val callback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
requestNetwork(request, callback) requestNetwork(request, callback)
@@ -726,18 +741,18 @@ class NetworkAgentTest {
// Send TEMP_NOT_METERED and check that the callback is called appropriately. // Send TEMP_NOT_METERED and check that the callback is called appropriately.
val nc1 = NetworkCapabilities(agent.nc) val nc1 = NetworkCapabilities(agent.nc)
.addCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED) .addCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED)
agent.sendNetworkCapabilities(nc1) agent.sendNetworkCapabilities(nc1)
callback.expectCapabilitiesThat(agent.network) { callback.expectCapabilitiesThat(agent.network) {
it.hasCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED) it.hasCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED)
} }
// Remove TEMP_NOT_METERED and check that the callback is called appropriately. // Remove TEMP_NOT_METERED and check that the callback is called appropriately.
val nc2 = NetworkCapabilities(agent.nc) val nc2 = NetworkCapabilities(agent.nc)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED) .removeCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED)
agent.sendNetworkCapabilities(nc2) agent.sendNetworkCapabilities(nc2)
callback.expectCapabilitiesThat(agent.network) { callback.expectCapabilitiesThat(agent.network) {
!it.hasCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED) !it.hasCapability(NET_CAPABILITY_TEMPORARILY_NOT_METERED)
} }
} }