commit e56679b2bc97ddd36d4090e269e2151a3c9dac4d
author Jimi Chen <jimictw@google.com> Tue Feb 06 04:25:43 2024 +0000
committer Jimi Chen <jimictw@google.com> Tue Feb 20 07:33:07 2024 +0000
tree 9b169f38c4545a47911895393dff02de70d57366
parent a7fe1554f52fe3f7c1a376367c683e155555753b

Add address/port translation for integration test

Support general test that can listen on custom port.
Remap DNS port to 1053 and listen HTTP server port on 8080 for integration test.
Avoid binding system restricted port (<1024).

Bug: 322113686
Test: atest NetworkStackIntegrationTests:android.net.NetworkStatsIntegrationTest
Change-Id: I574edf5406711c97e8b877e1f9937cd32d3d2cbc

tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt

diff --git a/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt b/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
index 2e52e3f..1607ad8 100644
--- a/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
+++ b/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
@@ -82,7 +82,9 @@
     private val TEST_DOWNLOAD_SIZE = 10000L
     private val TEST_UPLOAD_SIZE = 20000L
     private val HTTP_SERVER_NAME = "test.com"
-    private val DNS_SERVER_PORT = 53
+    private val HTTP_SERVER_PORT = 8080 // Use port > 1024 to avoid restrictions on system ports
+    private val DNS_INTERNAL_SERVER_PORT = 53
+    private val DNS_EXTERNAL_SERVER_PORT = 1053
     private val TCP_ACK_SIZE = 72
 
     // Packet overheads that are not part of the actual data transmission, these
@@ -99,13 +101,21 @@
     private val inst = InstrumentationRegistry.getInstrumentation()
     private val context = inst.getContext()
     private val packetBridge = runAsShell(MANAGE_TEST_NETWORKS) {
-        PacketBridge(context, listOf(LOCAL_V6ADDR), REMOTE_V6ADDR.address)
+        PacketBridge(
+            context,
+            listOf(LOCAL_V6ADDR),
+            REMOTE_V6ADDR.address,
+            listOf(
+                Pair(DNS_INTERNAL_SERVER_PORT, DNS_EXTERNAL_SERVER_PORT)
+            )
+        )
     }
     private val cm = context.getSystemService(ConnectivityManager::class.java)!!
 
     // Set up DNS server for testing server and DNS64.
     private val fakeDns = TestDnsServer(
-        packetBridge.externalNetwork, InetSocketAddress(LOCAL_V6ADDR.address, DNS_SERVER_PORT)
+        packetBridge.externalNetwork,
+        InetSocketAddress(LOCAL_V6ADDR.address, DNS_EXTERNAL_SERVER_PORT)
     ).apply {
         start()
         setAnswer(
@@ -116,7 +126,10 @@
     }
 
     // Start up test http server.
-    private val httpServer = TestHttpServer(LOCAL_V6ADDR.address.hostAddress).apply {
+    private val httpServer = TestHttpServer(
+        LOCAL_V6ADDR.address.hostAddress,
+        HTTP_SERVER_PORT
+    ).apply {
         start()
     }