commit a0e9c5a6e5a17631f746eb99383edc6abd0c5e3d
author Lorenzo Colitti <lorenzo@google.com> Wed Aug 03 15:56:54 2022 +0900
committer Patrick Rohr <prohr@google.com> Thu Sep 15 23:29:46 2022 +0000
tree 34a456dba2af510f8a47ffafee53b4998b4167aa
parent 52bc9d8156067dcaa5b3ac62a6d4df7905e04f42

Update DscpPolicyTest to use random IPv6 prefixes.

Test: test-only change
Bug: 235559605
Change-Id: I47666abf51cd9939e1e16d056fdf8f2d468e5024
Merged-In: I47666abf51cd9939e1e16d056fdf8f2d468e5024
(cherry picked from commit 9f94e79c89db15016a1644ebfff7cea23fca1f1a)

tests/cts/net/src/android/net/cts/DscpPolicyTest.kt

diff --git a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
index 996c7d7..2e31d22 100644
--- a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
+++ b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
@@ -251,15 +251,13 @@
 
         var inet6Addr: Inet6Address? = null
         val timeout = SystemClock.elapsedRealtime() + PACKET_TIMEOUT_MS
+        val onLinkPrefix = raResponder.prefix
         while (timeout > SystemClock.elapsedRealtime()) {
             try {
                 // Pick any arbitrary port
                 Os.connect(sock, TEST_TARGET_IPV6_ADDR, 12345)
                 val sockAddr = Os.getsockname(sock) as InetSocketAddress
-
-                // TODO: make RouterAdvertisementResponder.SLAAC_PREFIX public and use it here,
-                // or make it configurable and configure it here.
-                if (IpPrefix("2001:db8::/64").contains(sockAddr.address)) {
+                if (onLinkPrefix.contains(sockAddr.address)) {
                     inet6Addr = sockAddr.address as Inet6Address
                     break
                 }