Skip to content

Commit cbbe8d2

Browse files
divyenpateldivyenpatel
committed
handle vim25:NotSupported returned with CnsFault
Signed-off-by: Divyen Patel <divyen.patel@broadcom.com>
1 parent 06d4a3f commit cbbe8d2

5 files changed

Lines changed: 22 additions & 11 deletions

File tree

‎cli/volume/ls.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func (r *lsWriter) backing(id types.CnsVolumeId) string {
186186
}
187187

188188
if fault := res.Fault; fault != nil {
189-
if f, ok := fault.Fault.(types.CnsFault); ok {
189+
if f, ok := fault.Fault.(*types.CnsFault); ok {
190190
if strings.Contains(f.Reason, id.Id) {
191191
return f.Reason
192192
}

‎cns/client_test.go‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,15 @@ func TestClient(t *testing.T) {
179179
}
180180
createVolumeOperationRes := createTaskResult.GetCnsVolumeOperationResult()
181181
if createVolumeOperationRes.Fault != nil {
182+
if cnsFault, ok := createVolumeOperationRes.Fault.Fault.(*cnstypes.CnsFault); ok {
183+
if cause := cnsFault.FaultCause; cause != nil {
184+
if inner, ok := cause.Fault.(*vim25types.NotSupported); ok {
185+
t.Logf("Caught NotSupported fault: %q", cause.LocalizedMessage)
186+
} else {
187+
t.Logf("Inner fault type: %T", inner)
188+
}
189+
}
190+
}
182191
t.Fatalf("Failed to create volume: fault=%+v", createVolumeOperationRes.Fault)
183192
}
184193
volumeId := createVolumeOperationRes.VolumeId.Id
@@ -230,7 +239,7 @@ func TestClient(t *testing.T) {
230239
createVolumeOperationRes := createTaskResult.GetCnsVolumeOperationResult()
231240
if createVolumeOperationRes.Fault != nil {
232241
t.Logf("createVolumeOperationRes.Fault: %+v", pretty.Sprint(createVolumeOperationRes))
233-
_, ok := createVolumeOperationRes.Fault.Fault.(cnstypes.CnsVolumeAlreadyExistsFault)
242+
_, ok := createVolumeOperationRes.Fault.Fault.(*cnstypes.CnsVolumeAlreadyExistsFault)
234243
if !ok {
235244
t.Fatalf("Fault is not CnsVolumeAlreadyExistsFault")
236245
}
@@ -282,7 +291,7 @@ func TestClient(t *testing.T) {
282291
t.Logf("reCreateVolumeOperationRes.: %+v", pretty.Sprint(reCreateVolumeOperationRes))
283292
if reCreateVolumeOperationRes.Fault != nil {
284293
t.Logf("reCreateVolumeOperationRes.Fault: %+v", pretty.Sprint(reCreateVolumeOperationRes.Fault))
285-
_, ok := reCreateVolumeOperationRes.Fault.Fault.(cnstypes.CnsAlreadyRegisteredFault)
294+
_, ok := reCreateVolumeOperationRes.Fault.Fault.(*cnstypes.CnsAlreadyRegisteredFault)
286295
if !ok {
287296
t.Fatalf("Fault is not a CnsAlreadyRegisteredFault")
288297
}
@@ -1416,7 +1425,7 @@ func TestClient(t *testing.T) {
14161425
var volumeID string
14171426
if createVolumeOperationRes.Fault != nil {
14181427
t.Logf("Failed to create volume: fault=%+v", createVolumeOperationRes.Fault)
1419-
fault, ok := createVolumeOperationRes.Fault.Fault.(cnstypes.CnsAlreadyRegisteredFault)
1428+
fault, ok := createVolumeOperationRes.Fault.Fault.(*cnstypes.CnsAlreadyRegisteredFault)
14201429
if !ok {
14211430
t.Fatalf("Fault is not CnsAlreadyRegisteredFault")
14221431
} else {
@@ -1465,7 +1474,7 @@ func TestClient(t *testing.T) {
14651474
t.Logf("reCreateVolumeOperationRes.: %+v", pretty.Sprint(reCreateVolumeOperationRes))
14661475
if reCreateVolumeOperationRes.Fault != nil {
14671476
t.Logf("Failed to create volume: fault=%+v", reCreateVolumeOperationRes.Fault)
1468-
_, ok := reCreateVolumeOperationRes.Fault.Fault.(cnstypes.CnsAlreadyRegisteredFault)
1477+
_, ok := reCreateVolumeOperationRes.Fault.Fault.(*cnstypes.CnsAlreadyRegisteredFault)
14691478
if !ok {
14701479
t.Fatalf("Fault is not CnsAlreadyRegisteredFault")
14711480
} else {

‎cns/simulator/simulator.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ package simulator
66

77
import (
88
"context"
9-
"slices"
109
"time"
1110

11+
"slices"
12+
1213
"github.com/google/uuid"
1314

1415
"github.com/vmware/govmomi/cns"
@@ -724,7 +725,7 @@ func (m *CnsVolumeManager) CnsQuerySnapshots(ctx *simulator.Context, req *cnstyp
724725
// volumeId in snapshotQuerySpecs does not exist
725726
snapshotQueryResultEntries = append(snapshotQueryResultEntries, cnstypes.CnsSnapshotQueryResultEntry{
726727
Error: &vim25types.LocalizedMethodFault{
727-
Fault: cnstypes.CnsVolumeNotFoundFault{
728+
Fault: &cnstypes.CnsVolumeNotFoundFault{
728729
VolumeId: snapshotQuerySpec.VolumeId,
729730
},
730731
},
@@ -742,7 +743,7 @@ func (m *CnsVolumeManager) CnsQuerySnapshots(ctx *simulator.Context, req *cnstyp
742743
if isSnapshotQueryFilter && len(snapshotQueryResultEntries) == 0 {
743744
snapshotQueryResultEntries = append(snapshotQueryResultEntries, cnstypes.CnsSnapshotQueryResultEntry{
744745
Error: &vim25types.LocalizedMethodFault{
745-
Fault: cnstypes.CnsSnapshotNotFoundFault{
746+
Fault: &cnstypes.CnsSnapshotNotFoundFault{
746747
VolumeId: snapshotQuerySpec.VolumeId,
747748
SnapshotId: *snapshotQuerySpec.SnapshotId,
748749
},

‎cns/simulator/simulator_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ func TestSimulator(t *testing.T) {
477477
}
478478
t.Logf("snapshotQueryFilter with unknown volumeId in SnapshotQuerySpecs: %+v", snapshotQueryFilter)
479479
querySnapshotsTaskResult = QuerySnapshotsFunc(snapshotQueryFilter)
480-
_, ok := querySnapshotsTaskResult.Entries[0].Error.Fault.(cnstypes.CnsVolumeNotFoundFault)
480+
_, ok := querySnapshotsTaskResult.Entries[0].Error.Fault.(*cnstypes.CnsVolumeNotFoundFault)
481481
if !ok {
482482
t.Fatalf("Unexpected error returned while CnsVolumeNotFoundFault is expected. Error: %+v \n", querySnapshotsTaskResult.Entries[0].Error.Fault)
483483
}
@@ -494,7 +494,7 @@ func TestSimulator(t *testing.T) {
494494
}
495495
t.Logf("snapshotQueryFilter with unknown snapshotId in SnapshotQuerySpecs: %+v", snapshotQueryFilter)
496496
querySnapshotsTaskResult = QuerySnapshotsFunc(snapshotQueryFilter)
497-
_, ok = querySnapshotsTaskResult.Entries[0].Error.Fault.(cnstypes.CnsSnapshotNotFoundFault)
497+
_, ok = querySnapshotsTaskResult.Entries[0].Error.Fault.(*cnstypes.CnsSnapshotNotFoundFault)
498498
if !ok {
499499
t.Fatalf("Unexpected error returned while CnsSnapshotNotFoundFault is expected. Error: %+v \n", querySnapshotsTaskResult.Entries[0].Error.Fault)
500500
}

‎cns/types/types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,13 +572,14 @@ func init() {
572572
}
573573

574574
type CnsFault struct {
575-
types.BaseMethodFault `xml:"fault,typeattr"`
575+
types.MethodFault
576576

577577
Reason string `xml:"reason,omitempty" json:"reason"`
578578
}
579579

580580
func init() {
581581
types.Add("CnsFault", reflect.TypeOf((*CnsFault)(nil)).Elem())
582+
types.Add("NotSupported", reflect.TypeOf((*types.NotSupported)(nil)).Elem())
582583
}
583584

584585
type CnsVolumeNotFoundFault struct {

0 commit comments

Comments
 (0)