test: Move TLS client configuration to versioned API
* RTD invocation is the only user of the TLS client configuration
* This configuration should be versioned along with the RTD invocation
API.
BUG=chromium:1069902
TEST=./generate.sh
Change-Id: I7c724d4e5f708835c78529e723b450c84c2284a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2157904
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
diff --git a/go/lab/services/client.pb.go b/go/lab/services/client.pb.go
deleted file mode 100644
index 1f871cf..0000000
--- a/go/lab/services/client.pb.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: lab/services/client.proto
-
-package services
-
-import (
- fmt "fmt"
- proto "github.com/golang/protobuf/proto"
- math "math"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
-// Configuration information required by clients of Test Lab Services.
-type ClientConfig struct {
- // Address where Test Lab Services is reachable.
- // This should be an IPv4 or IPv6 address to avoid name
- // resolution issues.
- // IPv4 addresses will be in standard dotted decimal notation.
- // IPv6 addresses will be formatted according to RFC4291, Section
- // 2.2, 1. (no zero compression)
- // If this is a hostname, the RTS should ensure that the hostname
- // can be resolved by the RTD via standard name resolution
- // facilities.
- TlsAddress string `protobuf:"bytes,1,opt,name=tls_address,json=tlsAddress,proto3" json:"tls_address,omitempty"`
- // Port on the tls_address where the service is reachable.
- TlsPort int32 `protobuf:"varint,2,opt,name=tls_port,json=tlsPort,proto3" json:"tls_port,omitempty"`
- // Address where Test Lab Services Wiring is reachable.
- // This has the same format as tls_address.
- TlwAddress string `protobuf:"bytes,3,opt,name=tlw_address,json=tlwAddress,proto3" json:"tlw_address,omitempty"`
- // Port on the tlw_address where the service is reachable.
- TlwPort int32 `protobuf:"varint,4,opt,name=tlw_port,json=tlwPort,proto3" json:"tlw_port,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *ClientConfig) Reset() { *m = ClientConfig{} }
-func (m *ClientConfig) String() string { return proto.CompactTextString(m) }
-func (*ClientConfig) ProtoMessage() {}
-func (*ClientConfig) Descriptor() ([]byte, []int) {
- return fileDescriptor_cf54823844c81740, []int{0}
-}
-
-func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_ClientConfig.Unmarshal(m, b)
-}
-func (m *ClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_ClientConfig.Marshal(b, m, deterministic)
-}
-func (m *ClientConfig) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ClientConfig.Merge(m, src)
-}
-func (m *ClientConfig) XXX_Size() int {
- return xxx_messageInfo_ClientConfig.Size(m)
-}
-func (m *ClientConfig) XXX_DiscardUnknown() {
- xxx_messageInfo_ClientConfig.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ClientConfig proto.InternalMessageInfo
-
-func (m *ClientConfig) GetTlsAddress() string {
- if m != nil {
- return m.TlsAddress
- }
- return ""
-}
-
-func (m *ClientConfig) GetTlsPort() int32 {
- if m != nil {
- return m.TlsPort
- }
- return 0
-}
-
-func (m *ClientConfig) GetTlwAddress() string {
- if m != nil {
- return m.TlwAddress
- }
- return ""
-}
-
-func (m *ClientConfig) GetTlwPort() int32 {
- if m != nil {
- return m.TlwPort
- }
- return 0
-}
-
-func init() {
- proto.RegisterType((*ClientConfig)(nil), "lab.services.ClientConfig")
-}
-
-func init() { proto.RegisterFile("lab/services/client.proto", fileDescriptor_cf54823844c81740) }
-
-var fileDescriptor_cf54823844c81740 = []byte{
- // 191 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xcf, 0xbf, 0x6e, 0x83, 0x30,
- 0x10, 0x06, 0x70, 0xb9, 0xff, 0xeb, 0x32, 0x31, 0xc1, 0x54, 0xd4, 0x89, 0xc9, 0x1e, 0x2a, 0x55,
- 0x5d, 0x13, 0x5e, 0x20, 0x62, 0xcc, 0x12, 0x19, 0x30, 0x8e, 0x25, 0xc3, 0xa1, 0x3b, 0x27, 0x7e,
- 0x83, 0x3c, 0x77, 0x04, 0xc8, 0x51, 0x32, 0xde, 0xf7, 0xdd, 0x6f, 0xf8, 0x78, 0xee, 0x54, 0x23,
- 0x49, 0xe3, 0xd9, 0xb6, 0x9a, 0x64, 0xeb, 0xac, 0x1e, 0xbd, 0x98, 0x10, 0x3c, 0xa4, 0x89, 0x53,
- 0x8d, 0x88, 0xd5, 0xcf, 0x85, 0xf1, 0xa4, 0x5a, 0xea, 0x0a, 0xc6, 0xde, 0x9a, 0xf4, 0x9b, 0x7f,
- 0x79, 0x47, 0x07, 0xd5, 0x75, 0xa8, 0x89, 0x32, 0x56, 0xb0, 0xf2, 0xb3, 0xe6, 0xde, 0xd1, 0x66,
- 0x4d, 0xd2, 0x9c, 0x7f, 0xcc, 0x0f, 0x13, 0xa0, 0xcf, 0x9e, 0x0a, 0x56, 0xbe, 0xd6, 0xef, 0xde,
- 0xd1, 0x0e, 0xd0, 0xaf, 0x36, 0xdc, 0xec, 0x73, 0xb4, 0xe1, 0xc1, 0x86, 0xd5, 0xbe, 0x44, 0x1b,
- 0x66, 0xbb, 0xfd, 0xdf, 0xff, 0x19, 0x10, 0xed, 0x11, 0x61, 0xb0, 0xa7, 0x41, 0x00, 0x1a, 0x19,
- 0x0f, 0x20, 0x69, 0xc7, 0x1e, 0x95, 0x5c, 0x06, 0x48, 0x03, 0xf2, 0x7e, 0x5d, 0xf3, 0xb6, 0xc4,
- 0xbf, 0xd7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x58, 0xbd, 0xea, 0xf3, 0xf4, 0x00, 0x00, 0x00,
-}
diff --git a/go/test/rtd/v1/invocation.pb.go b/go/test/rtd/v1/invocation.pb.go
index 17c5a92..4b46dcd 100644
--- a/go/test/rtd/v1/invocation.pb.go
+++ b/go/test/rtd/v1/invocation.pb.go
@@ -8,7 +8,6 @@
proto "github.com/golang/protobuf/proto"
api "go.chromium.org/chromiumos/config/go/api"
lab "go.chromium.org/chromiumos/infra/proto/go/lab"
- services "go.chromium.org/chromiumos/infra/proto/go/lab/services"
math "math"
)
@@ -40,10 +39,10 @@
Requests []*Request `protobuf:"bytes,3,rep,name=requests,proto3" json:"requests,omitempty"`
// Configuration information for using Test Lab Services to interact
// with DUTs and their peripherals.
- TestLabServicesConfig *services.ClientConfig `protobuf:"bytes,4,opt,name=test_lab_services_config,json=testLabServicesConfig,proto3" json:"test_lab_services_config,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ TestLabServicesConfig *TLSClientConfig `protobuf:"bytes,4,opt,name=test_lab_services_config,json=testLabServicesConfig,proto3" json:"test_lab_services_config,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *Invocation) Reset() { *m = Invocation{} }
@@ -92,7 +91,7 @@
return nil
}
-func (m *Invocation) GetTestLabServicesConfig() *services.ClientConfig {
+func (m *Invocation) GetTestLabServicesConfig() *TLSClientConfig {
if m != nil {
return m.TestLabServicesConfig
}
@@ -314,47 +313,128 @@
return ""
}
+// Configuration information required for using Test Lab & Wiring Services.
+type TLSClientConfig struct {
+ // Address where Test Lab Services is reachable.
+ // This should be an IPv4 or IPv6 address to avoid name
+ // resolution issues.
+ // IPv4 addresses will be in standard dotted decimal notation.
+ // IPv6 addresses will be formatted according to RFC4291, Section
+ // 2.2, 1. (no zero compression)
+ // If this is a hostname, the RTS should ensure that the hostname
+ // can be resolved by the RTD via standard name resolution
+ // facilities.
+ TlsAddress string `protobuf:"bytes,1,opt,name=tls_address,json=tlsAddress,proto3" json:"tls_address,omitempty"`
+ // Port on the tls_address where the service is reachable.
+ TlsPort int32 `protobuf:"varint,2,opt,name=tls_port,json=tlsPort,proto3" json:"tls_port,omitempty"`
+ // Address where Test Lab Services Wiring is reachable.
+ // This has the same format as tls_address.
+ TlwAddress string `protobuf:"bytes,3,opt,name=tlw_address,json=tlwAddress,proto3" json:"tlw_address,omitempty"`
+ // Port on the tlw_address where the service is reachable.
+ TlwPort int32 `protobuf:"varint,4,opt,name=tlw_port,json=tlwPort,proto3" json:"tlw_port,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *TLSClientConfig) Reset() { *m = TLSClientConfig{} }
+func (m *TLSClientConfig) String() string { return proto.CompactTextString(m) }
+func (*TLSClientConfig) ProtoMessage() {}
+func (*TLSClientConfig) Descriptor() ([]byte, []int) {
+ return fileDescriptor_8ce9aeaf734a34de, []int{3}
+}
+
+func (m *TLSClientConfig) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_TLSClientConfig.Unmarshal(m, b)
+}
+func (m *TLSClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_TLSClientConfig.Marshal(b, m, deterministic)
+}
+func (m *TLSClientConfig) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_TLSClientConfig.Merge(m, src)
+}
+func (m *TLSClientConfig) XXX_Size() int {
+ return xxx_messageInfo_TLSClientConfig.Size(m)
+}
+func (m *TLSClientConfig) XXX_DiscardUnknown() {
+ xxx_messageInfo_TLSClientConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TLSClientConfig proto.InternalMessageInfo
+
+func (m *TLSClientConfig) GetTlsAddress() string {
+ if m != nil {
+ return m.TlsAddress
+ }
+ return ""
+}
+
+func (m *TLSClientConfig) GetTlsPort() int32 {
+ if m != nil {
+ return m.TlsPort
+ }
+ return 0
+}
+
+func (m *TLSClientConfig) GetTlwAddress() string {
+ if m != nil {
+ return m.TlwAddress
+ }
+ return ""
+}
+
+func (m *TLSClientConfig) GetTlwPort() int32 {
+ if m != nil {
+ return m.TlwPort
+ }
+ return 0
+}
+
func init() {
proto.RegisterType((*Invocation)(nil), "test.rtd.v1.Invocation")
proto.RegisterType((*DUT)(nil), "test.rtd.v1.DUT")
proto.RegisterType((*Request)(nil), "test.rtd.v1.Request")
proto.RegisterType((*Request_Environment)(nil), "test.rtd.v1.Request.Environment")
+ proto.RegisterType((*TLSClientConfig)(nil), "test.rtd.v1.TLSClientConfig")
}
func init() { proto.RegisterFile("test/rtd/v1/invocation.proto", fileDescriptor_8ce9aeaf734a34de) }
var fileDescriptor_8ce9aeaf734a34de = []byte{
- // 509 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdf, 0x6e, 0xd3, 0x30,
- 0x14, 0xc6, 0xd5, 0x3f, 0xa2, 0x9b, 0xc3, 0x45, 0xb1, 0x98, 0x94, 0x15, 0x2e, 0xaa, 0x6a, 0x88,
- 0xdd, 0x60, 0xb3, 0x72, 0x85, 0x76, 0xb7, 0x16, 0x04, 0x12, 0x42, 0x53, 0xda, 0xdd, 0x70, 0x13,
- 0xb9, 0x8d, 0x9b, 0x5a, 0x4d, 0xec, 0x70, 0xec, 0x74, 0xe2, 0x09, 0x78, 0x0c, 0xde, 0x83, 0xa7,
- 0x43, 0x76, 0x9c, 0x36, 0x81, 0x21, 0xed, 0x2e, 0x39, 0xdf, 0xef, 0x1c, 0x7f, 0xfe, 0x8e, 0x8c,
- 0x5e, 0x1a, 0xae, 0x0d, 0x05, 0x93, 0xd0, 0xfd, 0x15, 0x15, 0x72, 0xaf, 0xd6, 0xcc, 0x08, 0x25,
- 0x49, 0x01, 0xca, 0x28, 0x1c, 0x58, 0x95, 0x80, 0x49, 0xc8, 0xfe, 0x6a, 0x74, 0x96, 0xb1, 0x15,
- 0x2d, 0x38, 0x88, 0x62, 0xcb, 0x81, 0x65, 0xba, 0x62, 0x46, 0xe7, 0xb6, 0xac, 0x39, 0xec, 0xc5,
- 0x9a, 0x6b, 0xba, 0xce, 0x04, 0x97, 0xc6, 0x4b, 0xa3, 0xe6, 0xf0, 0x02, 0x54, 0x0a, 0x5c, 0xd7,
- 0x6d, 0x6f, 0xd6, 0x5b, 0x50, 0xb9, 0x28, 0x73, 0xa5, 0xe9, 0x5a, 0xc9, 0x8d, 0x48, 0x29, 0x2b,
- 0x04, 0xdd, 0x32, 0x48, 0xee, 0x19, 0xf0, 0xd8, 0xa8, 0x42, 0x65, 0x2a, 0xfd, 0xe1, 0xf1, 0x8b,
- 0x87, 0xf1, 0x36, 0x35, 0xf9, 0xd5, 0x45, 0xe8, 0xf3, 0xe1, 0x12, 0x38, 0x41, 0x2f, 0xea, 0x53,
- 0x63, 0x2d, 0xe4, 0x2e, 0xae, 0xdc, 0xc5, 0xd5, 0x80, 0xb0, 0x33, 0xee, 0x5c, 0x06, 0xd3, 0x57,
- 0xa4, 0x71, 0x49, 0x72, 0xeb, 0xf9, 0x85, 0x90, 0xbb, 0x99, 0xa3, 0x67, 0x0e, 0x8e, 0xc2, 0xe2,
- 0x3f, 0x0a, 0xbe, 0x40, 0xfd, 0xa4, 0x34, 0x3a, 0xec, 0x8e, 0x7b, 0x97, 0xc1, 0x74, 0xd8, 0x1a,
- 0x37, 0xbf, 0x5b, 0x46, 0x4e, 0xc5, 0x6f, 0xd1, 0x09, 0xf0, 0xef, 0x25, 0xd7, 0x46, 0x87, 0x3d,
- 0x47, 0x3e, 0x6f, 0x91, 0x51, 0x25, 0x46, 0x07, 0x0a, 0x2f, 0x50, 0x68, 0x81, 0x38, 0x63, 0xab,
- 0xb8, 0xce, 0xb7, 0xb6, 0xde, 0x77, 0xd6, 0x47, 0x24, 0x63, 0x2b, 0x52, 0x6b, 0xa4, 0xe5, 0xf7,
- 0xcc, 0xf6, 0x7e, 0x61, 0xab, 0x85, 0x57, 0xab, 0xf2, 0xe4, 0x67, 0x17, 0xf5, 0xe6, 0x77, 0x4b,
- 0x3c, 0x45, 0x41, 0x63, 0x95, 0x3e, 0x8a, 0xa1, 0x9b, 0x77, 0x7b, 0xac, 0x47, 0x4d, 0x08, 0x2f,
- 0xd1, 0xb3, 0x7f, 0xd6, 0x13, 0x76, 0x5d, 0xe7, 0x6b, 0x72, 0xdc, 0x0f, 0xa9, 0x3c, 0x12, 0x56,
- 0x08, 0xf2, 0xc9, 0xf3, 0x4b, 0x8f, 0x47, 0xc3, 0xed, 0x5f, 0x95, 0xd6, 0xd4, 0x0d, 0x67, 0xa6,
- 0x04, 0x6e, 0x13, 0x7a, 0xcc, 0xd4, 0x8f, 0x1e, 0x3f, 0x4e, 0xad, 0x2b, 0x78, 0x8c, 0x9e, 0x9a,
- 0x4c, 0xc7, 0x49, 0x69, 0x62, 0xc9, 0x72, 0xee, 0x02, 0x3b, 0x8d, 0x90, 0xc9, 0xf4, 0xbc, 0x34,
- 0x5f, 0x59, 0xce, 0x27, 0xbf, 0x3b, 0x68, 0xe0, 0x43, 0xc7, 0x18, 0xf5, 0x1d, 0xd5, 0x71, 0x94,
- 0xfb, 0xb6, 0x35, 0x1b, 0xa1, 0xbb, 0xe0, 0x69, 0xe4, 0xbe, 0xf1, 0x0d, 0x0a, 0xb8, 0xdc, 0x0b,
- 0x50, 0x32, 0xe7, 0xd2, 0x78, 0x97, 0xe3, 0x87, 0xf6, 0x48, 0x3e, 0x1c, 0xb9, 0xa8, 0xd9, 0x34,
- 0x9a, 0xa1, 0xa0, 0xa1, 0xe1, 0x73, 0x74, 0x72, 0xaf, 0x60, 0x17, 0x27, 0x02, 0xfc, 0xf1, 0x03,
- 0xfb, 0x3f, 0x17, 0x60, 0x25, 0xc3, 0xf3, 0xc2, 0x49, 0x95, 0x8b, 0x81, 0xfd, 0x9f, 0x0b, 0xb8,
- 0xb9, 0xfe, 0xf6, 0x3e, 0x55, 0x87, 0x74, 0x88, 0x82, 0x94, 0x36, 0x1e, 0x88, 0x90, 0x1b, 0x60,
- 0xd4, 0x3d, 0x09, 0x9a, 0x2a, 0xda, 0x78, 0x85, 0xd7, 0x60, 0x92, 0xd5, 0x13, 0xa7, 0xbc, 0xfb,
- 0x13, 0x00, 0x00, 0xff, 0xff, 0xd5, 0x64, 0x62, 0xe5, 0xfc, 0x03, 0x00, 0x00,
+ // 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,
}
diff --git a/src/lab/services/client.proto b/src/lab/services/client.proto
deleted file mode 100644
index 1f33bfc..0000000
--- a/src/lab/services/client.proto
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2020 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-syntax = "proto3";
-
-package lab.services;
-
-option go_package = "go.chromium.org/chromiumos/infra/proto/go/lab/services";
-
-// Configuration information required by clients of Test Lab Services.
-message ClientConfig {
- // Address where Test Lab Services is reachable.
- // This should be an IPv4 or IPv6 address to avoid name
- // resolution issues.
- // IPv4 addresses will be in standard dotted decimal notation.
- // IPv6 addresses will be formatted according to RFC4291, Section
- // 2.2, 1. (no zero compression)
- // If this is a hostname, the RTS should ensure that the hostname
- // can be resolved by the RTD via standard name resolution
- // facilities.
- string tls_address = 1;
- // Port on the tls_address where the service is reachable.
- int32 tls_port = 2;
-
- // Address where Test Lab Services Wiring is reachable.
- // This has the same format as tls_address.
- string tlw_address = 3;
- // Port on the tlw_address where the service is reachable.
- int32 tlw_port = 4;
-}
diff --git a/src/test/rtd/v1/invocation.proto b/src/test/rtd/v1/invocation.proto
index c8b14ec..cb0c52e 100644
--- a/src/test/rtd/v1/invocation.proto
+++ b/src/test/rtd/v1/invocation.proto
@@ -9,7 +9,6 @@
option go_package = "go.chromium.org/chromiumos/infra/proto/go/test/rtd/v1;rtd";
import "lab/peripherals.proto";
-import "lab/services/client.proto";
import "test/rtd/v1/progress.proto";
// From chromiumos/config repo.
@@ -36,7 +35,7 @@
// Configuration information for using Test Lab Services to interact
// with DUTs and their peripherals.
- lab.services.ClientConfig test_lab_services_config = 4;
+ TLSClientConfig test_lab_services_config = 4;
}
// Contains all configuration data required to interact with a single device
@@ -111,3 +110,25 @@
// request of the Remote Test Driver.
Environment environment = 3;
}
+
+// Configuration information required for using Test Lab & Wiring Services.
+message TLSClientConfig {
+ // Address where Test Lab Services is reachable.
+ // This should be an IPv4 or IPv6 address to avoid name
+ // resolution issues.
+ // IPv4 addresses will be in standard dotted decimal notation.
+ // IPv6 addresses will be formatted according to RFC4291, Section
+ // 2.2, 1. (no zero compression)
+ // If this is a hostname, the RTS should ensure that the hostname
+ // can be resolved by the RTD via standard name resolution
+ // facilities.
+ string tls_address = 1;
+ // Port on the tls_address where the service is reachable.
+ int32 tls_port = 2;
+
+ // Address where Test Lab Services Wiring is reachable.
+ // This has the same format as tls_address.
+ string tlw_address = 3;
+ // Port on the tlw_address where the service is reachable.
+ int32 tlw_port = 4;
+}
