Commit Graph

3249 Commits

Author SHA1 Message Date
Henry Tung
8b37619dc6 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev
am: 7058c3fbd8

Change-Id: I942634bd70d37363e0078e9c352d34190ba0c2ad
2019-05-24 00:15:53 -07:00
Henry Tung
7058c3fbd8 Merge "Modify testNetworkSetupWizardPermission let it fit Factory Ota use case." into qt-dev 2019-05-24 07:03:31 +00:00
Paul Hu
829a040a81 Merge "Ignore all tests in IpSecManagerTunnelTest with instant apps" am: 57e952f8f8
am: 7510105d86

Change-Id: Ia18c6bfe791692f8835b127adf734ce3d2a4ba95
2019-05-23 23:39:38 -07:00
paulhu
5f7599b6d5 Ignore all tests in IpSecManagerTunnelTest with instant apps
Test runner will crash while tring to get test network service
in IpSecManagerTunnelTest. Because MANAGE_TEST_NETWORKS
permission can't be granted to instant apps. So ignore all tests
in this file.

Bug: 133399750
Test: atest CtsNetTestCases --instant
Change-Id: I5a096f20ec168133dbb65d27d3388c01e6ee895b
2019-05-24 11:37:37 +08:00
Paul Hu
0f897b8d71 [automerger skipped] Merge "Enable instant app mode for CtsNetTestCases" am: 5013b29af8
am: b073a29470 -s ours
am skip reason: change_id I931369875c86a396a898682009337cef1b918ba4 with SHA1 a5f4202a7b is in history

Change-Id: Ibf168d3166a11309d6a1a1ab5849d737bae436bd
2019-05-22 10:29:01 -07:00
Henry Tung
0097cb240d Modify testNetworkSetupWizardPermission let it fit Factory Ota use case.
Bug: 131304475
Test: run cts -m CtsNetTestCases -t android.net.wifi.cts.WifiManagerTest#testNetworkSetupWizardPermission
Change-Id: I41a457e6f31fcf3c45b171937d61b6342e3c0946
2019-05-22 11:18:07 +08:00
paulhu
435166fa86 Enable instant app mode for CtsNetTestCases
1. Indicating CtsNetTestCases support instant app mode but
   ignore some tests that cannot run in instant app mode.
2. Move some tests which need to test on API 23 into
   CtsNetApi23TestCases module due to instant app package
   must target at least API 26.

Bug: 123366918
Test: atest CtsNetTestCases --instant
Test: atest CtsNetApi23TestCases
Test: atest FrameworksNetTests

Change-Id: I4e828cbc48143e36c1be38b91c3c698122d4be5a
Merged-In: I1d78349d14763c133e1eab020d26865f46ff19a3
Merged-In: I931369875c86a396a898682009337cef1b918ba4
Merged-In: Ia8a45d6d751be94f9f707f879ea6ce4e6a45fae1
2019-05-22 01:11:10 +08:00
Paul Hu
a5f4202a7b Merge "Enable instant app mode for CtsNetTestCases" into qt-dev
am: 732767e5a9

Change-Id: I931369875c86a396a898682009337cef1b918ba4
2019-05-20 05:41:24 -07:00
Xin Li
ede550a504 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 0f12601ff3 -s ours
am: 79d906ff81 -s ours
am skip reason: subject contains skip directive

Change-Id: I8d9b6b2fd99063662562208fe5e1cd7a3b7bae8f
2019-05-16 21:18:55 -07:00
paulhu
78e4a184a1 Enable instant app mode for CtsNetTestCases
1. Indicating CtsNetTestCases support instant app mode but
   ignore some tests that cannot run in instant app mode.
2. Move some tests which need to test on API 23 into
   CtsNetApi23TestCases module due to instant app package
   must target at least API 26.

Bug: 123366918
Test: atest CtsNetTestCases --instant
Test: atest CtsNetApi23TestCases
Test: atest FrameworksNetTests

Change-Id: I4e828cbc48143e36c1be38b91c3c698122d4be5a
2019-05-16 16:07:07 +08:00
Android Build Merger (Role)
5840687195 Merge "[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: acd4822618 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp 2019-05-16 01:07:52 +00:00
Benedict Wong
701f04f642 Merge "Fix IPsec CTS tests for interface address checking" into qt-dev
am: b256c48d9b

Change-Id: Id490a48213f8ef6b2da320f682a8b6bea0ee4a26
2019-05-15 17:30:22 -07:00
Xin Li
a81e804393 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: acd4822618 -s ours
am skip reason: subject contains skip directive

Change-Id: Iabeaf75a47849a45057b5be8e20b955bb112754b
2019-05-15 17:27:09 -07:00
Xin Li
0f12601ff3 DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
Bug: 132622481
Change-Id: If0c7a9fe0a6f3b0abf65d60492c6b2d0a4ce8527
2019-05-15 16:55:12 -07:00
Benedict Wong
4af108aacf Fix IPsec CTS tests for interface address checking
Fixes two potentially device/kernel specific, or flaky bugs:
1. Java interface checking by name seems to cache the lookup, resulting
in interface address checks occasionally failing (on delete).
2. Link-local addresses appear to be added on all links for some set of
kernels and devices.

This patch addresses both by only checking that the requested address
was added via a address-based NetworkInterface lookup.

Bug: 72950854
Test: Ran on sargo-eng on qt-dev/HEAD
Test: Manually verified that the addresses are indeed added/removed
Change-Id: I3babc72dfe72337c4d68facb1695aec15e504c90
2019-05-15 01:02:28 -07:00
Benedict Wong
c7657003be [automerger skipped] Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev
am: c7774ffa16 -s ours
am skip reason: change_id I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7 with SHA1 d2465991d9 is in history

Change-Id: I990a35a69d0c5d10cb97e27668a831e2ca78bcc4
2019-05-14 21:42:35 -07:00
TreeHugger Robot
c7774ffa16 Merge "Enforce IPsec Tunnel mode for Android Q" into qt-dev 2019-05-15 03:58:29 +00:00
Junyu Lai
9fe83529b8 [automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev
am: 8702c1454d -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: I34770e7d4fe3dcde9f8f41eeedee93053049b0bd
2019-05-14 19:32:45 -07:00
Xin Li
acd4822618 DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
Bug: 132622481
Change-Id: Idefc5f1ded84cc4621e3297b1f1e0894fd3bd9b3
2019-05-14 09:34:08 -07:00
Junyu Lai
6bbc8f71af Merge changes I60b9e9ae,I8be89116 am: c3db303f0b
am: 3fc54a07ae

Change-Id: I7dbe2879e00bb9f7614ca700b40fb54e7e3f1744
2019-05-13 07:24:29 -07:00
Junyu Lai
3fc54a07ae Merge changes I60b9e9ae,I8be89116
am: c3db303f0b

Change-Id: I2b98b3083c33dfd7e9e4a204375433c116f84813
2019-05-13 07:19:21 -07:00
junyulai
bbf160a93d add cts for unprivileged keepalive slots
Currently, unprivileged Nat-T keepalives are limited to 1 slot
per uid. Add CTS to verify that the keepalive slots are limited
as customized for unprivileged requests.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveUnprivileged
      --generate-new-metrics 10

(Clean cherry-pick of aosp/957205)

Change-Id: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
Merged-In: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
2019-05-13 22:19:02 +08:00
junyulai
ad4c047f6d [KA14] add cts for keepalive limit test.
Per SDK requirement, OEM is required to support minimum number of
concurrent keepalives. Implement CTS to verify this.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveLimit
      --generate-new-metrics 10

(Clean cherry-pick of aosp/937026)

Change-Id: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
Merged-In: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
2019-05-13 22:16:50 +08:00
junyulai
80ec50b8ae add cts for unprivileged keepalive slots
Currently, unprivileged Nat-T keepalives are limited to 1 slot
per uid. Add CTS to verify that the keepalive slots are limited
as customized for unprivileged requests.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveUnprivileged
      --generate-new-metrics 10

Change-Id: I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b
2019-05-13 18:10:36 +08:00
junyulai
b41bc72ea3 [KA14] add cts for keepalive limit test.
Per SDK requirement, OEM is required to support minimum number of
concurrent keepalives. Implement CTS to verify this.

Bug: 129371366
Test: atest android.net.cts
      .ConnectivityManagerTest#testSocketKeepaliveLimit
      --generate-new-metrics 10

Change-Id: I8be89116bed5c4dedb2ca42b6d633aa9e8c6a49a
2019-05-13 18:10:23 +08:00
Benedict Wong
236be238b6 Merge "Convert IPsec tests to JUnit4" into qt-dev
am: cb00fbdcc2

Change-Id: I55b51901ecf1166bc553b247e0c9681fb1e20058
2019-05-10 15:52:14 -07:00
Benedict Wong
0d08e91fe7 Convert IPsec tests to JUnit4
This patch fixes an incompatibility where some tests in the same
hierarchy were using Junit3, and other Junit4

No functional test changes made

Bug: 72950854
Test: Ran on devices, working
Change-Id: I79d231e202ba25ad5f57b44b387bebd7f012aa95
2019-05-10 20:05:43 +00:00
Benedict Wong
fbbb9c9c04 Enforce IPsec Tunnel mode for Android Q
This commit adds a second condition to whether the device is expected to
have the tunnel mode feature. If a device's first API/launch version is
Q or above, require IPsec tunnels

Bug: 72950854
Test: Ran on device with first API level < Q and == Q.
Merged-In: I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7
Change-Id: I7b849ad24a04b6b7899a80f1856236b5ceb5a839
(cherry picked from commit d2465991d9)
2019-05-10 18:08:48 +00:00
Benedict Wong
d2465991d9 Merge "Enforce IPsec Tunnel mode for Android Q" am: 81e51bce50
am: ad380770a3

Change-Id: I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7
2019-05-10 11:05:43 -07:00
Benedict Wong
ad380770a3 Merge "Enforce IPsec Tunnel mode for Android Q"
am: 81e51bce50

Change-Id: I6004a243d1840c5f89f400d8f5a3f682054ef12f
2019-05-10 10:57:35 -07:00
Benedict Wong
305873fdd9 [automerger skipped] Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9 into qt-dev
am: e97231be1b -s ours
am skip reason: change_id Ic4181fc857fa880db5553314efa914f870dbe87c with SHA1 64e64ff454 is in history

Change-Id: Id9e175e0d4670fc082f28d55945dfde823672eb6
2019-05-10 10:52:49 -07:00
Benedict Wong
81e51bce50 Merge "Enforce IPsec Tunnel mode for Android Q" 2019-05-10 17:41:04 +00:00
Benedict Wong
084c8b47b6 Enforce IPsec Tunnel mode for Android Q
This commit adds a second condition to whether the device is expected to
have the tunnel mode feature. If a device's first API/launch version is
Q or above, require IPsec tunnels

Bug: 72950854
Test: Ran on device with first API level < Q and == Q.
Change-Id: I7b849ad24a04b6b7899a80f1856236b5ceb5a839
2019-05-10 01:22:13 -07:00
Xin Li
574d9a15f9 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 8982cb36d7 -s ours
am: 849c3a4352 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia270b9bb1c50ae27a441fd7aedb2950f450fa249
2019-05-09 17:56:47 -07:00
Benedict Wong
817d192bc4 Add IPsec Tunnel mode data tests
This change adds single-direction tests for the IPsec Tunnel Mode API.
In the outbound direction, TUNs are used to capture outgoing packets,
and values are inspected. In the inbound direction, packets are built
manually, using the PacketUtils framework. Additional testing for
end-to-end integration tests will follow in aosp/941021 using packet
reflection via the TUN.

Bug: 72950854
Test: This; passing
Change-Id: Ic4181fc857fa880db5553314efa914f870dbe87c
Merged-In: Ic4181fc857fa880db5553314efa914f870dbe87c
(cherry picked from commit d708a4c217f13c9028427d98031394f0933482bf)
2019-05-09 17:30:32 -07:00
Benedict Wong
2d2a1ab8f7 Add utilities to generate packets
This change adds utility methods to generate packets incrementally. It
supports UDP, ESP, IPv4, IPv6 packet generation.

For ESP, it exclusively does AES-CBC, HMAC-SHA256.

Bug: 72950854
Test: This
Change-Id: Icffeed2ebb2005d79faf04f48fd5126d1d6fb175
Merged-In: Icffeed2ebb2005d79faf04f48fd5126d1d6fb175
(cherry picked from commit 0e4743d56553d698ac45ae548f31019ea6e91541)
2019-05-09 17:30:32 -07:00
Benedict Wong
2742923a63 Add TunUtils as utility to reflect packets
This patch adds a TunUtils class, allowing for packet capture over a TUN
interface, inspection of some basic header fields, and reflection of
packets with flipped src/dst headers.

Bug: 72950854
Test: Ran, passing
Change-Id: I9fdba4a905886c7a4820d86ef52c0cc1843215b2
Merged-In: I9fdba4a905886c7a4820d86ef52c0cc1843215b2
(cherry picked from commit 2f07cd8551d755a4076e94b9e620bc446a66bf54)
2019-05-09 17:30:32 -07:00
Benedict Wong
f57c5e21cc Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9 am: 54c0726220
am: df00896e14

Change-Id: Id0c3017b926b6f2fc158b10c0c0eb9a727e57dd6
2019-05-09 16:50:17 -07:00
Xin Li
849c3a4352 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: 8982cb36d7 -s ours
am skip reason: subject contains skip directive

Change-Id: Iab80c552f75d155db7c8b1e9408eb86dd56acaa3
2019-05-09 16:42:07 -07:00
Benedict Wong
df00896e14 Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9
am: 54c0726220

Change-Id: I3a5a1a1ae0096eba2993798bf2707a8cfda81c97
2019-05-09 15:10:52 -07:00
Xin Li
8982cb36d7 Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:51 +00:00
Benedict Wong
54c0726220 Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9
* changes:
  Add IPsec Tunnel mode data tests
  Add utilities to generate packets
  Add TunUtils as utility to reflect packets
2019-05-09 20:51:01 +00:00
Benedict Wong
64e64ff454 Add IPsec Tunnel mode data tests
This change adds single-direction tests for the IPsec Tunnel Mode API.
In the outbound direction, TUNs are used to capture outgoing packets,
and values are inspected. In the inbound direction, packets are built
manually, using the PacketUtils framework. Additional testing for
end-to-end integration tests will follow in aosp/941021 using packet
reflection via the TUN.

Bug: 72950854
Test: This; passing
Change-Id: Ic4181fc857fa880db5553314efa914f870dbe87c
2019-05-09 11:25:15 -07:00
Benedict Wong
75fb3d002e Add utilities to generate packets
This change adds utility methods to generate packets incrementally. It
supports UDP, ESP, IPv4, IPv6 packet generation.

For ESP, it exclusively does AES-CBC, HMAC-SHA256.

Bug: 72950854
Test: This
Change-Id: Icffeed2ebb2005d79faf04f48fd5126d1d6fb175
2019-05-09 11:25:06 -07:00
Benedict Wong
8553bf3be5 [automerger skipped] Check for IPSEC_TUNNELS feature before running CTS tests
am: af4330f777 -s ours
am skip reason: change_id I62fcc2cbca8bf3d2b70da5646303a7059a0df663 with SHA1 437eb03a33 is in history

Change-Id: I4b7431f8727654d3088122f9312b9913da8672e2
2019-05-08 21:29:41 -07:00
Benedict Wong
e341fca9bc Merge "Check for IPSEC_TUNNELS feature before running CTS tests" am: 4243c834ce
am: 0086fba2bf

Change-Id: Ia45b229e5c3b5d1f8c8a7afcb53304ef83cca04a
2019-05-08 13:57:50 -07:00
Benedict Wong
0086fba2bf Merge "Check for IPSEC_TUNNELS feature before running CTS tests"
am: 4243c834ce

Change-Id: Ia996f994fdfc373ffbe634a40cb13002128fe98d
2019-05-08 13:25:51 -07:00
Benedict Wong
4243c834ce Merge "Check for IPSEC_TUNNELS feature before running CTS tests" 2019-05-08 20:04:06 +00:00
Benedict Wong
af4330f777 Check for IPSEC_TUNNELS feature before running CTS tests
If tunnel feature does is not present, skip tests.

Bug: 117183273
Test: This
Change-Id: I62fcc2cbca8bf3d2b70da5646303a7059a0df663
Merged-In: I62fcc2cbca8bf3d2b70da5646303a7059a0df663
(cherry picked from commit 698c99fcf03a4e1afb028ac66852140762a7f2b1)
2019-05-08 04:17:03 +00:00
Benedict Wong
65845a7e50 Add TunUtils as utility to reflect packets
This patch adds a TunUtils class, allowing for packet capture over a TUN
interface, inspection of some basic header fields, and reflection of
packets with flipped src/dst headers.

Bug: 72950854
Test: Ran, passing
Change-Id: I9fdba4a905886c7a4820d86ef52c0cc1843215b2
2019-05-07 19:24:17 -07:00