Merge pull request #17 from Seagate/fix/locate-array

Fix/locate array
Seagate · Sep 16, 2022 · dc348b9 · dc348b9
2 parents 2435f86 + fc514dd
commit dc348b9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/kmip20/op_locate.go b/kmip20/op_locate.go
@@ -17,7 +17,7 @@ type LocateRequestPayload struct {
 // Table 230
 
 type LocateResponsePayload struct {
-	UniqueIdentifier string
+	UniqueIdentifier []string
 }
 
 type LocateHandler struct {

diff --git a/op_locate.go b/op_locate.go
@@ -19,8 +19,8 @@ type LocateRequestPayload struct {
 // Table 191
 
 type LocateResponsePayload struct {
-	LocatedItems     uint32 // Required: No
-	UniqueIdentifier string // Required: No
+	LocatedItems     uint32   // Required: No
+	UniqueIdentifier []string // Required: No
 }
 
 type LocateHandler struct {

diff --git a/src/kmipapi/kmip14.go b/src/kmipapi/kmip14.go
@@ -301,9 +301,16 @@ func (kmips *kmip14service) Locate(ctx context.Context, settings *ConfigurationS
 		return nil, fmt.Errorf("unable to decode GetResponsePayload, error: %v", err)
 	}
 
-	uid := respPayload.UniqueIdentifier
+	logger.V(4).Info("XXX Locate response payload", "respPayload", respPayload)
+
+	uids := respPayload.UniqueIdentifier
 	logger.V(4).Info("XXX Locate response payload", "uid", respPayload.UniqueIdentifier)
 
+	uid := ""
+	if len(uids) > 0 {
+		uid = uids[0]
+	}
+
 	return &LocateResponse{UniqueIdentifier: uid}, nil
 }
 

diff --git a/src/kmipapi/kmip20.go b/src/kmipapi/kmip20.go
@@ -333,9 +333,14 @@ func (kmips *kmip20service) Locate(ctx context.Context, settings *ConfigurationS
 		return nil, fmt.Errorf("unable to decode GetResponsePayload, error: %v", err)
 	}
 
-	uid := respPayload.UniqueIdentifier
+	uids := respPayload.UniqueIdentifier
 	logger.V(4).Info("XXX Locate response payload", "uid", respPayload.UniqueIdentifier)
 
+	uid := ""
+	if len(uids) > 0 {
+		uid = uids[0]
+	}
+
 	return &LocateResponse{UniqueIdentifier: uid}, nil
 }