joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes I332c8d43,I340bcb77 into main

Browse source 
* changes:
  Simplify APF IGMPv3 general query offload test
  refactor: Lazy load IP addresses for APF tests
This commit is contained in:
Jimi Chen 2025-07-16 07:38:59 -07:00 • committed by Android (Google) Code Review
commit 5904ce1431
1 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

48
staticlibs/testutils/host/python/apf_test_base.py
View file

@ -61,18 +61,6 @@ class ApfTestBase(multi_devices_test_base.MultiDevicesTestBase):
self.client_mac_address = apf_utils.get_hardware_address(
self.clientDevice, self.client_iface_name
)
self.server_ipv4_addresses = apf_utils.get_ipv4_addresses(
self.serverDevice, self.server_iface_name
)
self.client_ipv4_addresses = apf_utils.get_ipv4_addresses(
self.clientDevice, self.client_iface_name
)
self.server_ipv6_addresses = apf_utils.get_non_tentative_ipv6_addresses(
self.serverDevice, self.server_iface_name
)
self.client_ipv6_addresses = apf_utils.get_non_tentative_ipv6_addresses(
self.clientDevice, self.client_iface_name
)
# Enable doze mode to activate APF.
adb_utils.set_doze_mode(self.clientDevice, True)
@ -83,6 +71,42 @@ class ApfTestBase(multi_devices_test_base.MultiDevicesTestBase):
self.serverDevice, UpstreamType.NONE
)
def get_and_expect_ipv4_addresses_exist(self):
self.server_ipv4_addresses = apf_utils.get_ipv4_addresses(
self.serverDevice, self.server_iface_name
)
asserts.assert_true(
self.server_ipv4_addresses,
'Server does not have IPv4 address, fail the test.',
)
self.client_ipv4_addresses = apf_utils.get_ipv4_addresses(
self.clientDevice, self.client_iface_name
)
asserts.assert_true(
self.client_ipv4_addresses,
'Client does not have IPv4 address, fail the test.',
)
def get_and_expect_ipv6_addresses_exist(self):
self.server_ipv6_addresses = apf_utils.get_non_tentative_ipv6_addresses(
self.serverDevice, self.server_iface_name
)
asserts.assert_true(
self.server_ipv6_addresses,
'Server does not have IPv6 address, fail the test.',
)
self.client_ipv6_addresses = apf_utils.get_non_tentative_ipv6_addresses(
self.clientDevice, self.client_iface_name
)
asserts.assert_true(
self.client_ipv6_addresses,
'Client does not have IPv6 address, fail the test.',
)
def send_packet_and_expect_counter_increased(
self, packet: str, counter_name: str
) -> None: