test: Do not include inventory metadata in RTD invocation
Before this CL, the invocation API included metadata about device
features and setup used for test scheduling decisions. Ideally, this
information need not be provided inthe invocation:
* Device features are known at Chrome OS build and can be queried from
the Chrome OS device at test runtime.
* Test Lab Wiring service is intended to hide all device setup from
Remote Test Driver invocations.
Including this information in the invocation has risks:
* Potential abuse of the information for piping context for analytics in
test results, instead of joinging with upstream source-of-truth.
* Removing this information from invocation later would be a breaking
API change.
Thus, we drop these arguments from the invocation API until a valid
use-case is encoutered.
BUG=chromium:1069902
TEST=./generate.sh
Change-Id: If046c90003faea1ca4f18d5827de71e9fbc8bf76
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2157895
Reviewed-by: Alex Zamorzaev <zamorzaev@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/go/test/rtd/v1/invocation.pb.go b/go/test/rtd/v1/invocation.pb.go
index 4b46dcd..ea0fcfd 100644
--- a/go/test/rtd/v1/invocation.pb.go
+++ b/go/test/rtd/v1/invocation.pb.go
@@ -6,8 +6,6 @@
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
- api "go.chromium.org/chromiumos/config/go/api"
- lab "go.chromium.org/chromiumos/infra/proto/go/lab"
math "math"
)
@@ -101,19 +99,13 @@
// Contains all configuration data required to interact with a single device
// under test during a test invocation.
type DUT struct {
- // Peripherals information about the lab deployment of the device.
- Peripherals *lab.Peripherals `protobuf:"bytes,1,opt,name=peripherals,proto3" json:"peripherals,omitempty"`
- // The relationship between topology and features is described at
- // https://chromium.googlesource.com/chromiumos/config/+/master/proto/api/hardware_topology.md
- HardwareTopology *api.HardwareTopology `protobuf:"bytes,2,opt,name=hardware_topology,json=hardwareTopology,proto3" json:"hardware_topology,omitempty"`
- HardwareFeatures *api.HardwareFeatures `protobuf:"bytes,3,opt,name=hardware_features,json=hardwareFeatures,proto3" json:"hardware_features,omitempty"`
// Name for the DUT for using Test Lab Services to interact with the
// device and its peripherals.
//
// The RTD MUST pass this to Test Lab Service RPCs that act on a particular
// DUT. See the tls.OpenDutPortRequest message for an example of where
// this is used.
- TlsDutName string `protobuf:"bytes,4,opt,name=tls_dut_name,json=tlsDutName,proto3" json:"tls_dut_name,omitempty"`
+ TlsDutName string `protobuf:"bytes,1,opt,name=tls_dut_name,json=tlsDutName,proto3" json:"tls_dut_name,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -144,27 +136,6 @@
var xxx_messageInfo_DUT proto.InternalMessageInfo
-func (m *DUT) GetPeripherals() *lab.Peripherals {
- if m != nil {
- return m.Peripherals
- }
- return nil
-}
-
-func (m *DUT) GetHardwareTopology() *api.HardwareTopology {
- if m != nil {
- return m.HardwareTopology
- }
- return nil
-}
-
-func (m *DUT) GetHardwareFeatures() *api.HardwareFeatures {
- if m != nil {
- return m.HardwareFeatures
- }
- return nil
-}
-
func (m *DUT) GetTlsDutName() string {
if m != nil {
return m.TlsDutName
@@ -401,40 +372,33 @@
func init() { proto.RegisterFile("test/rtd/v1/invocation.proto", fileDescriptor_8ce9aeaf734a34de) }
var fileDescriptor_8ce9aeaf734a34de = []byte{
- // 560 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdf, 0x6e, 0xd3, 0x30,
- 0x14, 0xc6, 0xd5, 0x3f, 0xd0, 0xcd, 0x41, 0xa2, 0x58, 0x4c, 0x0a, 0x65, 0x12, 0x55, 0x35, 0xc4,
- 0x6e, 0x70, 0x58, 0xb9, 0x42, 0xbb, 0x62, 0x2d, 0x08, 0xa4, 0x09, 0x55, 0x69, 0x7b, 0xc3, 0x4d,
- 0xe4, 0x36, 0x6e, 0x6a, 0x35, 0x89, 0xc3, 0xb1, 0xd3, 0x88, 0x27, 0x40, 0x3c, 0x06, 0xaf, 0xc1,
- 0xd3, 0x21, 0x3b, 0x4e, 0x9b, 0x8c, 0x21, 0x71, 0x97, 0x9c, 0xef, 0xf7, 0x7d, 0x39, 0x3e, 0xa7,
- 0x2e, 0x3a, 0x57, 0x4c, 0x2a, 0x0f, 0x54, 0xe8, 0xed, 0xaf, 0x3c, 0x9e, 0xee, 0xc5, 0x9a, 0x2a,
- 0x2e, 0x52, 0x92, 0x81, 0x50, 0x02, 0x3b, 0x5a, 0x25, 0xa0, 0x42, 0xb2, 0xbf, 0x1a, 0x9c, 0xc5,
- 0x74, 0xe5, 0x65, 0x0c, 0x78, 0xb6, 0x65, 0x40, 0x63, 0x59, 0x32, 0x83, 0x41, 0x3d, 0x21, 0x03,
- 0x11, 0x01, 0x93, 0x95, 0xf6, 0x7a, 0xbd, 0x05, 0x91, 0xf0, 0x3c, 0x11, 0xd2, 0x5b, 0x8b, 0x74,
- 0xc3, 0x23, 0x8f, 0x66, 0xdc, 0xdb, 0x52, 0x08, 0x0b, 0x0a, 0x2c, 0x50, 0x22, 0x13, 0xb1, 0x88,
- 0xbe, 0x5b, 0xfc, 0xe2, 0x7e, 0xbc, 0x49, 0x8d, 0x7e, 0xb5, 0x11, 0xfa, 0x7c, 0xe8, 0x14, 0x87,
- 0xe8, 0x79, 0xf5, 0xd5, 0x40, 0xf2, 0x74, 0x17, 0xac, 0x63, 0xce, 0x52, 0x15, 0x94, 0x01, 0x6e,
- 0x6b, 0xd8, 0xba, 0x74, 0xc6, 0x2f, 0x49, 0xed, 0x24, 0x64, 0x66, 0xf9, 0x39, 0x4f, 0x77, 0x13,
- 0x43, 0x4f, 0x0c, 0xec, 0xbb, 0xd9, 0x3f, 0x14, 0x7c, 0x81, 0xba, 0x61, 0xae, 0xa4, 0xdb, 0x1e,
- 0x76, 0x2e, 0x9d, 0x71, 0xbf, 0x11, 0x37, 0x5d, 0x2e, 0x7c, 0xa3, 0xe2, 0x37, 0xe8, 0x04, 0xd8,
- 0xb7, 0x9c, 0x49, 0x25, 0xdd, 0x8e, 0x21, 0x9f, 0x36, 0x48, 0xbf, 0x14, 0xfd, 0x03, 0x85, 0x97,
- 0xc8, 0xd5, 0x40, 0x10, 0xd3, 0x55, 0x20, 0x19, 0xec, 0xf9, 0x9a, 0xc9, 0xaa, 0xf5, 0xae, 0x69,
- 0xfd, 0xbc, 0x91, 0xb0, 0xb8, 0x9d, 0x37, 0x3a, 0x3e, 0xd3, 0xe2, 0x2d, 0x5d, 0xcd, 0xad, 0xb7,
- 0x2c, 0x8f, 0x7e, 0xb4, 0x51, 0x67, 0xba, 0x5c, 0xe0, 0x31, 0x72, 0x6a, 0x1b, 0xb3, 0xc3, 0xe8,
- 0x93, 0x98, 0xae, 0xc8, 0xec, 0x58, 0xf7, 0xeb, 0x10, 0x5e, 0xa0, 0x27, 0x7f, 0x2d, 0xc8, 0x6d,
- 0x1b, 0xe7, 0x2b, 0x72, 0xdc, 0x10, 0x29, 0xbb, 0x24, 0x34, 0xe3, 0xe4, 0x93, 0xe5, 0x17, 0x16,
- 0xf7, 0xfb, 0xdb, 0x3b, 0x95, 0x46, 0xea, 0x86, 0x51, 0x95, 0x03, 0xd3, 0x33, 0xfa, 0x9f, 0xd4,
- 0x8f, 0x16, 0x3f, 0xa6, 0x56, 0x15, 0x3c, 0x44, 0x8f, 0x54, 0x2c, 0x83, 0x30, 0x57, 0x41, 0x4a,
- 0x13, 0x66, 0x46, 0x76, 0xea, 0x23, 0x15, 0xcb, 0x69, 0xae, 0xbe, 0xd0, 0x84, 0x8d, 0x7e, 0xb7,
- 0x50, 0xcf, 0x8e, 0x1d, 0x63, 0xd4, 0x35, 0x54, 0xcb, 0x50, 0xe6, 0x59, 0xd7, 0xf4, 0x08, 0xcd,
- 0x01, 0x4f, 0x7d, 0xf3, 0x8c, 0x6f, 0x90, 0xc3, 0xd2, 0x3d, 0x07, 0x91, 0x26, 0x2c, 0x55, 0xb6,
- 0xcb, 0xe1, 0x7d, 0x9b, 0x24, 0x1f, 0x8e, 0x9c, 0x5f, 0x37, 0x0d, 0x26, 0xc8, 0xa9, 0x69, 0xf8,
- 0x19, 0x3a, 0x29, 0x04, 0xec, 0x82, 0x90, 0x83, 0xfd, 0x7c, 0x4f, 0xbf, 0x4f, 0x39, 0x68, 0x49,
- 0xb1, 0x24, 0x33, 0x52, 0xd9, 0x45, 0x4f, 0xbf, 0x4f, 0x39, 0x8c, 0x7e, 0xb6, 0xd0, 0xe3, 0x3b,
- 0x1b, 0xc7, 0x2f, 0x90, 0xa3, 0x8f, 0x4c, 0xc3, 0x50, 0xff, 0x50, 0x6d, 0x98, 0x3e, 0xf1, 0xfb,
- 0xb2, 0x62, 0xf2, 0x62, 0x19, 0x64, 0x02, 0xca, 0x53, 0x3d, 0xf0, 0x7b, 0x2a, 0x96, 0x33, 0x01,
- 0xaa, 0xf4, 0x16, 0x07, 0x6f, 0xa7, 0xf2, 0x16, 0x0d, 0x6f, 0x51, 0x7a, 0xbb, 0x95, 0xb7, 0xd0,
- 0xde, 0x9b, 0xeb, 0xaf, 0xef, 0x22, 0x71, 0xd8, 0x14, 0x11, 0x10, 0x79, 0xb5, 0xeb, 0xca, 0xd3,
- 0x0d, 0x50, 0xcf, 0x5c, 0x50, 0x2f, 0x12, 0x5e, 0xed, 0x3f, 0xe1, 0x1a, 0x54, 0xb8, 0x7a, 0x68,
- 0x94, 0xb7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x19, 0xa0, 0xe2, 0x7a, 0x6f, 0x04, 0x00, 0x00,
+ // 444 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xc1, 0x8e, 0xd3, 0x30,
+ 0x10, 0x86, 0xd5, 0xa6, 0xd0, 0xc5, 0x41, 0x02, 0x59, 0x20, 0x85, 0xb2, 0x12, 0x55, 0x05, 0x62,
+ 0x4f, 0x09, 0xbb, 0x9c, 0xd0, 0x9e, 0xd8, 0x86, 0x03, 0xd2, 0x0a, 0xad, 0xd2, 0xf6, 0xc2, 0x25,
+ 0x4a, 0x63, 0x6f, 0xb0, 0x9a, 0xd8, 0x61, 0x3c, 0x49, 0x9e, 0x81, 0xc7, 0xe0, 0x35, 0x78, 0x3a,
+ 0x64, 0xbb, 0x29, 0x09, 0x82, 0x5b, 0x66, 0xfe, 0xef, 0x1f, 0xff, 0xe3, 0x98, 0x9c, 0x23, 0xd7,
+ 0x18, 0x01, 0xb2, 0xa8, 0xbd, 0x8c, 0x84, 0x6c, 0x55, 0x9e, 0xa1, 0x50, 0x32, 0xac, 0x41, 0xa1,
+ 0xa2, 0xbe, 0x51, 0x43, 0x40, 0x16, 0xb6, 0x97, 0x8b, 0xc5, 0x10, 0xad, 0x41, 0x15, 0xc0, 0xb5,
+ 0x76, 0xe0, 0xea, 0xe7, 0x94, 0x90, 0xcf, 0x27, 0x37, 0x65, 0xe4, 0x65, 0x0f, 0xa4, 0x5a, 0xc8,
+ 0x43, 0x9a, 0x97, 0x82, 0x4b, 0x4c, 0x73, 0x25, 0xef, 0x45, 0x11, 0x4c, 0x96, 0x93, 0x0b, 0xff,
+ 0xea, 0x4d, 0x38, 0x98, 0x1e, 0xde, 0x1d, 0xf9, 0x8d, 0x90, 0x87, 0xb5, 0xa5, 0xd7, 0x16, 0x4e,
+ 0x82, 0xfa, 0x3f, 0x0a, 0x7d, 0x4d, 0x66, 0xac, 0x41, 0x1d, 0x4c, 0x97, 0xde, 0x85, 0x7f, 0xf5,
+ 0x74, 0x34, 0x2e, 0xde, 0x6d, 0x13, 0xab, 0xd2, 0x77, 0xe4, 0x0c, 0xf8, 0xf7, 0x86, 0x6b, 0xd4,
+ 0x81, 0x67, 0xc9, 0x67, 0x23, 0x32, 0x71, 0x62, 0x72, 0xa2, 0xe8, 0x8e, 0x04, 0x06, 0x48, 0xcb,
+ 0x6c, 0x9f, 0x6a, 0x0e, 0xad, 0xc8, 0xb9, 0xee, 0xa3, 0xcf, 0x6c, 0xf4, 0xf3, 0xd1, 0x84, 0xed,
+ 0xed, 0x66, 0x94, 0xf8, 0xb9, 0x11, 0x6f, 0xb3, 0xfd, 0xe6, 0xe8, 0x75, 0xed, 0xd5, 0x5b, 0xe2,
+ 0xc5, 0xbb, 0x2d, 0x5d, 0x92, 0xc7, 0x58, 0xea, 0x94, 0x35, 0x98, 0xca, 0xac, 0xe2, 0xf6, 0x32,
+ 0x1e, 0x25, 0x04, 0x4b, 0x1d, 0x37, 0xf8, 0x25, 0xab, 0xf8, 0xea, 0xd7, 0x84, 0xcc, 0x8f, 0xa9,
+ 0x28, 0x25, 0xb3, 0x01, 0x65, 0xbf, 0x4d, 0xcf, 0x9c, 0x10, 0x4c, 0x5d, 0xcf, 0x7c, 0xd3, 0x1b,
+ 0xe2, 0x73, 0xd9, 0x0a, 0x50, 0xb2, 0xe2, 0x12, 0x03, 0xcf, 0xc6, 0x5c, 0xfe, 0x6b, 0xd1, 0xf0,
+ 0xd3, 0x1f, 0x2e, 0x19, 0x9a, 0x16, 0x6b, 0xe2, 0x0f, 0x34, 0xfa, 0x82, 0x9c, 0x75, 0x0a, 0x0e,
+ 0x29, 0x13, 0x70, 0x3c, 0x7e, 0x6e, 0xea, 0x58, 0x80, 0x91, 0x90, 0x57, 0xb5, 0x95, 0x5c, 0x8a,
+ 0xb9, 0xa9, 0x63, 0x01, 0xab, 0x1f, 0x13, 0xf2, 0xe4, 0xaf, 0x0b, 0xa1, 0xaf, 0x88, 0x6f, 0x56,
+ 0xce, 0x18, 0x33, 0xff, 0x71, 0xb0, 0xf1, 0x47, 0xd7, 0xb1, 0xf3, 0x4a, 0x9d, 0xd6, 0x0a, 0xdc,
+ 0x56, 0x0f, 0x92, 0x39, 0x96, 0xfa, 0x4e, 0x01, 0x3a, 0x6f, 0x77, 0xf2, 0x7a, 0xbd, 0xb7, 0x1b,
+ 0x79, 0x3b, 0xe7, 0x9d, 0xf5, 0xde, 0xce, 0x78, 0x6f, 0xae, 0xbf, 0x7e, 0x28, 0x54, 0x98, 0x7f,
+ 0x03, 0x55, 0x89, 0xa6, 0x0a, 0x15, 0x14, 0x51, 0x5f, 0x28, 0x1d, 0x09, 0x79, 0x0f, 0x59, 0x64,
+ 0xdf, 0x6f, 0x54, 0xa8, 0x68, 0xf0, 0xba, 0xaf, 0x01, 0xd9, 0xfe, 0xa1, 0x55, 0xde, 0xff, 0x0e,
+ 0x00, 0x00, 0xff, 0xff, 0xe2, 0x21, 0x46, 0x7a, 0x22, 0x03, 0x00, 0x00,
}
diff --git a/src/test/rtd/v1/invocation.proto b/src/test/rtd/v1/invocation.proto
index cb0c52e..06a77af 100644
--- a/src/test/rtd/v1/invocation.proto
+++ b/src/test/rtd/v1/invocation.proto
@@ -8,13 +8,8 @@
option go_package = "go.chromium.org/chromiumos/infra/proto/go/test/rtd/v1;rtd";
-import "lab/peripherals.proto";
import "test/rtd/v1/progress.proto";
-// From chromiumos/config repo.
-import "chromiumos/config/api/hardware_topology.proto";
-import "chromiumos/config/api/topology.proto";
-
// Input to a Remote Test Driver invocation.
//
// TODO(crbug.com/1051691): Link to a reference implementation of Remote Test
@@ -41,21 +36,13 @@
// Contains all configuration data required to interact with a single device
// under test during a test invocation.
message DUT {
- // Peripherals information about the lab deployment of the device.
- lab.Peripherals peripherals = 1;
-
- // The relationship between topology and features is described at
- // https://chromium.googlesource.com/chromiumos/config/+/master/proto/api/hardware_topology.md
- chromiumos.config.api.HardwareTopology hardware_topology = 2;
- chromiumos.config.api.HardwareFeatures hardware_features = 3;
-
// Name for the DUT for using Test Lab Services to interact with the
// device and its peripherals.
//
// The RTD MUST pass this to Test Lab Service RPCs that act on a particular
// DUT. See the tls.OpenDutPortRequest message for an example of where
// this is used.
- string tls_dut_name = 4;
+ string tls_dut_name = 1;
}
// Request for execution of a single test.metadata.Test
