Commit Graph

988 Commits

Author SHA1 Message Date
Xiao Ma
c81c066958 Make Tethering module depend on net-utils-device-common-ip.
NetworkStack module utils are duplicated to net-utils-device-common-ip,
delete the module utils source code and use net-utils-device-common-ip
instead.

Bug: 235901424
Test: atest TetheringTests
Change-Id: I19fe72a92d6de1084963c2b3a38d094f8da2a91e
2022-07-13 04:32:28 +00:00
Mark Chien
6e8549b3ab Merge "Revert "Add onSupportedTetheringType callback"" am: 370ba4f3c5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2150813

Change-Id: I29e07baaa0c921c769c030f37f78cf48e5028e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 07:47:52 +00:00
Mark Chien
370ba4f3c5 Merge "Revert "Add onSupportedTetheringType callback"" 2022-07-12 07:30:50 +00:00
Mark Chien
4bf22ae076 Revert "Add onSupportedTetheringType callback"
This reverts commit ae3d303344.

Reason for revert: this cause GTS fail
Bug: 238038401

Change-Id: I3e21321e931f60208cb0befaed38e58b088ff966
2022-07-12 02:11:48 +00:00
Xiao Ma
7ca4bb0c7f Merge "Use frameworks/libs/net version of SharedLog" am: d5c6a891b4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2129981

Change-Id: I7ea6d753680102d1440e6b24d37a136d3ff4225b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 07:16:54 +00:00
Patrick Rohr
b873e25ab4 Use frameworks/libs/net version of SharedLog
Test: m
Bug: 235901424
Change-Id: Ibfa7821c68c41036a47e765f15078cd5d195afb8
2022-07-07 12:52:58 -07:00
Nucca Chen
1ebaa587ba Merge "Use BpfDump.toBase64EncodedString to dump raw map" am: bf28a595f2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133440

Change-Id: Ie93ca0ae78bff00eea862a7670145b5e51773ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 12:22:02 +00:00
Nucca Chen
bf28a595f2 Merge "Use BpfDump.toBase64EncodedString to dump raw map" 2022-07-06 12:04:54 +00:00
Mark
ee2699379f Stop using adoptShellPermissionIdentity in setUp
Using adoptShellPermissionIdentity in setUp to use the shell permission
idnetity in whole test make the test not easy to
development. If the test want to use the library which would also
start/stop shell permission identity, this let the test lose shell
identify unexpectly after using that library. Only adopt shell permission
idnetity when necessary instead.

Test: atest CtsTetheringTest
Change-Id: I6cf24e6cbf227944bc914446337a247dc350562a
2022-07-05 11:24:20 +00:00
Treehugger Robot
851d4311ec Merge "Move struct {Clat*, Tether4*, TetherStats*} to connectivity module" am: 7722b024a1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138535

Change-Id: I58c76123da5c986c6c86bdb545ea358fa6836c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04 12:31:02 +00:00
Xin Li
514698c728 Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master 2022-06-29 21:22:03 +00:00
Hungming Chen
01f2550ac4 Move struct {Clat*, Tether4*, TetherStats*} to connectivity module
Needed because these struct classes should not be exposed.
Only used for the connectivity module and its tests.

Bug: 234160319
Test: atest ConnectivityCoverageTests

The moved files are identical.

diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatEgress4Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatEgress4Key.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatEgress4Value.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatEgress4Value.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatIngress6Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatIngress6Key.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatIngress6Value.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatIngress6Value.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/Tether4Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/Tether4Key.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/Tether4Value.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/Tether4Value.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/TetherStatsKey.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/TetherStatsKey.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/TetherStatsValue.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/TetherStatsValue.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatEgress4Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatEgress4Key.java
(no diff)

Change-Id: I4ce8045150bdbf04c63c5262c58a0ebcc30d395c
2022-06-29 11:34:19 +00:00
Treehugger Robot
dd9a89c2f2 Merge "Ignore BPF tethering offload test if tether config is disabled" 2022-06-29 07:57:56 +00:00
Mark
26cf9b6728 Fix metrics doesn't work if multiple tethering requested
There is a bug in TetheringMetrics that the on-going builders would be
cleared when creating new builder. This means if multiple tethering
created at the same time, only latest tethering would have metrics.

Bug: 153942334
Test: atest TetheringTests
Change-Id: I16a66790bc19072d8ffe570348bcbafa91263573
2022-06-28 10:31:02 +00:00
Hungming Chen
b37f76f28e Ignore BPF tethering offload test if tether config is disabled
Needed because OEM can disable BPF offload by PRO.

Bug: 237144191
Bug: 236925089
Test: atest EthernetTetheringTest
Change-Id: Idf965caa44aeaae1f084d2c4fcd516a352c1b138
2022-06-27 15:11:23 +08:00
Hungming Chen
264cac59bb Use BpfDump.toBase64EncodedString to dump raw map
Move base64 related bpf map function and constant to f/l/n.
This is preparation for testing BPF map in ClatCoordinator.

Test: atest EthernetTetheringTest
Change-Id: Ieb1e0a0f128c9aa0d7c9f043e90eecf3c61252f5
2022-06-23 21:42:20 +08:00
Treehugger Robot
b825843c28 Merge "[TestOnly] Use probeV4TetheringConnectivity in getClatIpv6Address" am: 1ba05608e5 am: 49cf892d4c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116493

Change-Id: Ic9d0654d80aee41f454e6ebbe4104f4c3562dd8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:50:02 +00:00
Mark
06238c1aa6 [TestOnly] Use probeV4TetheringConnectivity in getClatIpv6Address
Test: atest EthernetTetheringTest
Change-Id: Ib741e4f9cd452c7ce37e829210d30046a9f391ef
2022-06-14 04:38:33 +00:00
Treehugger Robot
41861a9d19 Merge changes Iade99eeb,I3ede46f5 am: 0c0cbd3c04 am: 08f941b8f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116175

Change-Id: Ibb5dcaf0152f95efd6b3a8b866992bd3c6a2367f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 12:40:53 +00:00
Treehugger Robot
02a5082250 Merge "[TestOnly]Remove RemoteResponder from TetheringTester" am: e236ea7c63 am: 5113e59c31
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2115077

Change-Id: Ia2b5b1d74dca100173f1ddd5f7523672e39d7032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 12:40:43 +00:00
Mark
01971ad969 [TestOnly]Create TetheringTester in initTetheringTester
If tethering's upstream have ipv6, the #initTetheringTester
would make sure ipv6 tethering connectivity is ready for testing.

Test: atest EthernentTetheringTest

Change-Id: Iade99eeb95fa94483248799eb852a81662bbb1e0
2022-06-13 09:01:53 +00:00
Mark
73284988cd [TestOnly] Move isExpectedUdpPacket into TetheringTester
isExpectedUdpPacket and isIcmpv6Type is similar util, put them in the
same place and have isExpectedIpPacket to share the ip/eth parsing code.

Test: atest EthernetTetheringTest
Change-Id: I3ede46f5ff1799f575fad7aca277f2bc0bf6c391
2022-06-13 09:01:42 +00:00
Mark Chien
03693623c1 [TestOnly]Remove RemoteResponder from TetheringTester
This is no-op change. Originally RemoteResponder design for providing a
base responder that user could extend it like DnsServerResponder,
TcpResponder, UdpResponder. But actually user could just simply extend
TetheringTester that make RemoteResponder useless. Thus, remove it to
simply the code.

Test: atest EthernetTetheringTest
Change-Id: I47b22a1460ca312c678778143033aadf5e3e0b82
2022-06-13 09:00:27 +00:00
Mark Chien
4b5dcd42ab Merge "[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type" am: 4fcf168399 am: 1d5d7a3baf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116177

Change-Id: Id2285c2a50520f464911f3c5c7010e39781a77a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:46:16 +00:00
Mark Chien
4fcf168399 Merge "[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type" 2022-06-08 02:15:53 +00:00
Mark
6078d6edd6 [TestOnly] Replace isRouterAdvertisement with isIcmpv6Type
Test: atest EthernetTetheringTest
Change-Id: I5dca7a05a982139d8fc6f8272c8b829b74a34722
2022-06-07 15:29:34 +00:00
Treehugger Robot
aa4879b4b3 Merge changes from topic "roll_forward_testtetherclatudp" am: 9b51a75d6e am: 6fb9ac709c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116174

Change-Id: I6ad9045aa021ae791fadd925c27734de8871677a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 08:00:20 +00:00
Remi NGUYEN VAN
9f4f196731 Merge "Revert "EthernetTetheringTest: add testTetherClatUdp"" am: a100d7c51e am: 8006de1eca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116153

Change-Id: I8e23bf28787176ef556db067245e0af0215a6b50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 03:49:14 +00:00
Remi NGUYEN VAN
8b56874caa Skip testTetherClatUdp before S
The test does not pass on R.

Bug: 234727688
Test: atest EthernetTetheringTest
Change-Id: I831859e521b026ed4acb84de5857a7d3ec318ba5
2022-06-03 12:04:23 +09:00
Remi NGUYEN VAN
e78cfa130b Revert "Revert "EthernetTetheringTest: add testTetherClatUdp""
This reverts commit 5bbd292bed.

Bug: 215655463
Change-Id: I06490001b06446b6a4ff3dc084ce11e8ebbe17f8
Test: atest ConnectivityCoverageTests
2022-06-03 02:55:26 +00:00
Remi NGUYEN VAN
5bbd292bed Revert "EthernetTetheringTest: add testTetherClatUdp"
This reverts commit b0274cf796.

Reason for revert: Breaks presubmit: b/234727688

Change-Id: I736752dca3707588a525f28d208bdb20f7280972
2022-06-03 02:32:48 +00:00
Treehugger Robot
d755b3e4d8 Merge "EthernetTetheringTest: add testTetherClatUdp" am: 8968739285 am: 8b3ac26c18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2110088

Change-Id: I35f183f4d94d36a0bece972b80b9e80e42b266cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:27:51 +00:00
Hungming Chen
b0274cf796 EthernetTetheringTest: add testTetherClatUdp
Bug: 215655463
Test: atest ConnectivityCoverageTests
Change-Id: Id5d237b96b1d171c1e353cfd0aeba5aa4606fcc7
2022-06-02 12:07:13 +08:00
Mark Chien
be6a57ba53 Merge "Add tethering icmpv6 forwarding test" am: 86a800f911 am: 2afb2c4c35
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817920

Change-Id: I70ee7712a2d8394153df23feeab982dde6e1202d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 16:10:05 +00:00
Mark Chien
86a800f911 Merge "Add tethering icmpv6 forwarding test" 2022-06-01 15:15:37 +00:00
Treehugger Robot
7e2353413f Merge "Bump tethering target sdk to 33" am: d10244feb8 am: 7462a6ce66
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2100995

Change-Id: I23e72a0ad93e21dcbcbd059fecc09334a24a1a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 09:09:31 +00:00
Treehugger Robot
d10244feb8 Merge "Bump tethering target sdk to 33" 2022-06-01 08:57:46 +00:00
markchien
a40f2fe746 Add tethering icmpv6 forwarding test
Bug: 183166581
Test: atest EthernetTetheringTest

Change-Id: I77ad4a468530f3ef834cd7b72e585798a23f64c3
2022-05-31 23:53:47 +08:00
Mark Chien
d25a1e05ae Bump tethering target sdk to 33
Note: to avoid missing some dependeices change only happen in T+, below
testing verification is perform by internal branch.

Test: atest TetheringTests
      atest TetheringIntegrationTests
      atest CtsTetheringTest
      atest MtsTetheringLatestSdk
      manually change entitlement check recheck period to 1 min and
      monitor schedule alarm works.
      Dogfood this change personally 7 days, major use hotspot sharing network to notebook to work.
Bug: 232193147
Change-Id: I3cba98f42ac1a9c0c1db4b2ad036aff714a428f3
2022-05-31 03:31:18 +00:00
Treehugger Robot
dbdb3adc2e Merge "Test testTetherUdpV4AfterR only verify bpf in precise kernel range" am: 875daa69eb am: e714310a20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2108068

Change-Id: I7098539cba5880b984a9569c54e6e4d5adb85f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 19:39:17 +00:00
Treehugger Robot
875daa69eb Merge "Test testTetherUdpV4AfterR only verify bpf in precise kernel range" 2022-05-27 19:03:58 +00:00
Hungming Chen
d7e713283d Test testTetherUdpV4AfterR only verify bpf in precise kernel range
Use three-part kernel version numbers to check which device
needs to verify BPF offload. Only check major and minor number
is not enough. Ex: mixed build T + R may have an unsupported kernel
version 4.19.160 (require 4.19.176+). Now check the subminor
number as well.

For UDPv4 support, kernel require 4.14.222+ 4.19.176+ 5.4.98+, 5.8.0+

Test: atest EthernetTetheringTest (raven @ internal master build)
Test: cts test (bramble @ T + R mixed build)
> run cts-on-gsi -m CtsTetheringTest -t android.net.EthernetTetheringTest#testTetherUdpV4AfterR

Bug: 232332847
Change-Id: I466df73b0fa35b086a2c5e11f8624c84eb79c8fd
2022-05-27 22:15:24 +08:00
Frank
36987d5012 Fix incorrect sdk version check in SCV2 device test am: a632356e05 am: 6bfe9da357
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2103110

Change-Id: Ia7135ca84674e165d0aebd7775342762c7c89cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:20:28 +00:00
Frank
a632356e05 Fix incorrect sdk version check in SCV2 device test
Test: atest ConnectivityCoverageTests:com.android.networkstack.tethering.OffloadControllerTest
Bug: 229190480
Change-Id: I4e37a9d6634daac14ef41ab30ab986b2e96dacd4
2022-05-24 13:55:03 +08:00
Maciej Żenczykowski
dfd4f7e995 Merge "fix BpfMapTest" am: e273ba1e21 am: defa8c5779
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2097896

Change-Id: I52525ae5be08ffe8333efe97a85cc639fbaef4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:16:34 +00:00
Maciej Żenczykowski
e273ba1e21 Merge "fix BpfMapTest" 2022-05-20 07:44:13 +00:00
Mark Chien
c488884b22 Merge "Fix testUpdateConnectedClientsForLocalOnlyHotspot" am: ee0cc41eaa am: 27ab38119f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2098557

Change-Id: I121f58482b6d96f33abea3260b8da27d587fb29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 15:58:04 +00:00
Mark Chien
7e4eab5153 Fix testUpdateConnectedClientsForLocalOnlyHotspot
testUpdateConnectedClientsForLocalOnlyHotspot should not run before T,
but it don't be ignored correctly because missing DevSdkIgnoreRule
setup.

Bug: 233077722
Test: TH
Change-Id: Ib2d241f927ccdc5d2bc392962481ecb86a223e09
2022-05-19 21:14:21 +08:00
Mark Chien
ebc8f4385f Merge "Register localOnly softapCallback for local only hotspot" am: 46c86bbf82 am: de9fcec3fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930828

Change-Id: Idefc21b22f818ba14020b7278c1d40fe7813ee5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 23:10:47 +00:00
Mark Chien
46c86bbf82 Merge "Register localOnly softapCallback for local only hotspot" 2022-05-17 09:07:38 +00:00