bluetooth: Cleanup code that handled deprecated peername
Bluetooth peer named hostname-chameleon was used in a transition
period in the lab, which is deprecated now. This CL removes some
code which handled the old name
Also some formatting changes from 'git cl format --no-clang-format'
BUG=b:149637050
TEST=Ran Quicksanity, single test, batch with and without enough peers
Change-Id: I0fbc5fb61833330dd84ab4ba12104b5f27cc5080
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2469815
Reviewed-by: Daniel Winkler <danielwinkler@google.com>
Tested-by: Shijin Abraham <shijinabraham@google.com>
Commit-Queue: Shijin Abraham <shijinabraham@google.com>
diff --git a/server/cros/bluetooth/bluetooth_adapter_quick_tests.py b/server/cros/bluetooth/bluetooth_adapter_quick_tests.py
index 7bac5fb..49edfc3 100644
--- a/server/cros/bluetooth/bluetooth_adapter_quick_tests.py
+++ b/server/cros/bluetooth/bluetooth_adapter_quick_tests.py
@@ -101,13 +101,17 @@
logging.info('=======================================================')
- def quick_test_init(self, host, use_btpeer=True, use_chameleon=False,
- flag='Quick Sanity', btpeer_args=[],
+ def quick_test_init(self,
+ host,
+ use_btpeer=True,
+ flag='Quick Sanity',
+ btpeer_args=[],
start_browser=False):
"""Inits the test batch"""
self.host = host
self.start_browser = start_browser
self.in_lab = site_utils.host_in_lab(self.host.hostname)
+ self.use_btpeer = use_btpeer
#factory can not be declared as local variable, otherwise
#factory._proxy.__del__ will be invoked, which shutdown the xmlrpc
# server, which log out the user.
@@ -122,46 +126,15 @@
raise error.TestFail('Unable to create bluetooth_facade')
- # Common list to track old/new Bluetooth peers
- # Adding chameleon to btpeer_list causes issue in cros_labels
- self.host.peer_list = []
-
- # Keep use_chameleon for any unmodified tests
- # TODO(b:149637050) Remove use_chameleon
- self.use_btpeer = use_btpeer or use_chameleon
if self.use_btpeer:
- self.host.initialize_btpeer(btpeer_args=btpeer_args)
self.input_facade = self.factory.create_input_facade()
- self.check_btpeer()
- #
- # During the transition period in the lab, Bluetooth peer can be
- # name <hostname>-btpeer[1-4] or <hostname>-chameleon OR can be
- # specified on cmd line using btpeer_host or chameleon_host.
- #
- # TODO(b:149637050) Cleanup this code after M83 is in stable
- #
+ self.host.initialize_btpeer(btpeer_args=btpeer_args)
logging.info('%s Bluetooth peers found',
len(self.host.btpeer_list))
-
- self.host.peer_list = self.host.btpeer_list[:]
-
- if (self.host._chameleon_host is not None and
- self.host.chameleon is not None):
- logging.info('Chameleon Bluetooth peer found')
- # If there is a peer named <hostname>-chameleon, append to the
- # peer list
- self.host.peer_list.append(self.host.chameleon)
- self.host.btpeer = self.host.peer_list[0]
- else:
- logging.info('chameleon Btpeer not found')
-
- logging.info('Total of %d peers. Peer list %s',
- len(self.host.peer_list),
- self.host.peer_list)
logging.info('labels: %s', self.host.get_labels())
- if len(self.host.peer_list) == 0:
+ if len(self.host.btpeer_list) == 0:
raise error.TestFail('Unable to find a Bluetooth peer')
# Check the chameleond version on the peer and update if necessary
@@ -174,8 +147,7 @@
# Query connected devices on our btpeer at init time
self.available_devices = self.list_devices_available()
-
- for btpeer in self.host.peer_list:
+ for btpeer in self.host.btpeer_list:
btpeer.register_raspPi_log(self.outputdir)
self.btpeer_group = dict()
@@ -287,12 +259,12 @@
# Check if there are enough peers
total_num_devices = sum(devices.values()) + shared_devices_count
- if total_num_devices > len(self.host.peer_list):
+ if total_num_devices > len(self.host.btpeer_list):
logging.info('SKIPPING TEST %s', test_name)
- logging.info('Number of devices required %s is greater'
- 'than number of peers available %d',
- total_num_devices,
- len(self.host.peer_list))
+ logging.info(
+ 'Number of devices required %s is greater'
+ 'than number of peers available %d',
+ total_num_devices, len(self.host.btpeer_list))
self._print_delimiter()
return False
return True
@@ -364,7 +336,7 @@
self.initialize()
# Start and peer HID devices
self.start_peers(devices)
- self.shared_peers = self.host.peer_list[-shared_devices_count:]
+ self.shared_peers = self.host.btpeer_list[-shared_devices_count:]
if test_name is not None:
time.sleep(self.TEST_SLEEP_SECS)
diff --git a/server/cros/bluetooth/bluetooth_adapter_tests.py b/server/cros/bluetooth/bluetooth_adapter_tests.py
index 340b613..6ae1aa9 100644
--- a/server/cros/bluetooth/bluetooth_adapter_tests.py
+++ b/server/cros/bluetooth/bluetooth_adapter_tests.py
@@ -759,7 +759,7 @@
# Create copy of btpeer_group
self.btpeer_group_copy[device_type] = list()
- for idx,btpeer in enumerate(self.host.peer_list):
+ for idx, btpeer in enumerate(self.host.btpeer_list):
for device_type,gen_device_func in SUPPORTED_DEVICE_TYPES.items():
try:
device = gen_device_func(btpeer)()
@@ -866,11 +866,11 @@
logging.info("in get_device_rasp %s onstart %s", device_num, on_start)
total_num_devices = sum(device_num.values())
- if total_num_devices > len(self.host.peer_list):
- logging.error('Total number of devices %s is greater than the'
- ' number of Bluetooth peers %s',
- total_num_devices,
- len(self.host.peer_list))
+ if total_num_devices > len(self.host.btpeer_list):
+ logging.error(
+ 'Total number of devices %s is greater than the'
+ ' number of Bluetooth peers %s', total_num_devices,
+ len(self.host.btpeer_list))
return False
for device_type, number in device_num.items():
@@ -975,7 +975,7 @@
"""
devices_available = {}
for device_type in SUPPORTED_DEVICE_TYPES:
- for btpeer in self.host.peer_list:
+ for btpeer in self.host.btpeer_list:
if self.is_device_available(btpeer, device_type):
devices_available[device_type] = \
devices_available.get(device_type, 0) + 1
@@ -4136,33 +4136,6 @@
self.count_advertisements = 0
- def check_btpeer(self):
- """Check the existence of Bluetooth peer
-
- The Bluetooth peer can be specified in --args as follows
-
- (cr) $ test_that --args "btpeer_host=$BTPEER_IP" "$DUT_IP" <test>
-
- OR
-
- (cr) $ test_that --args "btpeer_host_list=$BTPEER1_IP,$BTPEER2_IP"
- "$DUT_IP" <test>
-
-
- Note: During a transition period Bluetooth peer can also be specified as
- follows
-
- The chameleon_host is specified in --args as follows
-
- (cr) $ test_that --args "chameleon_host=$CHAMELEON_IP" "$DUT_IP" <test>
-
- """
- # TODO(b:149637050). Remove chameleon part after the M83 is in stable.
- logging.debug('labels: %s', self.host.get_labels())
- if self.host.chameleon is None and self.host.btpeer_list == []:
- raise error.TestError('Have to specify a working Bluetooth peer')
-
-
def update_btpeer(self):
""" Check and update the chameleond bundle on Bluetooth peer
Latest chameleond bundle and git commit is stored in the google cloud
@@ -4175,7 +4148,7 @@
"""
def _update_btpeer():
status = {}
- for peer in self.host.peer_list:
+ for peer in self.host.btpeer_list:
status[peer] = {}
status[peer]['update_needed'] = \
bluetooth_peer_update.is_update_needed(peer, commit)
@@ -4192,7 +4165,7 @@
return False
# TODO(b:160782273) Make this parallel
- for peer in self.host.peer_list:
+ for peer in self.host.btpeer_list:
if status[peer]['update_needed']:
status[peer]['updated'], status[peer]['reason'] = \
bluetooth_peer_update.update_peer(peer, commit)
diff --git a/server/cros/bluetooth/bluetooth_device.py b/server/cros/bluetooth/bluetooth_device.py
index 00966b0..6d225a0 100644
--- a/server/cros/bluetooth/bluetooth_device.py
+++ b/server/cros/bluetooth/bluetooth_device.py
@@ -102,7 +102,7 @@
self._proxy.log_message(msg)
if peer:
- for btpeer in self.host.peer_list:
+ for btpeer in self.host.btpeer_list:
btpeer.log_message(msg)
except Exception as e:
logging.error("Exception '%s' in log_message '%s'", str(e), msg)
diff --git a/server/cros/bluetooth/bluetooth_peer_update.py b/server/cros/bluetooth/bluetooth_peer_update.py
index ff7b591..119e3c0 100644
--- a/server/cros/bluetooth/bluetooth_peer_update.py
+++ b/server/cros/bluetooth/bluetooth_peer_update.py
@@ -166,15 +166,11 @@
def update_peers(host, latest_commit):
"""Update the chameleond on alll peer devices of an host"""
- peer_list = host.btpeer_list[:]
- if host.chameleon is not None:
- peer_list.append(host.chameleon)
-
- if peer_list == []:
+ if host.btpeer_list == []:
raise error.TestError('Bluetooth Peer not present')
status = {}
- for peer in peer_list:
+ for peer in host.btpeer_list:
#TODO(b:160782273) Make this parallel
status[peer] = {}
status[peer]['update_needed'] = is_update_needed(peer,latest_commit)
@@ -183,7 +179,7 @@
if not any([v['update_needed'] for v in status.values()]):
logging.info("Update not needed on any of the peers")
return
- for peer in peer_list:
+ for peer in host.btpeer_list:
if status[peer]['update_needed']:
status[peer]['updated'], status[peer]['reason'] = \
update_peer(peer, latest_commit)
