test_platform: add cros inventory service field
skylab_local_state will get dut info from inventory V2 service instead
of crosskylabadmin.
BUG=chromium:1056474
TEST=None
Change-Id: I3853d5eaf71a964c3810785c1a37523f302c754c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2284393
Reviewed-by: Alex Zamorzaev <zamorzaev@chromium.org>
Reviewed-by: Eshwar Narayan <eshwarn@chromium.org>
Tested-by: Eshwar Narayan <eshwarn@chromium.org>
Commit-Queue: Eshwar Narayan <eshwarn@chromium.org>
diff --git a/go/test_platform/skylab_local_state/common.pb.go b/go/test_platform/skylab_local_state/common.pb.go
index 02262b9..3b1b1ed 100644
--- a/go/test_platform/skylab_local_state/common.pb.go
+++ b/go/test_platform/skylab_local_state/common.pb.go
@@ -25,7 +25,9 @@
// Admin service host, e.g. foo.appspot.com.
AdminService string `protobuf:"bytes,1,opt,name=admin_service,json=adminService,proto3" json:"admin_service,omitempty"`
// Autotest directory on the drone, e.g. "/usr/local/autotest".
- AutotestDir string `protobuf:"bytes,2,opt,name=autotest_dir,json=autotestDir,proto3" json:"autotest_dir,omitempty"`
+ AutotestDir string `protobuf:"bytes,2,opt,name=autotest_dir,json=autotestDir,proto3" json:"autotest_dir,omitempty"`
+ // Inventory V2 service host, e.g. cros-lab-inventory.appspot.com.
+ CrosInventoryService string `protobuf:"bytes,3,opt,name=cros_inventory_service,json=crosInventoryService,proto3" json:"cros_inventory_service,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -70,6 +72,13 @@
return ""
}
+func (m *Config) GetCrosInventoryService() string {
+ if m != nil {
+ return m.CrosInventoryService
+ }
+ return ""
+}
+
func init() {
proto.RegisterType((*Config)(nil), "test_platform.skylab_local_state.Config")
}
@@ -79,17 +88,19 @@
}
var fileDescriptor_484976b1b807e36b = []byte{
- // 182 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0xcf, 0xb1, 0x0a, 0xc2, 0x30,
- 0x10, 0x80, 0x61, 0xea, 0x50, 0x30, 0xd6, 0xa5, 0x53, 0xc7, 0xaa, 0x8b, 0x8b, 0xc9, 0xe0, 0x1b,
- 0xa8, 0x93, 0x38, 0x88, 0x6e, 0x2e, 0x21, 0x4d, 0xd3, 0x18, 0x4c, 0x72, 0xe5, 0x92, 0x0a, 0xbe,
- 0xbd, 0x10, 0xe9, 0x20, 0x0e, 0x8e, 0xf7, 0xf3, 0x71, 0xdc, 0x91, 0x4d, 0x54, 0x21, 0xf2, 0xde,
- 0x8a, 0xd8, 0x01, 0x3a, 0x16, 0x1e, 0x2f, 0x2b, 0x1a, 0x6e, 0x41, 0x0a, 0xcb, 0x43, 0x14, 0x51,
- 0x31, 0x09, 0xce, 0x81, 0xa7, 0x3d, 0x42, 0x84, 0xb2, 0xfe, 0xe2, 0xf4, 0x97, 0x2f, 0xcf, 0x24,
- 0xdf, 0x83, 0xef, 0x8c, 0x2e, 0x57, 0x64, 0x2e, 0x5a, 0x67, 0x3c, 0x0f, 0x0a, 0x9f, 0x46, 0xaa,
- 0x2a, 0xab, 0xb3, 0xf5, 0xf4, 0x52, 0xa4, 0x78, 0xfd, 0xb4, 0x72, 0x41, 0x0a, 0x31, 0x44, 0x48,
- 0x6b, 0x5b, 0x83, 0xd5, 0x24, 0x99, 0xd9, 0xd8, 0x0e, 0x06, 0x77, 0xa7, 0xdb, 0x51, 0x03, 0x95,
- 0x77, 0x04, 0x67, 0x06, 0x47, 0x01, 0x35, 0x1b, 0x07, 0x08, 0xcc, 0xf8, 0x0e, 0x05, 0x4b, 0xd7,
- 0x31, 0x0d, 0xec, 0xdf, 0x3b, 0x4d, 0x9e, 0xe8, 0xf6, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x76, 0x86,
- 0x11, 0x75, 0xf9, 0x00, 0x00, 0x00,
+ // 212 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xb1, 0x4a, 0xc5, 0x30,
+ 0x14, 0x86, 0xa9, 0xc2, 0x05, 0xe3, 0x75, 0x09, 0x22, 0x77, 0xac, 0xba, 0xb8, 0x98, 0x0c, 0xfa,
+ 0x04, 0xea, 0xa2, 0x38, 0xe9, 0xe6, 0x12, 0xd2, 0x34, 0x8d, 0x07, 0x93, 0x9c, 0x72, 0x72, 0x5a,
+ 0xe8, 0x0b, 0xf8, 0xdc, 0x62, 0xb4, 0x82, 0x38, 0x38, 0xe6, 0xfb, 0x3f, 0x3e, 0xc8, 0x11, 0x97,
+ 0xec, 0x0b, 0x9b, 0x31, 0x5a, 0x1e, 0x90, 0x92, 0x2e, 0x6f, 0x4b, 0xb4, 0x9d, 0x89, 0xe8, 0x6c,
+ 0x34, 0x85, 0x2d, 0x7b, 0xed, 0x30, 0x25, 0xcc, 0x6a, 0x24, 0x64, 0x94, 0xed, 0x2f, 0x5d, 0xfd,
+ 0xd5, 0xcf, 0xde, 0x1b, 0xb1, 0xb9, 0xc5, 0x3c, 0x40, 0x90, 0xe7, 0xe2, 0xc8, 0xf6, 0x09, 0xb2,
+ 0x29, 0x9e, 0x66, 0x70, 0x7e, 0xd7, 0xb4, 0xcd, 0xc5, 0xc1, 0xd3, 0xb6, 0xc2, 0xe7, 0x2f, 0x26,
+ 0x4f, 0xc5, 0xd6, 0x4e, 0x8c, 0xb5, 0xdb, 0x03, 0xed, 0xf6, 0xaa, 0x73, 0xb8, 0xb2, 0x3b, 0x20,
+ 0x79, 0x2d, 0x4e, 0x1c, 0x61, 0x31, 0x90, 0x67, 0x9f, 0x19, 0x69, 0xf9, 0x09, 0xee, 0x57, 0xf9,
+ 0xf8, 0x73, 0xbd, 0x5f, 0xc7, 0xef, 0xf0, 0xcd, 0xe3, 0xcb, 0x43, 0x40, 0xe5, 0x5e, 0x09, 0x13,
+ 0x4c, 0x49, 0x21, 0x05, 0xbd, 0x3e, 0xb0, 0x68, 0xc8, 0x03, 0x59, 0x5d, 0x3f, 0xa5, 0x03, 0xea,
+ 0xff, 0xae, 0xd0, 0x6d, 0xaa, 0x7a, 0xf5, 0x11, 0x00, 0x00, 0xff, 0xff, 0xf0, 0xab, 0x77, 0xdf,
+ 0x30, 0x01, 0x00, 0x00,
}
diff --git a/go/test_platform/skylab_test_runner/config.pb.go b/go/test_platform/skylab_test_runner/config.pb.go
index 800d273..04495ef 100644
--- a/go/test_platform/skylab_test_runner/config.pb.go
+++ b/go/test_platform/skylab_test_runner/config.pb.go
@@ -80,7 +80,9 @@
// platform services.
type Config_Lab struct {
// Admin service host, e.g. foo.appspot.com.
- AdminService string `protobuf:"bytes,1,opt,name=admin_service,json=adminService,proto3" json:"admin_service,omitempty"`
+ AdminService string `protobuf:"bytes,1,opt,name=admin_service,json=adminService,proto3" json:"admin_service,omitempty"`
+ // Inventory V2 service host, e.g. cros-lab-inventory.appspot.com.
+ CrosInventoryService string `protobuf:"bytes,2,opt,name=cros_inventory_service,json=crosInventoryService,proto3" json:"cros_inventory_service,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -118,6 +120,13 @@
return ""
}
+func (m *Config_Lab) GetCrosInventoryService() string {
+ if m != nil {
+ return m.CrosInventoryService
+ }
+ return ""
+}
+
// Harness defines configuration parameters related to the test harness
// (autotest, tast, etc).
type Config_Harness struct {
@@ -224,25 +233,26 @@
}
var fileDescriptor_b2c5f9be4f684081 = []byte{
- // 307 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x4b, 0xc3, 0x30,
- 0x14, 0xc7, 0xd9, 0x0a, 0x1d, 0x7b, 0x9b, 0x97, 0xe0, 0x61, 0xec, 0x20, 0x53, 0x2f, 0x43, 0x34,
- 0x19, 0x7a, 0xf7, 0xa0, 0x82, 0x32, 0x06, 0x83, 0xee, 0xe6, 0xc1, 0x92, 0x76, 0x6d, 0x17, 0x6c,
- 0xf3, 0xc6, 0x4b, 0x2a, 0xec, 0x73, 0xf8, 0x85, 0x65, 0xaf, 0x2b, 0x28, 0x1e, 0xb6, 0x63, 0xfe,
- 0xef, 0xff, 0xfb, 0xf1, 0x42, 0x02, 0x77, 0x3e, 0x73, 0x3e, 0xde, 0x96, 0xda, 0xe7, 0x48, 0x95,
- 0x72, 0x9f, 0xbb, 0x52, 0x27, 0x31, 0x87, 0x54, 0x5b, 0x9b, 0x91, 0x4a, 0xd1, 0xe6, 0xa6, 0x90,
- 0x5b, 0x42, 0x8f, 0x62, 0xf2, 0xa7, 0x2e, 0xff, 0xd7, 0xaf, 0xbe, 0x03, 0x08, 0x9f, 0x19, 0x11,
- 0x8f, 0x10, 0x94, 0x3a, 0x19, 0x75, 0x26, 0x9d, 0xe9, 0xe0, 0xfe, 0x56, 0x1e, 0x43, 0x65, 0x83,
- 0xc9, 0x85, 0x4e, 0xa2, 0x3d, 0x28, 0xe6, 0xd0, 0xdb, 0x68, 0xb2, 0x99, 0x73, 0xa3, 0x2e, 0x3b,
- 0x66, 0x27, 0x3b, 0xde, 0x1a, 0x2e, 0x6a, 0x05, 0xe2, 0x15, 0x42, 0xac, 0xfd, 0xb6, 0xf6, 0xa3,
- 0x80, 0x55, 0xea, 0x64, 0xd5, 0x92, 0xb1, 0xe8, 0x80, 0x8f, 0x6f, 0x20, 0x58, 0xe8, 0x44, 0x5c,
- 0xc3, 0x99, 0x5e, 0x57, 0xc6, 0xc6, 0x2e, 0xa3, 0x2f, 0x93, 0x66, 0x7c, 0xcb, 0x7e, 0x34, 0xe4,
- 0x70, 0xd5, 0x64, 0xe3, 0x0f, 0xe8, 0x1d, 0x16, 0x11, 0x97, 0x30, 0xd4, 0xb5, 0x47, 0xf6, 0xaf,
- 0x0d, 0x1d, 0xea, 0x83, 0x36, 0x7b, 0x31, 0x24, 0x66, 0x70, 0xee, 0x76, 0x36, 0xdd, 0xc4, 0x98,
- 0xe7, 0x25, 0xea, 0x75, 0xec, 0xea, 0x64, 0x5f, 0xed, 0x72, 0x55, 0xf0, 0x6c, 0xd9, 0x8c, 0x56,
- 0x3c, 0x19, 0x4f, 0x21, 0x6c, 0xb6, 0x13, 0x17, 0x30, 0x28, 0x5c, 0x4c, 0x88, 0xbf, 0xed, 0xfd,
- 0xc2, 0x45, 0x88, 0x7b, 0xf7, 0xd3, 0xe2, 0x7d, 0x5e, 0xa0, 0x4c, 0x37, 0x84, 0x95, 0xa9, 0x2b,
- 0x89, 0x54, 0xa8, 0xf6, 0x80, 0x4e, 0x19, 0x9b, 0x93, 0x56, 0xfc, 0xc2, 0xaa, 0x40, 0x75, 0xec,
- 0x4b, 0x24, 0x21, 0x57, 0x1f, 0x7e, 0x02, 0x00, 0x00, 0xff, 0xff, 0x03, 0xb2, 0x42, 0x9f, 0x3d,
- 0x02, 0x00, 0x00,
+ // 332 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x4b, 0xc3, 0x30,
+ 0x14, 0xc6, 0xd9, 0x0a, 0x1d, 0xcb, 0xe6, 0x25, 0x0c, 0x19, 0x3b, 0xc8, 0xd4, 0xcb, 0x0e, 0x9a,
+ 0x0c, 0xf5, 0xec, 0x41, 0x05, 0x75, 0x0c, 0x06, 0xdd, 0xcd, 0x83, 0x31, 0xed, 0xda, 0x2e, 0xd8,
+ 0xe6, 0x8d, 0x97, 0x74, 0xd0, 0x3f, 0xd1, 0xff, 0x4a, 0x9a, 0xb6, 0xa2, 0x78, 0xd8, 0x8e, 0xf9,
+ 0xbe, 0xef, 0xf7, 0xe5, 0x3d, 0x78, 0xe4, 0xda, 0xc6, 0xc6, 0x8a, 0x5d, 0x26, 0x6d, 0x02, 0x98,
+ 0x73, 0xf3, 0x59, 0x66, 0x32, 0x14, 0x4e, 0xc4, 0x42, 0xeb, 0x18, 0x79, 0x04, 0x3a, 0x51, 0x29,
+ 0xdb, 0x21, 0x58, 0xa0, 0xd3, 0x3f, 0x71, 0xf6, 0x3f, 0x7e, 0xf1, 0xe5, 0x11, 0xff, 0xd1, 0x21,
+ 0xf4, 0x9e, 0x78, 0x99, 0x0c, 0xc7, 0x9d, 0x69, 0x67, 0x36, 0xb8, 0xb9, 0x62, 0x87, 0x50, 0x56,
+ 0x63, 0x6c, 0x29, 0xc3, 0xa0, 0x02, 0xe9, 0x82, 0xf4, 0xb6, 0x12, 0x75, 0x6c, 0xcc, 0xb8, 0xeb,
+ 0x3a, 0xe6, 0x47, 0x77, 0xbc, 0xd4, 0x5c, 0xd0, 0x16, 0xd0, 0x67, 0xe2, 0x43, 0x61, 0x77, 0x85,
+ 0x1d, 0x7b, 0xae, 0x8a, 0x1f, 0x5d, 0xb5, 0x72, 0x58, 0xd0, 0xe0, 0x93, 0x0f, 0xe2, 0x2d, 0x65,
+ 0x48, 0x2f, 0xc9, 0x89, 0xdc, 0xe4, 0x4a, 0x0b, 0x13, 0xe3, 0x5e, 0x45, 0xb1, 0xdb, 0xb2, 0x1f,
+ 0x0c, 0x9d, 0xb8, 0xae, 0x35, 0x7a, 0x47, 0x4e, 0x23, 0x04, 0x23, 0x94, 0xde, 0xc7, 0xda, 0x02,
+ 0x96, 0x3f, 0xe9, 0xae, 0x4b, 0x8f, 0x2a, 0xf7, 0xb5, 0x35, 0x1b, 0x6a, 0xf2, 0x4e, 0x7a, 0xcd,
+ 0xf8, 0xf4, 0x9c, 0x0c, 0x65, 0x61, 0xc1, 0x4d, 0xb5, 0x51, 0xd8, 0x7c, 0x32, 0x68, 0xb5, 0x27,
+ 0x85, 0x74, 0x4e, 0x46, 0xa6, 0xd4, 0xd1, 0x56, 0x40, 0x92, 0x64, 0x20, 0x37, 0xc2, 0x14, 0x61,
+ 0x15, 0xad, 0x7f, 0xa0, 0xce, 0x5b, 0xd5, 0xd6, 0xda, 0x39, 0x93, 0x19, 0xf1, 0xeb, 0x9d, 0xe8,
+ 0x19, 0x19, 0xa4, 0x46, 0x20, 0xc0, 0xef, 0xf6, 0x7e, 0x6a, 0x02, 0x80, 0xaa, 0xfb, 0x61, 0xf9,
+ 0xb6, 0x48, 0x81, 0x45, 0x5b, 0x84, 0x5c, 0x15, 0x39, 0x03, 0x4c, 0x79, 0xfb, 0x00, 0xc3, 0x95,
+ 0x4e, 0x50, 0x72, 0x77, 0x17, 0x3c, 0x05, 0x7e, 0xe8, 0x90, 0x42, 0xdf, 0x45, 0x6f, 0xbf, 0x03,
+ 0x00, 0x00, 0xff, 0xff, 0x6a, 0x0d, 0x2d, 0x0a, 0x73, 0x02, 0x00, 0x00,
}
diff --git a/src/test_platform/skylab_local_state/common.proto b/src/test_platform/skylab_local_state/common.proto
index 773f1eb..ab93f6e 100644
--- a/src/test_platform/skylab_local_state/common.proto
+++ b/src/test_platform/skylab_local_state/common.proto
@@ -15,5 +15,8 @@
// Autotest directory on the drone, e.g. "/usr/local/autotest".
string autotest_dir = 2;
+
+ // Inventory V2 service host, e.g. cros-lab-inventory.appspot.com.
+ string cros_inventory_service = 3;
}
diff --git a/src/test_platform/skylab_test_runner/config.proto b/src/test_platform/skylab_test_runner/config.proto
index f0f398d..b9b7f90 100644
--- a/src/test_platform/skylab_test_runner/config.proto
+++ b/src/test_platform/skylab_test_runner/config.proto
@@ -15,6 +15,9 @@
message Lab {
// Admin service host, e.g. foo.appspot.com.
string admin_service = 1;
+
+ // Inventory V2 service host, e.g. cros-lab-inventory.appspot.com.
+ string cros_inventory_service = 2;
}
// Harness defines configuration parameters related to the test harness
