diff --git a/Makefile.validation b/Makefile.validation index c6279df11..77072081e 100644 --- a/Makefile.validation +++ b/Makefile.validation @@ -11,7 +11,7 @@ coverage: go tool cover -html=coverage.out -o coverage.html test: - ${GO_ENV_VARS} go test ${LDFLAGS} `go list ./... | grep -v halmgr | grep pkg` -race -cover -coverprofile=coverage.out -covermode=atomic + ${GO_ENV_VARS} go test ${LDFLAGS} `go list ./... | grep pkg` -race -cover -coverprofile=coverage.out -covermode=atomic # Run tests for pr-validation with writing output to log file # Test are different (ginkgo, go testing, etc.) so can't use native ginkgo methods to print junit output. diff --git a/api/generated/v1/types.pb.go b/api/generated/v1/types.pb.go index 8065b782a..ce6bed51b 100644 --- a/api/generated/v1/types.pb.go +++ b/api/generated/v1/types.pb.go @@ -45,6 +45,7 @@ type Drive struct { SecurityStatus string `protobuf:"bytes,20,opt,name=SecurityStatus,proto3" json:"SecurityStatus,omitempty"` EncryptionCapable string `protobuf:"bytes,21,opt,name=EncryptionCapable,proto3" json:"EncryptionCapable,omitempty"` EncryptionProtocol string `protobuf:"bytes,22,opt,name=EncryptionProtocol,proto3" json:"EncryptionProtocol,omitempty"` + SmartInfo string `protobuf:"bytes,23,opt,name=SmartInfo,proto3" json:"SmartInfo,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -229,6 +230,13 @@ func (m *Drive) GetEncryptionProtocol() string { return "" } +func (m *Drive) GetSmartInfo() string { + if m != nil { + return m.SmartInfo + } + return "" +} + type Volume struct { Id string `protobuf:"bytes,1,opt,name=Id,proto3" json:"Id,omitempty"` Location string `protobuf:"bytes,2,opt,name=Location,proto3" json:"Location,omitempty"` @@ -948,66 +956,67 @@ func init() { func init() { proto.RegisterFile("types.proto", fileDescriptor_d938547f84707355) } var fileDescriptor_d938547f84707355 = []byte{ - // 968 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x06, 0xf5, 0x67, 0x6b, 0x64, 0x3b, 0xf6, 0xda, 0x35, 0xb6, 0x86, 0x51, 0x08, 0x04, 0x5a, - 0x18, 0x45, 0x20, 0xb4, 0xee, 0xa1, 0x41, 0x50, 0x14, 0x8d, 0x2d, 0x27, 0x21, 0x9a, 0x38, 0x02, - 0x55, 0xe7, 0xd0, 0xdb, 0x9a, 0x9c, 0x5a, 0x44, 0x29, 0x91, 0xdd, 0xa5, 0x14, 0xd0, 0x97, 0xa2, - 0xaf, 0xd0, 0x67, 0xe8, 0x73, 0xf4, 0x01, 0x7a, 0xed, 0xad, 0x4f, 0x53, 0xcc, 0x2e, 0x45, 0x2e, - 0x25, 0x5e, 0x72, 0x9b, 0xf9, 0x66, 0x66, 0x67, 0xf8, 0xcd, 0xc7, 0x25, 0x61, 0x90, 0xe5, 0x29, - 0xaa, 0x51, 0x2a, 0x93, 0x2c, 0x61, 0xdd, 0xd5, 0xd7, 0x22, 0x8d, 0xdc, 0x7f, 0x3b, 0xd0, 0x1d, - 0xcb, 0x68, 0x85, 0x8c, 0x41, 0xe7, 0xee, 0xce, 0x1b, 0x73, 0x67, 0xe8, 0x5c, 0xf4, 0x7d, 0x6d, - 0xb3, 0x43, 0x68, 0xbf, 0xf7, 0xc6, 0xbc, 0xa5, 0x21, 0x32, 0x09, 0x99, 0x78, 0x63, 0xde, 0x36, - 0xc8, 0xc4, 0x1b, 0x33, 0x17, 0xf6, 0xa6, 0x28, 0x23, 0x11, 0xdf, 0x2e, 0xe7, 0xf7, 0x28, 0x79, - 0x47, 0x87, 0x6a, 0x18, 0x3b, 0x85, 0xde, 0x6b, 0x14, 0x71, 0x36, 0xe3, 0x5d, 0x1d, 0x2d, 0x3c, - 0xea, 0xf9, 0x53, 0x9e, 0x22, 0xef, 0x99, 0x9e, 0x64, 0x13, 0x36, 0x8d, 0x1e, 0x91, 0xef, 0x0c, - 0x9d, 0x8b, 0xb6, 0xaf, 0x6d, 0xaa, 0x9f, 0x66, 0x22, 0x5b, 0x2a, 0xbe, 0x6b, 0xea, 0x8d, 0xc7, - 0x4e, 0xa0, 0x7b, 0xa7, 0xc4, 0x03, 0xf2, 0xbe, 0x86, 0x8d, 0x43, 0xd9, 0xb7, 0x49, 0x88, 0x5e, - 0xc8, 0xc1, 0x64, 0x1b, 0x8f, 0x4e, 0x9e, 0x88, 0x6c, 0xc6, 0x07, 0xa6, 0x1b, 0xd9, 0xec, 0x1c, - 0xfa, 0x37, 0x8b, 0x20, 0x4e, 0xd4, 0x52, 0x22, 0xdf, 0xd3, 0x81, 0x0a, 0xd0, 0xb3, 0xc4, 0x49, - 0xc6, 0xf7, 0x4d, 0x05, 0xd9, 0xc4, 0xc0, 0x95, 0xc8, 0xf9, 0x81, 0x61, 0xe0, 0x4a, 0xe4, 0xec, - 0x0c, 0x76, 0x5f, 0x46, 0x72, 0xfe, 0x41, 0x48, 0xe4, 0x4f, 0x34, 0x5c, 0xfa, 0xe6, 0xfc, 0x70, - 0x29, 0xc5, 0x22, 0x40, 0x7e, 0xa8, 0x1f, 0xa9, 0x02, 0xa8, 0xf2, 0xcd, 0xcd, 0x98, 0x1e, 0x06, - 0xf9, 0x91, 0xa9, 0x5c, 0xfb, 0x14, 0xf3, 0xd4, 0x34, 0x57, 0x19, 0xce, 0x39, 0x1b, 0x3a, 0x17, - 0xbb, 0x7e, 0xe9, 0x33, 0x0e, 0x3b, 0x9e, 0xba, 0x8e, 0x51, 0x2c, 0xf8, 0xb1, 0x0e, 0xad, 0x5d, - 0xf6, 0x05, 0x1c, 0x4c, 0x31, 0x58, 0xca, 0x28, 0xcb, 0x0b, 0xc6, 0x4e, 0xf4, 0xb9, 0x1b, 0x28, - 0x7b, 0x0a, 0x47, 0x37, 0x8b, 0x40, 0xe6, 0x69, 0x16, 0x25, 0x8b, 0x6b, 0x91, 0x8a, 0xfb, 0x18, - 0xf9, 0x27, 0x3a, 0x75, 0x3b, 0xc0, 0x46, 0xc0, 0x2a, 0x70, 0x42, 0xfa, 0x09, 0x92, 0x98, 0x9f, - 0xea, 0xf4, 0x86, 0x88, 0xfb, 0x57, 0x1b, 0x7a, 0xef, 0x93, 0x78, 0x39, 0x47, 0x76, 0x00, 0x2d, - 0x2f, 0x2c, 0x44, 0xd5, 0xf2, 0x42, 0xfd, 0xc8, 0x49, 0x20, 0x28, 0xbd, 0xd0, 0x55, 0xe9, 0x93, - 0x94, 0xd6, 0xb6, 0x96, 0x85, 0x51, 0x59, 0x0d, 0xd3, 0x72, 0xcb, 0x12, 0x29, 0x1e, 0xf0, 0x3a, - 0x16, 0x4a, 0x95, 0x72, 0xb3, 0x30, 0x4b, 0x00, 0xdd, 0x9a, 0x00, 0x4e, 0xa1, 0xf7, 0xee, 0xc3, - 0x02, 0xa5, 0xe2, 0xbd, 0x61, 0x9b, 0x70, 0xe3, 0x35, 0x4a, 0x8e, 0x41, 0xe7, 0x6d, 0x12, 0x62, - 0x21, 0x38, 0x6d, 0x97, 0x72, 0xed, 0x5b, 0x72, 0xad, 0xa4, 0x0d, 0x35, 0x69, 0x3f, 0x85, 0xa3, - 0x77, 0x29, 0x4a, 0x3d, 0xb8, 0x88, 0x8b, 0x5d, 0x18, 0xe5, 0x6d, 0x07, 0x48, 0x26, 0xd7, 0x53, - 0xaf, 0xc8, 0x2a, 0x64, 0x58, 0x02, 0x95, 0xcc, 0xf7, 0x6d, 0x99, 0x93, 0xb4, 0xd2, 0x19, 0xce, - 0x51, 0x8a, 0x58, 0xcb, 0x71, 0xd7, 0xaf, 0x00, 0x8b, 0xa7, 0x57, 0x32, 0x59, 0xa6, 0x85, 0x30, - 0x6b, 0x98, 0xfb, 0x3b, 0x1c, 0xbd, 0x58, 0x89, 0x28, 0xa6, 0x1d, 0xd3, 0xaa, 0x83, 0x28, 0xcb, - 0x6b, 0x0b, 0x72, 0x36, 0x16, 0x54, 0x11, 0xdb, 0xaa, 0x11, 0xeb, 0xc2, 0x9e, 0xb2, 0x97, 0x52, - 0x2c, 0xce, 0xc6, 0x4a, 0x92, 0x3b, 0x15, 0xc9, 0xee, 0x7f, 0x0e, 0x9c, 0x6f, 0x4d, 0xe0, 0xa3, - 0x42, 0xb9, 0x32, 0x0d, 0xcf, 0xa1, 0x7f, 0x2b, 0xe6, 0xa8, 0x52, 0x11, 0x60, 0x31, 0x4d, 0x05, - 0x58, 0xd7, 0x42, 0xab, 0x76, 0x2d, 0x7c, 0x0b, 0x7b, 0x34, 0x98, 0x8f, 0xbf, 0x2d, 0x51, 0x65, - 0x66, 0x9c, 0xc1, 0xe5, 0xf1, 0x48, 0x5f, 0x79, 0x23, 0x3b, 0xe4, 0xd7, 0x12, 0xd9, 0x8f, 0x70, - 0x6c, 0x75, 0x2f, 0xeb, 0x3b, 0xc3, 0xf6, 0xc5, 0xe0, 0xf2, 0xd3, 0xa2, 0x7e, 0x3b, 0xc3, 0x6f, - 0xaa, 0x72, 0x5f, 0xd7, 0xa7, 0xa0, 0x67, 0x29, 0x6c, 0xa4, 0x17, 0x82, 0x04, 0x58, 0x01, 0x44, - 0xbb, 0x39, 0x04, 0x89, 0x5c, 0x0a, 0x96, 0xbe, 0xfb, 0x08, 0x6c, 0xbb, 0x01, 0xfb, 0x01, 0x9e, - 0x54, 0x94, 0x69, 0x48, 0x33, 0x34, 0xb8, 0x3c, 0x2d, 0x06, 0xdd, 0x88, 0xfa, 0x9b, 0xe9, 0xb4, - 0x36, 0xeb, 0x5c, 0x55, 0xf4, 0xad, 0x61, 0xee, 0x1f, 0xce, 0x56, 0x1b, 0x5a, 0x25, 0x2d, 0x61, - 0xfd, 0xa9, 0x20, 0x7b, 0xeb, 0xbd, 0x6c, 0x35, 0xbc, 0x97, 0x6b, 0x09, 0xb4, 0xad, 0xf7, 0x6c, - 0x53, 0xa7, 0x9d, 0x06, 0x9d, 0xfe, 0xed, 0x00, 0x7b, 0x93, 0x3c, 0x44, 0x81, 0x88, 0xcd, 0xad, - 0xa2, 0xe1, 0xc6, 0x31, 0x08, 0xa3, 0xd7, 0xb6, 0x55, 0x60, 0xf4, 0xda, 0x9e, 0x43, 0x7f, 0xad, - 0x60, 0xd2, 0x82, 0x26, 0xbe, 0x04, 0x9a, 0x74, 0xc9, 0x3e, 0x03, 0x30, 0x8d, 0x7c, 0xfc, 0x45, - 0xf1, 0xae, 0x2e, 0xb1, 0x10, 0x4b, 0x78, 0xbd, 0x9a, 0xf0, 0xaa, 0xcb, 0x60, 0xc7, 0xbe, 0x0c, - 0xdc, 0x3f, 0x1d, 0x33, 0x56, 0xe3, 0x47, 0xf6, 0x19, 0xf4, 0x5f, 0x84, 0xa1, 0x44, 0xa5, 0xd0, - 0xac, 0x60, 0x70, 0x79, 0x66, 0x49, 0x75, 0x54, 0x06, 0x6f, 0x16, 0x99, 0xcc, 0xfd, 0x2a, 0xf9, - 0xec, 0x3b, 0x38, 0xa8, 0x07, 0xe9, 0xe3, 0xf4, 0x2b, 0xe6, 0xc5, 0xf1, 0x64, 0xd2, 0xdd, 0xb1, - 0x12, 0xf1, 0x72, 0xcd, 0x88, 0x71, 0x9e, 0xb7, 0x9e, 0x39, 0xee, 0x2d, 0x1c, 0xda, 0x2c, 0x4f, - 0x53, 0x0c, 0xd8, 0x73, 0xd8, 0x0f, 0xe9, 0x6f, 0x60, 0x8a, 0x31, 0x06, 0x59, 0x22, 0x0b, 0x45, - 0x9d, 0x14, 0xf3, 0x8c, 0xed, 0x98, 0x5f, 0x4f, 0x75, 0xff, 0x71, 0x60, 0xbf, 0x96, 0xc0, 0xbe, - 0x82, 0xe3, 0x85, 0xfe, 0x01, 0xd0, 0xb0, 0x9a, 0xa0, 0xd4, 0xbb, 0xa1, 0x33, 0xbb, 0x7e, 0x53, - 0x88, 0xbd, 0x82, 0xc1, 0x5c, 0x64, 0xc1, 0xec, 0x65, 0x84, 0x71, 0xb8, 0x66, 0xe3, 0xf3, 0xa6, - 0xee, 0xa3, 0xb7, 0x55, 0x9e, 0x21, 0xc6, 0xae, 0x3c, 0xfb, 0x1e, 0x0e, 0x37, 0x13, 0x3e, 0x8a, - 0x9c, 0x2f, 0x81, 0xd5, 0xc8, 0x29, 0x2f, 0xe2, 0x74, 0x26, 0xd4, 0x5a, 0x72, 0xc6, 0xb9, 0xda, - 0xf9, 0xd9, 0xfc, 0x4c, 0xdd, 0xf7, 0xf4, 0xaf, 0xd5, 0x37, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, - 0x9b, 0x5f, 0xec, 0x44, 0x69, 0x09, 0x00, 0x00, + // 984 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x5d, 0x6e, 0xdb, 0x46, + 0x10, 0x06, 0xf5, 0x67, 0x6b, 0x64, 0x3b, 0xf6, 0xda, 0x75, 0xb7, 0x86, 0x51, 0x08, 0x04, 0x5a, + 0x18, 0x45, 0x20, 0xb4, 0xee, 0x43, 0x83, 0xa0, 0x28, 0x1a, 0x5b, 0x4e, 0x42, 0x34, 0x71, 0x04, + 0xaa, 0xce, 0x43, 0xdf, 0xd6, 0xe4, 0xc4, 0x22, 0x4a, 0x89, 0xec, 0x2e, 0xa5, 0x80, 0x79, 0x29, + 0x7a, 0x85, 0x9e, 0xa1, 0xe7, 0xe8, 0x01, 0x7a, 0x84, 0xde, 0xa2, 0x37, 0x28, 0x66, 0x97, 0x22, + 0x97, 0x12, 0x5f, 0xf2, 0x36, 0xf3, 0xcd, 0xec, 0xce, 0xf0, 0x9b, 0x6f, 0x97, 0x0b, 0x83, 0x2c, + 0x4f, 0x51, 0x8d, 0x52, 0x99, 0x64, 0x09, 0xeb, 0xae, 0xbe, 0x11, 0x69, 0xe4, 0xfe, 0xd7, 0x81, + 0xee, 0x58, 0x46, 0x2b, 0x64, 0x0c, 0x3a, 0x77, 0x77, 0xde, 0x98, 0x3b, 0x43, 0xe7, 0xa2, 0xef, + 0x6b, 0x9b, 0x1d, 0x42, 0xfb, 0xad, 0x37, 0xe6, 0x2d, 0x0d, 0x91, 0x49, 0xc8, 0xc4, 0x1b, 0xf3, + 0xb6, 0x41, 0x26, 0xde, 0x98, 0xb9, 0xb0, 0x37, 0x45, 0x19, 0x89, 0xf8, 0x76, 0x39, 0xbf, 0x47, + 0xc9, 0x3b, 0x3a, 0x54, 0xc3, 0xd8, 0x29, 0xf4, 0x5e, 0xa2, 0x88, 0xb3, 0x19, 0xef, 0xea, 0x68, + 0xe1, 0x51, 0xcd, 0x9f, 0xf3, 0x14, 0x79, 0xcf, 0xd4, 0x24, 0x9b, 0xb0, 0x69, 0xf4, 0x01, 0xf9, + 0xce, 0xd0, 0xb9, 0x68, 0xfb, 0xda, 0xa6, 0xf5, 0xd3, 0x4c, 0x64, 0x4b, 0xc5, 0x77, 0xcd, 0x7a, + 0xe3, 0xb1, 0x13, 0xe8, 0xde, 0x29, 0xf1, 0x80, 0xbc, 0xaf, 0x61, 0xe3, 0x50, 0xf6, 0x6d, 0x12, + 0xa2, 0x17, 0x72, 0x30, 0xd9, 0xc6, 0xa3, 0x9d, 0x27, 0x22, 0x9b, 0xf1, 0x81, 0xa9, 0x46, 0x36, + 0x3b, 0x87, 0xfe, 0xcd, 0x22, 0x88, 0x13, 0xb5, 0x94, 0xc8, 0xf7, 0x74, 0xa0, 0x02, 0x74, 0x2f, + 0x71, 0x92, 0xf1, 0x7d, 0xb3, 0x82, 0x6c, 0x62, 0xe0, 0x4a, 0xe4, 0xfc, 0xc0, 0x30, 0x70, 0x25, + 0x72, 0x76, 0x06, 0xbb, 0xcf, 0x23, 0x39, 0x7f, 0x2f, 0x24, 0xf2, 0x47, 0x1a, 0x2e, 0x7d, 0xb3, + 0x7f, 0xb8, 0x94, 0x62, 0x11, 0x20, 0x3f, 0xd4, 0x9f, 0x54, 0x01, 0xb4, 0xf2, 0xd5, 0xcd, 0x98, + 0x3e, 0x06, 0xf9, 0x91, 0x59, 0xb9, 0xf6, 0x29, 0xe6, 0xa9, 0x69, 0xae, 0x32, 0x9c, 0x73, 0x36, + 0x74, 0x2e, 0x76, 0xfd, 0xd2, 0x67, 0x1c, 0x76, 0x3c, 0x75, 0x1d, 0xa3, 0x58, 0xf0, 0x63, 0x1d, + 0x5a, 0xbb, 0xec, 0x4b, 0x38, 0x98, 0x62, 0xb0, 0x94, 0x51, 0x96, 0x17, 0x8c, 0x9d, 0xe8, 0x7d, + 0x37, 0x50, 0xf6, 0x18, 0x8e, 0x6e, 0x16, 0x81, 0xcc, 0xd3, 0x2c, 0x4a, 0x16, 0xd7, 0x22, 0x15, + 0xf7, 0x31, 0xf2, 0x4f, 0x74, 0xea, 0x76, 0x80, 0x8d, 0x80, 0x55, 0xe0, 0x84, 0xf4, 0x13, 0x24, + 0x31, 0x3f, 0xd5, 0xe9, 0x0d, 0x11, 0xfa, 0xea, 0xe9, 0x5c, 0xc8, 0xcc, 0x5b, 0xbc, 0x4b, 0xf8, + 0xa7, 0x86, 0xd5, 0x12, 0x70, 0xff, 0x6a, 0x43, 0xef, 0x6d, 0x12, 0x2f, 0xe7, 0xc8, 0x0e, 0xa0, + 0xe5, 0x85, 0x85, 0xe4, 0x5a, 0x5e, 0xa8, 0x09, 0x49, 0x02, 0x41, 0x9b, 0x15, 0xaa, 0x2b, 0x7d, + 0x12, 0xda, 0xda, 0xd6, 0xa2, 0x31, 0x1a, 0xac, 0x61, 0x5a, 0x8c, 0x59, 0x22, 0xc5, 0x03, 0x5e, + 0xc7, 0x42, 0xa9, 0x52, 0x8c, 0x16, 0x66, 0xc9, 0xa3, 0x5b, 0x93, 0xc7, 0x29, 0xf4, 0xde, 0xbc, + 0x5f, 0xa0, 0x54, 0xbc, 0x37, 0x6c, 0x13, 0x6e, 0xbc, 0x46, 0x41, 0x32, 0xe8, 0xbc, 0x4e, 0x42, + 0x2c, 0xe4, 0xa8, 0xed, 0x52, 0xcc, 0x7d, 0x4b, 0xcc, 0x95, 0xf0, 0xa1, 0x26, 0xfc, 0xc7, 0x70, + 0xf4, 0x26, 0x45, 0xa9, 0x1b, 0x17, 0x71, 0x31, 0x29, 0xa3, 0xcb, 0xed, 0x00, 0xd1, 0x79, 0x3d, + 0xf5, 0x8a, 0xac, 0x42, 0xa4, 0x25, 0x50, 0x1d, 0x82, 0x7d, 0xfb, 0x10, 0x90, 0xf0, 0xd2, 0x19, + 0xce, 0x51, 0x8a, 0x58, 0x8b, 0x75, 0xd7, 0xaf, 0x00, 0x8b, 0xa7, 0x17, 0x32, 0x59, 0xa6, 0x85, + 0x6c, 0x6b, 0x98, 0xfb, 0x3b, 0x1c, 0x3d, 0x5b, 0x89, 0x28, 0x26, 0x05, 0x90, 0x10, 0x82, 0x28, + 0xcb, 0x6b, 0x03, 0x72, 0x36, 0x06, 0x54, 0x11, 0xdb, 0xaa, 0x11, 0xeb, 0xc2, 0x9e, 0xb2, 0x87, + 0x52, 0x0c, 0xce, 0xc6, 0x4a, 0x92, 0x3b, 0x15, 0xc9, 0xee, 0xbf, 0x0e, 0x9c, 0x6f, 0x75, 0xe0, + 0xa3, 0x42, 0xb9, 0x32, 0x05, 0xcf, 0xa1, 0x7f, 0x2b, 0xe6, 0xa8, 0x52, 0x11, 0x60, 0xd1, 0x4d, + 0x05, 0x58, 0x97, 0x46, 0xab, 0x76, 0x69, 0x7c, 0x07, 0x7b, 0xd4, 0x98, 0x8f, 0xbf, 0x2d, 0x51, + 0x65, 0xa6, 0x9d, 0xc1, 0xe5, 0xf1, 0x48, 0x5f, 0x88, 0x23, 0x3b, 0xe4, 0xd7, 0x12, 0xd9, 0x4f, + 0x70, 0x6c, 0x55, 0x2f, 0xd7, 0x77, 0x86, 0xed, 0x8b, 0xc1, 0xe5, 0x67, 0xc5, 0xfa, 0xed, 0x0c, + 0xbf, 0x69, 0x95, 0xfb, 0xb2, 0xde, 0x05, 0x7d, 0x4b, 0x61, 0x23, 0x1d, 0x08, 0x12, 0x60, 0x05, + 0x10, 0xed, 0x66, 0x13, 0x24, 0x72, 0x29, 0x58, 0xfa, 0xee, 0x07, 0x60, 0xdb, 0x05, 0xd8, 0x8f, + 0xf0, 0xa8, 0xa2, 0x4c, 0x43, 0x9a, 0xa1, 0xc1, 0xe5, 0x69, 0xd1, 0xe8, 0x46, 0xd4, 0xdf, 0x4c, + 0xa7, 0xb1, 0x59, 0xfb, 0xaa, 0xa2, 0x6e, 0x0d, 0x73, 0xff, 0x70, 0xb6, 0xca, 0xd0, 0x28, 0x69, + 0x08, 0xeb, 0x1f, 0x09, 0xd9, 0x5b, 0xe7, 0xb2, 0xd5, 0x70, 0x2e, 0xd7, 0x12, 0x68, 0x5b, 0xe7, + 0x6c, 0x53, 0xa7, 0x9d, 0x06, 0x9d, 0xfe, 0xed, 0x00, 0x7b, 0x95, 0x3c, 0x44, 0x81, 0x88, 0xcd, + 0xad, 0xa2, 0xe1, 0xc6, 0x36, 0x08, 0xa3, 0x63, 0xdb, 0x2a, 0x30, 0x3a, 0xb6, 0xe7, 0xd0, 0x5f, + 0x2b, 0x98, 0xb4, 0xa0, 0x89, 0x2f, 0x81, 0x26, 0x5d, 0xb2, 0xcf, 0x01, 0x4c, 0x21, 0x1f, 0xdf, + 0x29, 0xde, 0xd5, 0x4b, 0x2c, 0xc4, 0x12, 0x5e, 0xaf, 0x26, 0xbc, 0xea, 0x32, 0xd8, 0xb1, 0x2f, + 0x03, 0xf7, 0x4f, 0xc7, 0xb4, 0xd5, 0xf8, 0x0b, 0x7e, 0x02, 0xfd, 0x67, 0x61, 0x28, 0x51, 0x29, + 0x34, 0x23, 0x18, 0x5c, 0x9e, 0x59, 0x52, 0x1d, 0x95, 0xc1, 0x9b, 0x45, 0x26, 0x73, 0xbf, 0x4a, + 0x3e, 0xfb, 0x1e, 0x0e, 0xea, 0x41, 0xfa, 0x75, 0xfd, 0x8a, 0x79, 0xb1, 0x3d, 0x99, 0x74, 0x77, + 0xac, 0x44, 0xbc, 0x5c, 0x33, 0x62, 0x9c, 0xa7, 0xad, 0x27, 0x8e, 0x7b, 0x0b, 0x87, 0x36, 0xcb, + 0xd3, 0x14, 0x03, 0xf6, 0x14, 0xf6, 0x43, 0x7a, 0x2b, 0x4c, 0x31, 0xc6, 0x20, 0x4b, 0x64, 0xa1, + 0xa8, 0x93, 0xa2, 0x9f, 0xb1, 0x1d, 0xf3, 0xeb, 0xa9, 0xee, 0x3f, 0x0e, 0xec, 0xd7, 0x12, 0xd8, + 0xd7, 0x70, 0xbc, 0xd0, 0xcf, 0x03, 0x0d, 0xab, 0x09, 0x4a, 0x3d, 0x1b, 0xda, 0xb3, 0xeb, 0x37, + 0x85, 0xd8, 0x0b, 0x18, 0xcc, 0x45, 0x16, 0xcc, 0x9e, 0x47, 0x18, 0x87, 0x6b, 0x36, 0xbe, 0x68, + 0xaa, 0x3e, 0x7a, 0x5d, 0xe5, 0x19, 0x62, 0xec, 0x95, 0x67, 0x3f, 0xc0, 0xe1, 0x66, 0xc2, 0x47, + 0x91, 0xf3, 0x15, 0xb0, 0x1a, 0x39, 0xe5, 0x45, 0x9c, 0xce, 0x84, 0x5a, 0x4b, 0xce, 0x38, 0x57, + 0x3b, 0xbf, 0x98, 0xa7, 0xd6, 0x7d, 0x4f, 0x3f, 0xbc, 0xbe, 0xfd, 0x3f, 0x00, 0x00, 0xff, 0xff, + 0x0e, 0x19, 0x8c, 0x03, 0x87, 0x09, 0x00, 0x00, } diff --git a/api/v1/drivecrd/drive_types.go b/api/v1/drivecrd/drive_types.go index 95c170e9f..965351d67 100644 --- a/api/v1/drivecrd/drive_types.go +++ b/api/v1/drivecrd/drive_types.go @@ -44,6 +44,7 @@ import ( // +kubebuilder:printcolumn:name="Security Status",type="string",JSONPath=".spec.SecurityStatus",description="SED drive security status" // +kubebuilder:printcolumn:name="Encryption Capable",type="string",JSONPath=".spec.EncryptionCapable",description="SED drive or not" // +kubebuilder:printcolumn:name="Encryption Protocol",type="string",JSONPath=".spec.EncryptionProtocol",description="SED encryption protocol" +// +kubebuilder:printcolumn:name="Smart Info",type="string",JSONPath=".spec.SmartInfo",description="Smart Info data" type Drive struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -82,7 +83,8 @@ func (in *Drive) Equals(drive *api.Drive) bool { in.Spec.Health == drive.Health && in.Spec.Type == drive.Type && in.Spec.Size == drive.Size && - in.Spec.Path == drive.Path + in.Spec.Path == drive.Path && + in.Spec.SmartInfo == drive.SmartInfo } func (in *Drive) GetDriveDescription() string { diff --git a/api/v1/types.proto b/api/v1/types.proto index 5a51da747..79eae333f 100644 --- a/api/v1/types.proto +++ b/api/v1/types.proto @@ -28,6 +28,7 @@ message Drive { string SecurityStatus = 20; string EncryptionCapable = 21; string EncryptionProtocol = 22; + string SmartInfo = 23; } message Volume {