Skip to content

Commit f16c46b

Browse files
dougmdougm
committed
vcsim: add vsan Datastore support
- Use a single top-level TempDir for a vcsim Model instance. Make this path available via OptionManager. This top-level can be used internally as backing for vSAN Datastores. - Split FileManager.resolve logic into Datastore.resolve and use that method everywhere for resolving a Datastore relative path to local file system absolute path. This is where top-level vSAN friendlyName is now translated to vSAN object UUID. - ReconfigureComputeResource_Task will now create a vsanDatastore when spec.VsanConfig.Enabled == true. This Datastore will be added to existing hosts in the cluster, and any hosts later added to the cluster. - HostDatastoreBrowser search methods now populate the FriendlyName field for vSAN Datastores. - The tests added to datastore.bats cover these cases using existing govc commands. Signed-off-by: Doug MacEachern <[email protected]>
1 parent a640504 commit f16c46b

19 files changed

+413
-154
lines changed

Diff for: ‎govc/test/cli.bats

100644100755
+2-2
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ load test_helper
174174
}
175175

176176
@test "govc format error" {
177-
vcsim_env
177+
vcsim_env -host 1
178178

179179
vm=DC0_H0_VM0
180180

@@ -192,7 +192,7 @@ load test_helper
192192
assert_failure
193193
gofmt <<<"$output"
194194

195-
run govc datastore.create -type local -name vsanDatastore -path "$BATS_TMPDIR" DC0_C0_H0
195+
run govc cluster.change -vsan-enabled DC0_C0
196196
assert_success
197197

198198
run govc vm.create -ds vsanDatastore "$(new_id)"

Diff for: ‎govc/test/datastore.bats

+98
Original file line numberDiff line numberDiff line change
@@ -436,3 +436,101 @@ upload_file() {
436436
run govc datastore.cluster.info -json
437437
assert_success
438438
}
439+
440+
@test "vsan datastore" {
441+
vcsim_start -host 2
442+
443+
run govc datastore.info vsanDatastore
444+
assert_failure
445+
446+
run govc cluster.change -vsan-enabled /DC0/host/DC0_C0
447+
assert_success
448+
449+
run govc datastore.info vsanDatastore
450+
assert_success
451+
452+
run govc collect -s datastore/LocalDS_0 capability.topLevelDirectoryCreateSupported
453+
assert_success "true"
454+
455+
run govc collect -s datastore/vsanDatastore capability.topLevelDirectoryCreateSupported
456+
assert_success "false"
457+
458+
export GOVC_RESOURCE_POOL=DC0_C0/Resources
459+
export GOVC_NETWORK=DC0_DVPG0
460+
export GOVC_DATASTORE=vsanDatastore
461+
462+
run govc datastore.mkdir "foo"
463+
assert_success
464+
465+
run govc datastore.rm "foo"
466+
assert_success
467+
468+
run govc datastore.mkdir -namespace "bar"
469+
assert_success
470+
path="$output"
471+
472+
run govc datastore.rm -namespace "bar"
473+
assert_failure
474+
475+
run govc datastore.rm -namespace "$path"
476+
assert_success
477+
478+
run govc vm.create -ds vsanDatastore "$(new_id)"
479+
assert_failure # vSAN requires >= 3 hosts
480+
481+
run govc cluster.add -cluster DC0_C0 -hostname 10.0.0.42 -username user -password pass
482+
assert_success
483+
484+
run govc dvs.add -dvs DVS0 10.0.0.42
485+
assert_success
486+
487+
run govc vm.create "nginx"
488+
assert_success
489+
490+
uuid=$(govc datastore.ls -H=false -json | jq -r '.[].file[] | select(.friendlyName == "nginx") | .path')
491+
run awk -F- "{print NF}" <<<"$uuid" # validate we have a uuid, not "nginx"
492+
assert_success "5"
493+
494+
# friendlyName used by default
495+
govc datastore.ls | grep "nginx"
496+
govc datastore.ls | grep -v "$uuid"
497+
498+
# -H=false disables use of friendlyName
499+
govc datastore.ls -H=false | grep "$uuid"
500+
govc datastore.ls -H=false | grep -v "nginx"
501+
502+
run govc datastore.download "nginx/nginx.vmx" -
503+
assert_success
504+
505+
run govc datastore.upload - "nginx/nginx.vmx" <<<"$output"
506+
assert_success
507+
508+
run govc datastore.download "$uuid/nginx.vmx" -
509+
assert_success
510+
511+
run govc datastore.upload - "$uuid/nginx.vmx" <<<"$output"
512+
assert_success
513+
514+
govc vm.destroy "nginx"
515+
assert_success
516+
517+
# same friendly name should have a different uuid with a new vm
518+
run govc vm.create "nginx"
519+
assert_success
520+
521+
uuid2=$(govc datastore.ls -H=false -json | jq -r '.[].file[] | select(.friendlyName == "nginx") | .path')
522+
[ "$uuid" != "$uuid2" ]
523+
524+
run govc disk.create -size 10M my-disk
525+
assert_success
526+
527+
run govc datastore.ls fcd
528+
assert_success
529+
530+
uuid=$(govc datastore.ls -H=false -json | jq -r '.[].file[] | select(.friendlyName == "fcd") | .path')
531+
run awk -F- "{print NF}" <<<"$uuid" # validate we have a uuid, not "nginx"
532+
assert_success "5"
533+
534+
run govc datastore.ls "$uuid"
535+
assert_success
536+
}

Diff for: ‎simulator/cluster_compute_resource.go

+57-8
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ func (add *addHost) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
6969
cr.Host = append(cr.Host, host.Reference())
7070
addComputeResource(cr.Summary.GetComputeResourceSummary(), host)
7171

72+
if cr.vsanIsEnabled() {
73+
cr.addStorageHost(task.ctx, host.Self)
74+
}
75+
7276
return host.Reference(), nil
7377
}
7478

@@ -80,7 +84,14 @@ func (c *ClusterComputeResource) AddHostTask(ctx *Context, add *types.AddHost_Ta
8084
}
8185
}
8286

83-
func (c *ClusterComputeResource) update(cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
87+
func (c *ClusterComputeResource) vsanIsEnabled() bool {
88+
if cfg := c.ConfigurationEx.(*types.ClusterConfigInfoEx).VsanConfigInfo; cfg != nil {
89+
return isTrue(cfg.Enabled)
90+
}
91+
return false
92+
}
93+
94+
func (c *ClusterComputeResource) update(_ *Context, cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
8495
if cspec.DasConfig != nil {
8596
if val := cspec.DasConfig.Enabled; val != nil {
8697
cfg.DasConfig.Enabled = val
@@ -101,7 +112,7 @@ func (c *ClusterComputeResource) update(cfg *types.ClusterConfigInfoEx, cspec *t
101112
return nil
102113
}
103114

104-
func (c *ClusterComputeResource) updateRules(cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
115+
func (c *ClusterComputeResource) updateRules(_ *Context, cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
105116
for _, spec := range cspec.RulesSpec {
106117
var i int
107118
exists := false
@@ -148,7 +159,7 @@ func (c *ClusterComputeResource) updateRules(cfg *types.ClusterConfigInfoEx, csp
148159
return nil
149160
}
150161

151-
func (c *ClusterComputeResource) updateGroups(cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
162+
func (c *ClusterComputeResource) updateGroups(_ *Context, cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
152163
for _, spec := range cspec.GroupSpec {
153164
var i int
154165
exists := false
@@ -192,7 +203,7 @@ func (c *ClusterComputeResource) updateGroups(cfg *types.ClusterConfigInfoEx, cs
192203
return nil
193204
}
194205

195-
func (c *ClusterComputeResource) updateOverridesDAS(cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
206+
func (c *ClusterComputeResource) updateOverridesDAS(_ *Context, cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
196207
for _, spec := range cspec.DasVmConfigSpec {
197208
var i int
198209
var key types.ManagedObjectReference
@@ -243,7 +254,7 @@ func (c *ClusterComputeResource) updateOverridesDAS(cfg *types.ClusterConfigInfo
243254
return nil
244255
}
245256

246-
func (c *ClusterComputeResource) updateOverridesDRS(cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
257+
func (c *ClusterComputeResource) updateOverridesDRS(_ *Context, cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
247258
for _, spec := range cspec.DrsVmConfigSpec {
248259
var i int
249260
var key types.ManagedObjectReference
@@ -289,7 +300,7 @@ func (c *ClusterComputeResource) updateOverridesDRS(cfg *types.ClusterConfigInfo
289300
return nil
290301
}
291302

292-
func (c *ClusterComputeResource) updateOverridesVmOrchestration(cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
303+
func (c *ClusterComputeResource) updateOverridesVmOrchestration(_ *Context, cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
293304
for _, spec := range cspec.VmOrchestrationSpec {
294305
var i int
295306
var key types.ManagedObjectReference
@@ -335,24 +346,62 @@ func (c *ClusterComputeResource) updateOverridesVmOrchestration(cfg *types.Clust
335346
return nil
336347
}
337348

349+
func (c *ClusterComputeResource) addStorageHost(ctx *Context, ref types.ManagedObjectReference) types.BaseMethodFault {
350+
ds := ctx.Map.Get(ref).(*HostSystem).ConfigManager.DatastoreSystem
351+
hds := ctx.Map.Get(*ds).(*HostDatastoreSystem)
352+
return hds.createVsanDatastore(ctx)
353+
}
354+
355+
func (c *ClusterComputeResource) updateVSAN(ctx *Context, cfg *types.ClusterConfigInfoEx, cspec *types.ClusterConfigSpecEx) types.BaseMethodFault {
356+
if cspec.VsanConfig == nil {
357+
return nil
358+
}
359+
360+
if cfg.VsanConfigInfo == nil {
361+
cfg.VsanConfigInfo = cspec.VsanConfig
362+
if cfg.VsanConfigInfo.DefaultConfig == nil {
363+
cfg.VsanConfigInfo.DefaultConfig = new(types.VsanClusterConfigInfoHostDefaultInfo)
364+
}
365+
} else {
366+
if cspec.VsanConfig.Enabled != nil {
367+
cfg.VsanConfigInfo.Enabled = cspec.VsanConfig.Enabled
368+
}
369+
}
370+
371+
if cfg.VsanConfigInfo.DefaultConfig.Uuid == "" {
372+
cfg.VsanConfigInfo.DefaultConfig.Uuid = uuid.NewString()
373+
}
374+
375+
if isTrue(cfg.VsanConfigInfo.Enabled) {
376+
for _, ref := range c.Host {
377+
if err := c.addStorageHost(ctx, ref); err != nil {
378+
return err
379+
}
380+
}
381+
}
382+
383+
return nil
384+
}
385+
338386
func (c *ClusterComputeResource) ReconfigureComputeResourceTask(ctx *Context, req *types.ReconfigureComputeResource_Task) soap.HasFault {
339387
task := CreateTask(c, "reconfigureCluster", func(*Task) (types.AnyType, types.BaseMethodFault) {
340388
spec, ok := req.Spec.(*types.ClusterConfigSpecEx)
341389
if !ok {
342390
return nil, new(types.InvalidArgument)
343391
}
344392

345-
updates := []func(*types.ClusterConfigInfoEx, *types.ClusterConfigSpecEx) types.BaseMethodFault{
393+
updates := []func(*Context, *types.ClusterConfigInfoEx, *types.ClusterConfigSpecEx) types.BaseMethodFault{
346394
c.update,
347395
c.updateRules,
348396
c.updateGroups,
349397
c.updateOverridesDAS,
350398
c.updateOverridesDRS,
351399
c.updateOverridesVmOrchestration,
400+
c.updateVSAN,
352401
}
353402

354403
for _, update := range updates {
355-
if err := update(c.ConfigurationEx.(*types.ClusterConfigInfoEx), spec); err != nil {
404+
if err := update(ctx, c.ConfigurationEx.(*types.ClusterConfigInfoEx), spec); err != nil {
356405
return nil, err
357406
}
358407
}

Diff for: ‎simulator/datastore.go

+61-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ import (
1111
"strings"
1212
"time"
1313

14+
"github.com/google/uuid"
15+
16+
"github.com/vmware/govmomi/internal"
1417
"github.com/vmware/govmomi/object"
18+
"github.com/vmware/govmomi/units"
1519
"github.com/vmware/govmomi/vim25/methods"
1620
"github.com/vmware/govmomi/vim25/mo"
1721
"github.com/vmware/govmomi/vim25/soap"
@@ -20,6 +24,8 @@ import (
2024

2125
type Datastore struct {
2226
mo.Datastore
27+
28+
namespace map[string]string // TODO: make thread safe
2329
}
2430

2531
func (ds *Datastore) eventArgument() *types.DatastoreEventArgument {
@@ -48,6 +54,54 @@ func (ds *Datastore) model(m *Model) error {
4854
return nil
4955
}
5056

57+
// resolve Datastore relative file path to absolute path.
58+
// vSAN top-level directories are named with its vSAN object uuid.
59+
// The directory uuid or friendlyName can be used the various FileManager,
60+
// VirtualDiskManager, etc. methods that have a Datastore path param.
61+
// Note that VirtualDevice file backing paths must use the vSAN uuid.
62+
func (ds *Datastore) resolve(ctx *Context, p string, remove ...bool) string {
63+
if p == "" || !internal.IsDatastoreVSAN(ds.Datastore) {
64+
return path.Join(ds.Summary.Url, p)
65+
}
66+
67+
rm := len(remove) != 0 && remove[0]
68+
unlock := ctx.Map.AcquireLock(ctx, ds.Self)
69+
defer unlock()
70+
71+
if ds.namespace == nil {
72+
ds.namespace = make(map[string]string)
73+
}
74+
75+
elem := strings.Split(p, "/")
76+
dir := elem[0]
77+
78+
_, err := uuid.Parse(dir)
79+
if err != nil {
80+
// Translate friendlyName to UUID
81+
id, ok := ds.namespace[dir]
82+
if !ok {
83+
id = uuid.NewString()
84+
ds.namespace[dir] = id
85+
}
86+
87+
elem[0] = id
88+
p = path.Join(elem...)
89+
if rm {
90+
delete(ds.namespace, id)
91+
}
92+
} else if rm {
93+
// UUID was given
94+
for name, id := range ds.namespace {
95+
if p == id {
96+
delete(ds.namespace, name)
97+
break
98+
}
99+
}
100+
}
101+
102+
return path.Join(ds.Summary.Url, p)
103+
}
104+
51105
func parseDatastorePath(dsPath string) (*object.DatastorePath, types.BaseMethodFault) {
52106
var p object.DatastorePath
53107

@@ -58,7 +112,7 @@ func parseDatastorePath(dsPath string) (*object.DatastorePath, types.BaseMethodF
58112
return nil, &types.InvalidDatastorePath{DatastorePath: dsPath}
59113
}
60114

61-
func (ds *Datastore) RefreshDatastore(*types.RefreshDatastore) soap.HasFault {
115+
func (ds *Datastore) RefreshDatastore(*Context, *types.RefreshDatastore) soap.HasFault {
62116
r := &methods.RefreshDatastoreBody{}
63117

64118
_, err := os.Stat(ds.Info.GetDatastoreInfo().Url)
@@ -67,8 +121,14 @@ func (ds *Datastore) RefreshDatastore(*types.RefreshDatastore) soap.HasFault {
67121
return r
68122
}
69123

124+
ds.Summary.Capacity = int64(units.ByteSize(units.TB)) * int64(len(ds.Host))
125+
ds.Summary.FreeSpace = ds.Summary.Capacity
126+
70127
info := ds.Info.GetDatastoreInfo()
71128

129+
info.FreeSpace = ds.Summary.FreeSpace
130+
info.MaxMemoryFileSize = ds.Summary.Capacity
131+
info.MaxFileSize = ds.Summary.Capacity
72132
info.Timestamp = types.NewTime(time.Now())
73133

74134
r.Res = &types.RefreshDatastoreResponse{}

Diff for: ‎simulator/datastore_namespace_manager.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ func (m *DatastoreNamespaceManager) ConvertNamespacePathToUuidPath(ctx *Context,
3535
}
3636

3737
var ds *Datastore
38+
ns := ""
39+
3840
for _, ref := range dc.Datastore {
3941
ds = ctx.Map.Get(ref).(*Datastore)
40-
if strings.HasPrefix(req.NamespaceUrl, ds.Summary.Url) {
42+
ns = strings.TrimPrefix(req.NamespaceUrl, ds.Summary.Url)
43+
if ns != req.NamespaceUrl {
4144
break
4245
}
4346
ds = nil
@@ -54,7 +57,7 @@ func (m *DatastoreNamespaceManager) ConvertNamespacePathToUuidPath(ctx *Context,
5457
}
5558

5659
body.Res = &types.ConvertNamespacePathToUuidPathResponse{
57-
Returnval: req.NamespaceUrl,
60+
Returnval: ds.resolve(ctx, ns),
5861
}
5962

6063
return body
@@ -101,10 +104,8 @@ func (m *DatastoreNamespaceManager) CreateDirectory(ctx *Context, req *types.Cre
101104
if fault.Fault() != nil {
102105
body.Fault_ = fault.Fault()
103106
} else {
104-
dir := ds.Info.GetDatastoreInfo().Url
105-
106107
body.Res = &types.CreateDirectoryResponse{
107-
Returnval: path.Join(dir, req.DisplayName),
108+
Returnval: ds.resolve(ctx, req.DisplayName),
108109
}
109110
}
110111

0 commit comments

Comments
 (0)