Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfba980e authored by Martin Brabham's avatar Martin Brabham
Browse files

Cert: Add name to gd_device 

Bug: 145638034
Test: ./cert/run --host
Change-Id: Ib4cb22fa582dfe503c6a0e755614291a39196c4a
parent 1817a2a0

system/gd/cert/android_devices_config.json

+2 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
                    "signal_port": "8894",

                    "signal_port": "8894",

                    "label": "cert_stack",

                    "label": "cert_stack",

                    "serial_number": "CERT",

                    "serial_number": "CERT",

                    "name": "Cert Device",

                    "cmd":

                    "cmd":

                    [

                    [

                        "adb",

                        "adb",
@@ -31,6 +32,7 @@ 
                    "signal_port": "8895",

                    "signal_port": "8895",

                    "label": "stack_under_test",

                    "label": "stack_under_test",

                    "serial_number": "DUT",

                    "serial_number": "DUT",

                    "name": "DUT Device",

                    "cmd":

                    "cmd":

                    [

                    [

                        "adb",

                        "adb",

system/gd/cert/gd_device.py

+5 −3
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ from hal import facade_pb2_grpc as hal_facade_pb2_grpc 
from hci.facade import facade_pb2 as hci_facade

from hci.facade import facade_pb2 as hci_facade

from hci.facade import facade_pb2_grpc as hci_facade_pb2_grpc

from hci.facade import facade_pb2_grpc as hci_facade_pb2_grpc

from hci.facade import acl_manager_facade_pb2_grpc

from hci.facade import acl_manager_facade_pb2_grpc

from hci.facade import controller_facade_pb2 as controller_facade

from hci.facade import controller_facade_pb2_grpc

from hci.facade import controller_facade_pb2_grpc

from hci.facade import le_acl_manager_facade_pb2_grpc

from hci.facade import le_acl_manager_facade_pb2_grpc

from hci.facade import le_advertising_manager_facade_pb2_grpc

from hci.facade import le_advertising_manager_facade_pb2_grpc
@@ -68,16 +69,17 @@ def get_instances_with_configs(configs): 
        devices.append(

        devices.append(

            GdDevice(config["grpc_port"], config["grpc_root_server_port"],

            GdDevice(config["grpc_port"], config["grpc_root_server_port"],

                     config["signal_port"], resolved_cmd, config["label"],

                     config["signal_port"], resolved_cmd, config["label"],

                     config.get("serial_number", "")))

                     config.get("serial_number", ""), config.get("name", "")))

    return devices

    return devices









class GdDevice(GdDeviceBase):

class GdDevice(GdDeviceBase):





    def __init__(self, grpc_port, grpc_root_server_port, signal_port, cmd,

    def __init__(self, grpc_port, grpc_root_server_port, signal_port, cmd,

                 label, serial_number):

                 label, serial_number, name):

        super().__init__(grpc_port, grpc_root_server_port, signal_port, cmd,

        super().__init__(grpc_port, grpc_root_server_port, signal_port, cmd,

                         label, ACTS_CONTROLLER_CONFIG_NAME, serial_number)

                         label, ACTS_CONTROLLER_CONFIG_NAME, serial_number,

                         name)





        # Facade stubs

        # Facade stubs

        self.rootservice = facade_rootservice_pb2_grpc.RootFacadeStub(

        self.rootservice = facade_rootservice_pb2_grpc.RootFacadeStub(

system/gd/cert/gd_device_base.py

+3 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ def replace_vars(string, config): 
class GdDeviceBase:

class GdDeviceBase:





    def __init__(self, grpc_port, grpc_root_server_port, signal_port, cmd,

    def __init__(self, grpc_port, grpc_root_server_port, signal_port, cmd,

                 label, type_identifier, serial_number):

                 label, type_identifier, serial_number, name):

        self.label = label if label is not None else grpc_port

        self.label = label if label is not None else grpc_port

        # logging.log_path only exists when this is used in an ACTS test run.

        # logging.log_path only exists when this is used in an ACTS test run.

        self.log_path_base = context.get_current_context().get_full_output_path(

        self.log_path_base = context.get_current_context().get_full_output_path(
@@ -102,6 +102,8 @@ class GdDeviceBase: 
            self.adb.shell("rm /data/misc/bluetooth/logs/btsnoop_hci.log")

            self.adb.shell("rm /data/misc/bluetooth/logs/btsnoop_hci.log")

            self.ensure_no_output(self.adb.shell("svc bluetooth disable"))

            self.ensure_no_output(self.adb.shell("svc bluetooth disable"))





        self.name = name



        tester_signal_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

        tester_signal_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

        tester_signal_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR,

        tester_signal_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR,

                                        1)

                                        1)

system/gd/cert/host_config.json

+2 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
                    "grpc_root_server_port": "8996",

                    "grpc_root_server_port": "8996",

                    "signal_port": "8994",

                    "signal_port": "8994",

                    "label": "cert_stack",

                    "label": "cert_stack",

                    "name": "Cert Device",

                    "cmd":

                    "cmd":

                    [

                    [

                        "$GD_ROOT/bluetooth_stack_with_facade",

                        "$GD_ROOT/bluetooth_stack_with_facade",
@@ -32,6 +33,7 @@ 
                    "grpc_root_server_port": "8997",

                    "grpc_root_server_port": "8997",

                    "signal_port": "8995",

                    "signal_port": "8995",

                    "label": "stack_under_test",

                    "label": "stack_under_test",

                    "name": "DUT Device",

                    "cmd":

                    "cmd":

                    [

                    [

                        "$GD_ROOT/bluetooth_stack_with_facade",

                        "$GD_ROOT/bluetooth_stack_with_facade",

system/gd/cert/pts.json

+1 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
                    "signal_port": "8895",

                    "signal_port": "8895",

                    "label": "stack_under_test",

                    "label": "stack_under_test",

                    "serial_number": "DUT",

                    "serial_number": "DUT",

                    "name": "Cert Device",

                    "cmd":

                    "cmd":

                    [

                    [

                        "adb",

                        "adb",