Remove packet type and dst mac when sending raw packet
This is now derived from the passed packet data by
NetworkStack.
Test: m connectivity_multi_devices_snippet && \
atest CtsConnectivityMultiDevicesTestCases:ConnectivityMultiDevicesTest
Test: atest NetworkStaticLibHostPythonTests
Bug: 335368434
Change-Id: Ida06c00e6f499b782cb903c9fa0a4154c2d8cf84
diff --git a/staticlibs/tests/unit/host/python/apf_utils_test.py b/staticlibs/tests/unit/host/python/apf_utils_test.py
index 50bc884..8b390e3 100644
--- a/staticlibs/tests/unit/host/python/apf_utils_test.py
+++ b/staticlibs/tests/unit/host/python/apf_utils_test.py
@@ -122,17 +122,13 @@
self, mock_adb_shell: MagicMock
) -> None:
mock_adb_shell.return_value = "" # Successful command output
- packet_type = "BEEF"
iface_name = "eth0"
- dst_mac = "1234567890AB"
packet_in_hex = "AABBCCDDEEFF"
- send_raw_packet_downstream(
- self.mock_ad, packet_type, iface_name, dst_mac, packet_in_hex
- )
+ send_raw_packet_downstream(self.mock_ad, iface_name, packet_in_hex)
mock_adb_shell.assert_called_once_with(
self.mock_ad,
"cmd network_stack send-raw-packet-downstream"
- f" {packet_type} {iface_name} {dst_mac} {packet_in_hex}",
+ f" {iface_name} {packet_in_hex}",
)
@patch("net_tests_utils.host.python.adb_utils.adb_shell")
@@ -143,9 +139,7 @@
"Any Unexpected Output"
)
with asserts.assert_raises(UnexpectedBehaviorError):
- send_raw_packet_downstream(
- self.mock_ad, "BEEF", "eth0", "1234567890AB", "AABBCCDDEEFF"
- )
+ send_raw_packet_downstream(self.mock_ad, "eth0", "AABBCCDDEEFF")
@patch("net_tests_utils.host.python.adb_utils.adb_shell")
def test_send_raw_packet_downstream_unsupported(
@@ -155,6 +149,4 @@
cmd="", stdout="Unknown command", stderr="", ret_code=3
)
with asserts.assert_raises(UnsupportedOperationException):
- send_raw_packet_downstream(
- self.mock_ad, "BEEF", "eth0", "1234567890AB", "AABBCCDDEEFF"
- )
+ send_raw_packet_downstream(self.mock_ad, "eth0", "AABBCCDDEEFF")
diff --git a/staticlibs/testutils/host/python/apf_utils.py b/staticlibs/testutils/host/python/apf_utils.py
index eea10de..f71464c 100644
--- a/staticlibs/testutils/host/python/apf_utils.py
+++ b/staticlibs/testutils/host/python/apf_utils.py
@@ -137,16 +137,12 @@
packet += "00" * 46
# Send the packet using a raw socket.
- send_raw_packet_downstream(
- ad, ETH_P_ETHERCAT, iface_name, ETHER_BROADCAST, packet
- )
+ send_raw_packet_downstream(ad, iface_name, packet)
def send_raw_packet_downstream(
ad: android_device.AndroidDevice,
- packetType: str,
iface_name: str,
- dst_mac: str,
packet_in_hex: str,
) -> None:
"""Sends a raw packet over the specified downstream interface.
@@ -158,11 +154,8 @@
Args:
ad: The AndroidDevice object representing the connected device.
- packetType: The type of packet to send (e.g., "88A4" for EtherCAT).
iface_name: The name of the network interface to use (e.g., "wlan0",
"eth0").
- dst_mac: The destination MAC address of the packet (e.g., "FFFFFFFFFFFF"
- for broadcast).
packet_in_hex: The raw packet data starting from L2 header encoded in
hexadecimal string format.
@@ -181,7 +174,7 @@
cmd = (
"cmd network_stack send-raw-packet-downstream"
- f" {packetType} {iface_name} {dst_mac} {packet_in_hex}"
+ f" {iface_name} {packet_in_hex}"
)
# Expect no output or Unknown command if NetworkStack is too old. Throw otherwise.