Revert multiple honeydew path updates
Revert the following CLs to unblock F26 WLAN release testing:
338660d [antlion][honeydew] Update the path of FuchsiaDevice
18a06a7 [antlion][honeydew] Update the path of FfxConfig
ff55ede [antlion] Update the path of PowerSwitch DMC module
Fixed: b/402434727
Change-Id: Id62e6a866fd1e9553ac53aca1259dc6ad40df36d
diff --git a/packages/antlion/controllers/fuchsia_device.py b/packages/antlion/controllers/fuchsia_device.py
index 0fa15ff..23f8df2 100644
--- a/packages/antlion/controllers/fuchsia_device.py
+++ b/packages/antlion/controllers/fuchsia_device.py
@@ -27,11 +27,11 @@
import honeydew
from honeydew.affordances.connectivity.wlan.utils.types import CountryCode
-from honeydew.auxiliary_devices.power_switch.power_switch_using_dmc import (
+from honeydew.auxiliary_devices.power_switch_dmc import (
+ PowerSwitchDmc,
PowerSwitchDmcError,
- PowerSwitchUsingDmc,
)
-from honeydew.transports.ffx.config import FfxConfig
+from honeydew.transports.ffx import FfxConfig
from honeydew.typing.custom_types import DeviceInfo, IpPort
from mobly import logger, signals
@@ -299,7 +299,7 @@
ip_port=IpPort(ip_address(self.ip), None),
serial_socket=None,
),
- ffx_config_data=ffx_config.get_config(),
+ ffx_config=ffx_config.get_config(),
config={
"affordances": {
"wlan": {
@@ -556,10 +556,10 @@
# Use dmc (client of DMS, device management server) if available
# for rebooting the device. This tool is only available when
# running in Fuchsia infrastructure.
- dmc: PowerSwitchUsingDmc | None = None
+ dmc: PowerSwitchDmc | None = None
if self.mdns_name:
try:
- dmc = PowerSwitchUsingDmc(device_name=self.mdns_name)
+ dmc = PowerSwitchDmc(device_name=self.mdns_name)
except PowerSwitchDmcError:
self.log.info("dmc not found, falling back to using PDU")
diff --git a/packages/antlion/controllers/fuchsia_lib/lib_controllers/wlan_controller.py b/packages/antlion/controllers/fuchsia_lib/lib_controllers/wlan_controller.py
index 07d521a..7d16363 100644
--- a/packages/antlion/controllers/fuchsia_lib/lib_controllers/wlan_controller.py
+++ b/packages/antlion/controllers/fuchsia_lib/lib_controllers/wlan_controller.py
@@ -23,7 +23,9 @@
QueryIfaceResponse,
WlanMacRole,
)
-from honeydew.fuchsia_device.fuchsia_device import FuchsiaDevice as HdFuchsiaDevice
+from honeydew.interfaces.device_classes.fuchsia_device import (
+ FuchsiaDevice as HdFuchsiaDevice,
+)
from mobly import logger, signals
from antlion import utils
diff --git a/packages/antlion/controllers/fuchsia_lib/lib_controllers/wlan_policy_controller.py b/packages/antlion/controllers/fuchsia_lib/lib_controllers/wlan_policy_controller.py
index e593269..2e95013 100644
--- a/packages/antlion/controllers/fuchsia_lib/lib_controllers/wlan_policy_controller.py
+++ b/packages/antlion/controllers/fuchsia_lib/lib_controllers/wlan_policy_controller.py
@@ -26,7 +26,9 @@
NetworkState,
WlanClientState,
)
-from honeydew.fuchsia_device.fuchsia_device import FuchsiaDevice as HdFuchsiaDevice
+from honeydew.interfaces.device_classes.fuchsia_device import (
+ FuchsiaDevice as HdFuchsiaDevice,
+)
from mobly import logger, signals
from antlion.controllers.fuchsia_lib.ssh import FuchsiaSSHProvider
