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

Commit a4ef8687 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Setup cert device in test script" am: e44954a0 

Change-Id: I0b139a8dd02bfe5348ddf462e0179d49c1586277
parents 118482ef e44954a0

system/gd/cert/gd_cert_device.py

+4 −3
Original line number Original line Diff line number Diff line
@@ -53,16 +53,17 @@ def get_instances_with_configs(configs): 
            resolved_cmd.append(replace_vars(entry, config))

            resolved_cmd.append(replace_vars(entry, config))

        devices.append(

        devices.append(

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

            GdCertDevice(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", "")))

    return devices

    return devices









class GdCertDevice(GdDeviceBase):

class GdCertDevice(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):

                 label, serial_number):

        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)

                         label, ACTS_CONTROLLER_CONFIG_NAME, serial_number)





        # Cert stubs

        # Cert stubs

        self.rootservice = cert_rootservice_pb2_grpc.RootCertStub(

        self.rootservice = cert_rootservice_pb2_grpc.RootCertStub(