Feature smart metrics (#1083)

* [Issue-1080] Extend CRD/proto spec for SmartInfo Support Signed-off-by: Andrzej Zukowski <[email protected]> * [Issue-1080] Include additional UTs Signed-off-by: Andrzej Zukowski <[email protected]> --------- Signed-off-by: Andrzej Zukowski <[email protected]>
dell · Feb 15, 2024 · d5847f2 · d5847f2
1 parent 6dbf230
commit d5847f2
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 64 deletions.
diff --git 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
diff --git 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
@@ -28,6 +28,7 @@ message Drive {
     string SecurityStatus = 20;
     string EncryptionCapable = 21;
     string EncryptionProtocol = 22;
+    string SmartInfo = 23;
 }
 
 message Volume {