Skip to content

Commit 3bf0935

Browse files
dougmdougm
committed
chore: Use cns Task helpers in govc volume commands
- Cleanup cns Tasks helpers Signed-off-by: Doug MacEachern <[email protected]>
1 parent 29fe42f commit 3bf0935

File tree

7 files changed

+69
-122
lines changed

7 files changed

+69
-122
lines changed

‎cli/volume/ls.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515

1616
"github.com/vmware/govmomi/cli"
1717
"github.com/vmware/govmomi/cli/flags"
18+
"github.com/vmware/govmomi/cns"
1819
"github.com/vmware/govmomi/cns/types"
1920
"github.com/vmware/govmomi/units"
2021
vim "github.com/vmware/govmomi/vim25/types"
@@ -248,13 +249,14 @@ func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
248249
return err
249250
}
250251

251-
res, err := task.WaitForResult(ctx, nil)
252+
res, err := cns.GetTaskInfo(ctx, task)
252253
if err != nil {
253254
return err
254255
}
255256

256-
if batch, ok := res.Result.(types.CnsVolumeOperationBatchResult); ok {
257-
info = batch.VolumeResults
257+
info, err = cns.GetTaskResultArray(ctx, res)
258+
if err != nil {
259+
return err
258260
}
259261
}
260262

‎cli/volume/rm.go

+10-13
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111

1212
"github.com/vmware/govmomi/cli"
1313
"github.com/vmware/govmomi/cli/flags"
14+
"github.com/vmware/govmomi/cns"
1415
"github.com/vmware/govmomi/cns/types"
15-
"github.com/vmware/govmomi/vim25/soap"
1616
)
1717

1818
type rm struct {
@@ -64,22 +64,19 @@ func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
6464
return err
6565
}
6666

67-
info, err := task.WaitForResult(ctx, nil)
67+
info, err := cns.GetTaskInfo(ctx, task)
6868
if err != nil {
6969
return err
7070
}
7171

72-
if res, ok := info.Result.(types.CnsVolumeOperationBatchResult); ok {
73-
for _, r := range res.VolumeResults {
74-
fault := r.GetCnsVolumeOperationResult().Fault
75-
76-
if fault != nil {
77-
if fault.Fault != nil {
78-
return soap.WrapVimFault(fault.Fault)
79-
}
80-
return errors.New(fault.LocalizedMessage)
81-
}
82-
}
72+
res, err := cns.GetTaskResult(ctx, info)
73+
if err != nil {
74+
return err
75+
}
76+
77+
fault := res.GetCnsVolumeOperationResult().Fault
78+
if fault != nil {
79+
return errors.New(fault.LocalizedMessage)
8380
}
8481

8582
return nil

‎cli/volume/snapshot/create.go

+14-24
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2023-2023 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package snapshot
186

@@ -27,6 +15,7 @@ import (
2715

2816
"github.com/vmware/govmomi/cli"
2917
"github.com/vmware/govmomi/cli/flags"
18+
"github.com/vmware/govmomi/cns"
3019
"github.com/vmware/govmomi/cns/types"
3120
)
3221

@@ -111,19 +100,20 @@ func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
111100
return err
112101
}
113102

114-
info, err := task.WaitForResult(ctx, nil)
103+
info, err := cns.GetTaskInfo(ctx, task)
104+
if err != nil {
105+
return err
106+
}
107+
108+
res, err := cns.GetTaskResult(ctx, info)
115109
if err != nil {
116110
return err
117111
}
118112

119-
if res, ok := info.Result.(types.CnsVolumeOperationBatchResult); ok {
120-
if vres, ok := res.VolumeResults[0].(*types.CnsSnapshotCreateResult); ok {
121-
if vres.CnsSnapshotOperationResult.Fault != nil {
122-
return errors.New(vres.CnsSnapshotOperationResult.Fault.LocalizedMessage)
123-
}
124-
return cmd.WriteResult(&createResult{VolumeResults: vres, cmd: cmd})
125-
}
113+
scr := res.(*types.CnsSnapshotCreateResult)
114+
if scr.CnsSnapshotOperationResult.Fault != nil {
115+
return errors.New(scr.CnsSnapshotOperationResult.Fault.LocalizedMessage)
126116
}
127117

128-
return nil
118+
return cmd.WriteResult(&createResult{VolumeResults: scr, cmd: cmd})
129119
}

‎cli/volume/snapshot/ls.go

+18-29
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2023-2023 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package snapshot
186

@@ -27,6 +15,7 @@ import (
2715

2816
"github.com/vmware/govmomi/cli"
2917
"github.com/vmware/govmomi/cli/flags"
18+
"github.com/vmware/govmomi/cns"
3019
"github.com/vmware/govmomi/cns/types"
3120
)
3221

@@ -115,13 +104,11 @@ func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
115104

116105
for _, id := range f.Args() {
117106
spec := types.CnsSnapshotQueryFilter{
118-
SnapshotQuerySpecs: []types.CnsSnapshotQuerySpec{
119-
{
120-
VolumeId: types.CnsVolumeId{
121-
Id: id,
122-
},
107+
SnapshotQuerySpecs: []types.CnsSnapshotQuerySpec{{
108+
VolumeId: types.CnsVolumeId{
109+
Id: id,
123110
},
124-
},
111+
}},
125112
}
126113

127114
for {
@@ -130,19 +117,21 @@ func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
130117
return err
131118
}
132119

133-
info, err := task.WaitForResult(ctx, nil)
120+
info, err := cns.GetTaskInfo(ctx, task)
121+
if err != nil {
122+
return err
123+
}
124+
125+
res, err := cns.GetQuerySnapshotsTaskResult(ctx, info)
134126
if err != nil {
135127
return err
136128
}
137129

138-
res, ok := info.Result.(types.CnsSnapshotQueryResult)
139-
if ok {
140-
for i, e := range res.Entries {
141-
if e.Error != nil {
142-
return errors.New(e.Error.LocalizedMessage)
143-
}
144-
result.Entries = append(result.Entries, &res.Entries[i])
130+
for i, e := range res.Entries {
131+
if e.Error != nil {
132+
return errors.New(e.Error.LocalizedMessage)
145133
}
134+
result.Entries = append(result.Entries, &res.Entries[i])
146135
}
147136

148137
if res.Cursor.Offset == res.Cursor.TotalRecords {

‎cli/volume/snapshot/rm.go

+16-28
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2023-2023 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package snapshot
186

@@ -26,6 +14,7 @@ import (
2614

2715
"github.com/vmware/govmomi/cli"
2816
"github.com/vmware/govmomi/cli/flags"
17+
"github.com/vmware/govmomi/cns"
2918
"github.com/vmware/govmomi/cns/types"
3019
)
3120

@@ -118,25 +107,24 @@ func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
118107
return err
119108
}
120109

121-
info, err := task.WaitForResult(ctx, nil)
110+
info, err := cns.GetTaskInfo(ctx, task)
111+
if err != nil {
112+
return err
113+
}
114+
115+
res, err := cns.GetTaskResult(ctx, info)
122116
if err != nil {
123117
return err
124118
}
125119

126-
if res, ok := info.Result.(types.CnsVolumeOperationBatchResult); ok {
127-
if len(res.VolumeResults) > 0 {
128-
if sdr, ok := res.VolumeResults[0].(*types.CnsSnapshotDeleteResult); ok {
129-
if sdr.Fault != nil {
130-
if len(f.Args()) == 2 {
131-
return errors.New(sdr.Fault.LocalizedMessage)
132-
}
133-
sdr.SnapshotId.Id = f.Arg(i)
134-
sdr.VolumeId.Id = f.Arg(i + 1)
135-
}
136-
result.VolumeResults = append(result.VolumeResults, sdr)
137-
}
120+
sdr := res.(*types.CnsSnapshotDeleteResult)
121+
if sdr.Fault != nil {
122+
if len(f.Args()) == 2 {
123+
return errors.New(sdr.Fault.LocalizedMessage)
138124
}
139125
}
126+
127+
result.VolumeResults = append(result.VolumeResults, sdr)
140128
}
141129

142130
return cmd.WriteResult(&result)

‎cns/cns_util.go

+5-24
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
/*
2-
Copyright (c) 2019 VMware, Inc. All Rights Reserved.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
*/
1+
// © Broadcom. All Rights Reserved.
2+
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
3+
// SPDX-License-Identifier: Apache-2.0
164

175
package cns
186

@@ -49,9 +37,6 @@ func GetQuerySnapshotsTaskResult(ctx context.Context, taskInfo *vim25types.TaskI
4937
}
5038
if taskInfo.Result != nil {
5139
snapshotQueryResult := taskInfo.Result.(cnstypes.CnsSnapshotQueryResult)
52-
if &snapshotQueryResult == nil {
53-
return nil, errors.New("Cannot get SnapshotQueryResult")
54-
}
5540
return &snapshotQueryResult, nil
5641
}
5742
return nil, errors.New("TaskInfo result is empty")
@@ -64,9 +49,7 @@ func GetTaskResult(ctx context.Context, taskInfo *vim25types.TaskInfo) (cnstypes
6449
}
6550
if taskInfo.Result != nil {
6651
volumeOperationBatchResult := taskInfo.Result.(cnstypes.CnsVolumeOperationBatchResult)
67-
if &volumeOperationBatchResult == nil ||
68-
volumeOperationBatchResult.VolumeResults == nil ||
69-
len(volumeOperationBatchResult.VolumeResults) == 0 {
52+
if len(volumeOperationBatchResult.VolumeResults) == 0 {
7053
return nil, errors.New("Cannot get VolumeOperationResult")
7154
}
7255
return volumeOperationBatchResult.VolumeResults[0], nil
@@ -81,9 +64,7 @@ func GetTaskResultArray(ctx context.Context, taskInfo *vim25types.TaskInfo) ([]c
8164
}
8265
if taskInfo.Result != nil {
8366
volumeOperationBatchResult := taskInfo.Result.(cnstypes.CnsVolumeOperationBatchResult)
84-
if &volumeOperationBatchResult == nil ||
85-
volumeOperationBatchResult.VolumeResults == nil ||
86-
len(volumeOperationBatchResult.VolumeResults) == 0 {
67+
if len(volumeOperationBatchResult.VolumeResults) == 0 {
8768
return nil, errors.New("Cannot get VolumeOperationResult")
8869
}
8970
return volumeOperationBatchResult.VolumeResults, nil

‎govc/test/volume.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ load test_helper
8181
assert_success
8282
assert_matches "my-cluster"
8383

84-
run govc volume.ls -b another-volume # -b invokes CnsQueryVolumeInfo
84+
run govc volume.ls -b "$id" # -b invokes CnsQueryVolumeInfo
8585
assert_success
8686

8787
run govc volume.ls -json -b -n another-volume

0 commit comments

Comments
 (0)