Merge pull request #3524 from dougm/issue-3523

fix: use complete InventoryPath in Datacenter.Folders

Author: dougm

object/datacenter.go

@@ -1,11 +1,11 @@
 /*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
+Copyright (c) 2015-2024 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +18,7 @@ package object
 
 import (
 	"context"
-	"fmt"
+	"path"
 
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/methods"
@@ -69,8 +69,12 @@ func (d *Datacenter) Folders(ctx context.Context) (*DatacenterFolders, error) {
 		{"network", &df.NetworkFolder.InventoryPath},
 	}
 
+	dcPath := d.InventoryPath
+	if dcPath == "" {
+		dcPath = "/" + md.Name
+	}
 	for _, p := range paths {
-		*p.path = fmt.Sprintf("/%s/%s", md.Name, p.name)
+		*p.path = path.Join(dcPath, p.name)
 	}
 
 	return df, nil

object/datacenter_test.go

@@ -1,11 +1,11 @@
 /*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
+Copyright (c) 2015-2024 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,60 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package object
+package object_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/simulator"
+	"github.com/vmware/govmomi/vim25"
+)
 
 // Datacenter should implement the Reference interface.
-var _ Reference = Datacenter{}
+var _ object.Reference = object.Datacenter{}
+
+func TestDatacenterFolders(t *testing.T) {
+	model := simulator.VPX()
+	model.Datacenter = 2
+	model.Folder = 1
+
+	simulator.Test(func(ctx context.Context, c *vim25.Client) {
+		search := object.NewSearchIndex(c)
+		finder := find.NewFinder(c)
+
+		dc, err := finder.Datacenter(ctx, "DC1")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		f, err := dc.Folders(ctx)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		folders := []*object.Folder{
+			f.DatastoreFolder,
+			f.HostFolder,
+			f.NetworkFolder,
+			f.VmFolder,
+		}
+
+		for _, folder := range folders {
+			p := "/F0/DC1/" + folder.Name()
+			if p != folder.InventoryPath {
+				t.Errorf("InventoryPath=%s", folder.InventoryPath)
+			}
+
+			ref, err := search.FindByInventoryPath(ctx, folder.InventoryPath)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if ref == nil {
+				t.Errorf("invalid InventoryPath: %s", folder.InventoryPath)
+			}
+		}
+	}, model)
+}