Added better options dut, scpi, rf_switch
BUG=chromium:234294
TEST=run_all_test.py
Change-Id: Ic93995a31723496d51a9c3eaa439e75b13c02272
Reviewed-on: https://chromium-review.googlesource.com/177711
Reviewed-by: Byron Kubert <byronk@chromium.org>
Commit-Queue: Byron Kubert <byronk@chromium.org>
Tested-by: Byron Kubert <byronk@chromium.org>
diff --git a/wireless_automation/duts/dut_interface.py b/wireless_automation/duts/dut_interface.py
index 7f13f5e..0fe277c 100644
--- a/wireless_automation/duts/dut_interface.py
+++ b/wireless_automation/duts/dut_interface.py
@@ -13,7 +13,7 @@
Interface definition for Devices Under Test. Could be Chromebooks,
could be iOS phones, could be Android devices.
"""
- CONFIGSPEC = ['config_stuff = string(default="stuff")']
+ CONFIGSPEC = ['modem_interface=option("altair","dummy",default="dummy")']
def __init__(self, config):
"""
diff --git a/wireless_automation/instruments/prologix/prologix_scpi_driver.py b/wireless_automation/instruments/prologix/prologix_scpi_driver.py
index bb5db75..0d622a7 100644
--- a/wireless_automation/instruments/prologix/prologix_scpi_driver.py
+++ b/wireless_automation/instruments/prologix/prologix_scpi_driver.py
@@ -121,8 +121,6 @@
def close(self):
"""Closes the socket."""
- caller = list(self.scpi_logger.findCaller())
- caller[0] = os.path.basename(caller[0])
self.scpi_logger.info('Close called by :' + str(caller))
try:
self.scpi_logger.error('Closing prologix devices at : %s ' %
diff --git a/wireless_automation/instruments/rf_switch.py b/wireless_automation/instruments/rf_switch.py
index c596862..7b05a2c 100644
--- a/wireless_automation/instruments/rf_switch.py
+++ b/wireless_automation/instruments/rf_switch.py
@@ -12,7 +12,8 @@
Control of a RF Switch.
"""
CONFIGSPEC = ['ip_address=ip_addr(default="0.0.0.0")',
- 'state=boolean(default=False)'
+ 'port=integer(default=0)',
+ 'position=integer(default=0)'
]
def __init__(self, config):
