config: Add DeviceStabilityList.
- So multiple DeviceStability protos can be serialized to a file.
Initial use case will be blocklisting models from testing, see
go/cros-model-cq-testing.
BUG=b:185601333
TEST=CQ
Change-Id: I6f6241d03db57c24f839c1c3f2cd1e8011fc736b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/config/+/2906116
Commit-Queue: Andrew Lamb <andrewlamb@chromium.org>
Commit-Queue: Sean McAllister <smcallis@google.com>
Auto-Submit: Andrew Lamb <andrewlamb@chromium.org>
Reviewed-by: Sean McAllister <smcallis@google.com>
diff --git a/go/test/dut/device_stability.pb.go b/go/test/dut/device_stability.pb.go
index 1c69c0a..2af51cf 100644
--- a/go/test/dut/device_stability.pb.go
+++ b/go/test/dut/device_stability.pb.go
@@ -104,9 +104,49 @@
return DeviceStability_STABILITY_UNKNOWN
}
+type DeviceStabilityList struct {
+ Values []*DeviceStability `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *DeviceStabilityList) Reset() { *m = DeviceStabilityList{} }
+func (m *DeviceStabilityList) String() string { return proto.CompactTextString(m) }
+func (*DeviceStabilityList) ProtoMessage() {}
+func (*DeviceStabilityList) Descriptor() ([]byte, []int) {
+ return fileDescriptor_b7d5c11d7a1c4a4f, []int{1}
+}
+
+func (m *DeviceStabilityList) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_DeviceStabilityList.Unmarshal(m, b)
+}
+func (m *DeviceStabilityList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_DeviceStabilityList.Marshal(b, m, deterministic)
+}
+func (m *DeviceStabilityList) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_DeviceStabilityList.Merge(m, src)
+}
+func (m *DeviceStabilityList) XXX_Size() int {
+ return xxx_messageInfo_DeviceStabilityList.Size(m)
+}
+func (m *DeviceStabilityList) XXX_DiscardUnknown() {
+ xxx_messageInfo_DeviceStabilityList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeviceStabilityList proto.InternalMessageInfo
+
+func (m *DeviceStabilityList) GetValues() []*DeviceStability {
+ if m != nil {
+ return m.Values
+ }
+ return nil
+}
+
func init() {
proto.RegisterEnum("chromiumos.test.dut.DeviceStability_Stability", DeviceStability_Stability_name, DeviceStability_Stability_value)
proto.RegisterType((*DeviceStability)(nil), "chromiumos.test.dut.DeviceStability")
+ proto.RegisterType((*DeviceStabilityList)(nil), "chromiumos.test.dut.DeviceStabilityList")
}
func init() {
@@ -114,22 +154,23 @@
}
var fileDescriptor_b7d5c11d7a1c4a4f = []byte{
- // 261 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4a, 0xce, 0x28, 0xca,
- 0xcf, 0xcd, 0x2c, 0xcd, 0xcd, 0x2f, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0xd1, 0x4f, 0x29, 0x2d, 0xd1,
- 0x4f, 0x49, 0x2d, 0xcb, 0x4c, 0x4e, 0x8d, 0x2f, 0x2e, 0x49, 0x4c, 0xca, 0xcc, 0xc9, 0x2c, 0xa9,
- 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x46, 0xa8, 0xd5, 0x03, 0xa9, 0xd5, 0x4b, 0x29,
- 0x2d, 0x91, 0x52, 0x47, 0x37, 0x20, 0xb1, 0x20, 0x13, 0x64, 0x48, 0x7c, 0x62, 0x49, 0x49, 0x51,
- 0x66, 0x52, 0x69, 0x49, 0x2a, 0x44, 0xb7, 0xd2, 0x63, 0x46, 0x2e, 0x7e, 0x17, 0xb0, 0xc1, 0xc1,
- 0x30, 0x73, 0x85, 0x5c, 0xb8, 0x78, 0x40, 0x4a, 0x93, 0x8b, 0x32, 0x4b, 0x52, 0x8b, 0x32, 0x13,
- 0x25, 0x18, 0x15, 0x98, 0x35, 0xb8, 0x8d, 0x14, 0xf5, 0xd0, 0x2d, 0x4a, 0x2c, 0xc8, 0xd4, 0x73,
- 0x29, 0x2d, 0x71, 0x86, 0xa8, 0xcb, 0xcf, 0x0b, 0xe2, 0x4e, 0x81, 0xf3, 0x12, 0x85, 0x7c, 0xb8,
- 0x38, 0xe1, 0x4e, 0x95, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x33, 0xd2, 0xd3, 0xc3, 0xe2, 0x56, 0x3d,
- 0x34, 0xeb, 0xf5, 0xe0, 0xac, 0x20, 0x84, 0x01, 0x4a, 0x36, 0x5c, 0x9c, 0x08, 0x07, 0x8a, 0x72,
- 0x09, 0x06, 0x87, 0x38, 0x3a, 0x79, 0xfa, 0x78, 0x86, 0x44, 0xc6, 0x87, 0xfa, 0x79, 0xfb, 0xf9,
- 0x87, 0xfb, 0x09, 0x30, 0x08, 0x71, 0x71, 0xb1, 0x81, 0x84, 0x7d, 0x5c, 0x05, 0x18, 0x85, 0x78,
- 0xb8, 0x38, 0x42, 0xfd, 0xa0, 0x3c, 0x26, 0x27, 0xfd, 0x28, 0xdd, 0xf4, 0x7c, 0xb8, 0xe5, 0x7a,
- 0xf9, 0x45, 0xe9, 0xfa, 0x48, 0x01, 0x94, 0x9c, 0x9f, 0x97, 0x96, 0x99, 0xae, 0x9f, 0x9e, 0x0f,
- 0x0f, 0xeb, 0x24, 0x36, 0x70, 0xe8, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x62, 0x50, 0x4d,
- 0xba, 0x89, 0x01, 0x00, 0x00,
+ // 288 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x51, 0x4b, 0xfb, 0x30,
+ 0x14, 0xc5, 0xff, 0xdd, 0x1f, 0x8a, 0xcb, 0x86, 0xce, 0x0c, 0x61, 0xf8, 0x34, 0x8b, 0xe0, 0x10,
+ 0x4c, 0x60, 0xbe, 0xee, 0xc5, 0x59, 0x1f, 0x86, 0xa5, 0x42, 0xbb, 0x21, 0xfa, 0x52, 0xd2, 0x36,
+ 0xd6, 0x0b, 0xdb, 0x52, 0xd2, 0x9b, 0x81, 0x9f, 0xd7, 0x2f, 0x22, 0xdd, 0x6a, 0x2b, 0xc5, 0x07,
+ 0xdf, 0x72, 0xc3, 0x39, 0xbf, 0x73, 0x72, 0x43, 0xae, 0x93, 0x77, 0xad, 0x36, 0x60, 0x36, 0xaa,
+ 0xe0, 0x28, 0x0b, 0xe4, 0xa9, 0x41, 0x9e, 0xca, 0x1d, 0x24, 0x32, 0x2a, 0x50, 0xc4, 0xb0, 0x06,
+ 0xfc, 0x60, 0xb9, 0x56, 0xa8, 0xe8, 0xb0, 0xd1, 0xb2, 0x52, 0xcb, 0x52, 0x83, 0xe7, 0x57, 0x6d,
+ 0x80, 0xc8, 0xa1, 0x84, 0x44, 0x02, 0x51, 0x43, 0x6c, 0x50, 0x1e, 0xdc, 0xce, 0xa7, 0x45, 0x4e,
+ 0xdc, 0x3d, 0x38, 0xfc, 0xe6, 0x52, 0x97, 0xf4, 0x4b, 0x69, 0xa2, 0x01, 0xa5, 0x06, 0x31, 0xb2,
+ 0xc6, 0xff, 0x27, 0xbd, 0xe9, 0x05, 0x6b, 0x07, 0x89, 0x1c, 0x98, 0x6b, 0xf0, 0xfe, 0xa0, 0x53,
+ 0xdb, 0xa0, 0x97, 0xd6, 0x93, 0xa0, 0x1e, 0xe9, 0xd6, 0x55, 0x47, 0x9d, 0xb1, 0x35, 0x39, 0x9e,
+ 0x32, 0xf6, 0x4b, 0x57, 0xd6, 0x8a, 0x67, 0xf5, 0x29, 0x68, 0x00, 0xce, 0x8c, 0x74, 0x9b, 0x82,
+ 0x67, 0xe4, 0x34, 0x5c, 0xde, 0xcd, 0x17, 0xde, 0x62, 0xf9, 0x12, 0xad, 0xfc, 0x47, 0xff, 0xe9,
+ 0xd9, 0x1f, 0xfc, 0xa3, 0x84, 0xd8, 0xe5, 0xb5, 0xf7, 0x30, 0xb0, 0x68, 0x9f, 0x1c, 0xad, 0xfc,
+ 0x6a, 0xea, 0x38, 0x21, 0x19, 0xb6, 0x52, 0x3c, 0x28, 0x90, 0xce, 0x88, 0xbd, 0x13, 0x6b, 0x23,
+ 0x8b, 0xea, 0x89, 0x97, 0x7f, 0xe9, 0x17, 0x54, 0x9e, 0x39, 0x7f, 0xbd, 0xc9, 0x54, 0xed, 0x60,
+ 0x4a, 0x67, 0xfc, 0xc7, 0xd6, 0x13, 0xb5, 0x7d, 0x83, 0x8c, 0x67, 0xaa, 0xfe, 0xc0, 0xd8, 0xde,
+ 0xaf, 0xfc, 0xf6, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xeb, 0x96, 0x77, 0xde, 0x01, 0x00, 0x00,
}
diff --git a/proto/chromiumos/test/dut/device_stability.proto b/proto/chromiumos/test/dut/device_stability.proto
index a7d5432..6836df9 100644
--- a/proto/chromiumos/test/dut/device_stability.proto
+++ b/proto/chromiumos/test/dut/device_stability.proto
@@ -29,3 +29,7 @@
Stability stability = 2;
}
+
+message DeviceStabilityList {
+ repeated DeviceStability values = 1;
+}
\ No newline at end of file
diff --git a/python/chromiumos/test/dut/device_stability_pb2.py b/python/chromiumos/test/dut/device_stability_pb2.py
index 4abf079..ae0cd3b 100644
--- a/python/chromiumos/test/dut/device_stability_pb2.py
+++ b/python/chromiumos/test/dut/device_stability_pb2.py
@@ -20,7 +20,7 @@
package='chromiumos.test.dut',
syntax='proto3',
serialized_options=_b('Z-go.chromium.org/chromiumos/config/go/test/dut'),
- serialized_pb=_b('\n*chromiumos/test/dut/device_stability.proto\x12\x13\x63hromiumos.test.dut\x1a\'chromiumos/test/api/dut_attribute.proto\"\xcb\x01\n\x0f\x44\x65viceStability\x12\x37\n\x0c\x64ut_criteria\x18\x01 \x03(\x0b\x32!.chromiumos.test.api.DutCriterion\x12\x41\n\tstability\x18\x02 \x01(\x0e\x32..chromiumos.test.dut.DeviceStability.Stability\"<\n\tStability\x12\x15\n\x11STABILITY_UNKNOWN\x10\x00\x12\n\n\x06STABLE\x10\x01\x12\x0c\n\x08UNSTABLE\x10\x02\x42/Z-go.chromium.org/chromiumos/config/go/test/dutb\x06proto3')
+ serialized_pb=_b('\n*chromiumos/test/dut/device_stability.proto\x12\x13\x63hromiumos.test.dut\x1a\'chromiumos/test/api/dut_attribute.proto\"\xcb\x01\n\x0f\x44\x65viceStability\x12\x37\n\x0c\x64ut_criteria\x18\x01 \x03(\x0b\x32!.chromiumos.test.api.DutCriterion\x12\x41\n\tstability\x18\x02 \x01(\x0e\x32..chromiumos.test.dut.DeviceStability.Stability\"<\n\tStability\x12\x15\n\x11STABILITY_UNKNOWN\x10\x00\x12\n\n\x06STABLE\x10\x01\x12\x0c\n\x08UNSTABLE\x10\x02\"K\n\x13\x44\x65viceStabilityList\x12\x34\n\x06values\x18\x01 \x03(\x0b\x32$.chromiumos.test.dut.DeviceStabilityB/Z-go.chromium.org/chromiumos/config/go/test/dutb\x06proto3')
,
dependencies=[chromiumos_dot_test_dot_api_dot_dut__attribute__pb2.DESCRIPTOR,])
@@ -91,10 +91,43 @@
serialized_end=312,
)
+
+_DEVICESTABILITYLIST = _descriptor.Descriptor(
+ name='DeviceStabilityList',
+ full_name='chromiumos.test.dut.DeviceStabilityList',
+ filename=None,
+ file=DESCRIPTOR,
+ containing_type=None,
+ fields=[
+ _descriptor.FieldDescriptor(
+ name='values', full_name='chromiumos.test.dut.DeviceStabilityList.values', index=0,
+ number=1, type=11, cpp_type=10, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+ serialized_options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ ],
+ serialized_options=None,
+ is_extendable=False,
+ syntax='proto3',
+ extension_ranges=[],
+ oneofs=[
+ ],
+ serialized_start=314,
+ serialized_end=389,
+)
+
_DEVICESTABILITY.fields_by_name['dut_criteria'].message_type = chromiumos_dot_test_dot_api_dot_dut__attribute__pb2._DUTCRITERION
_DEVICESTABILITY.fields_by_name['stability'].enum_type = _DEVICESTABILITY_STABILITY
_DEVICESTABILITY_STABILITY.containing_type = _DEVICESTABILITY
+_DEVICESTABILITYLIST.fields_by_name['values'].message_type = _DEVICESTABILITY
DESCRIPTOR.message_types_by_name['DeviceStability'] = _DEVICESTABILITY
+DESCRIPTOR.message_types_by_name['DeviceStabilityList'] = _DEVICESTABILITYLIST
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
DeviceStability = _reflection.GeneratedProtocolMessageType('DeviceStability', (_message.Message,), dict(
@@ -104,6 +137,13 @@
))
_sym_db.RegisterMessage(DeviceStability)
+DeviceStabilityList = _reflection.GeneratedProtocolMessageType('DeviceStabilityList', (_message.Message,), dict(
+ DESCRIPTOR = _DEVICESTABILITYLIST,
+ __module__ = 'chromiumos.test.dut.device_stability_pb2'
+ # @@protoc_insertion_point(class_scope:chromiumos.test.dut.DeviceStabilityList)
+ ))
+_sym_db.RegisterMessage(DeviceStabilityList)
+
DESCRIPTOR._options = None
# @@protoc_insertion_point(module_scope)