Merge pull request #3792 from dougm/vcsim-perfman-vcls

fix: vcsim: Avoid panic in QueryAvailablePerfMetric if VM has no Datastore

Author: dougm

simulator/performance_manager.go

@@ -109,7 +109,9 @@ func (p *PerformanceManager) buildAvailablePerfMetricsQueryResponse(ids []types.
 				r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: strconv.Itoa(i)})
 			}
 		case "$physDisk":
-			r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: datastoreURL})
+			if datastoreURL != "" {
+				r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: datastoreURL})
+			}
 		case "$file":
 			r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: "DISKFILE"})
 			r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: "DELTAFILE"})
@@ -128,7 +130,11 @@ func (p *PerformanceManager) queryAvailablePerfMetric(ctx *Context, entity types
 	switch entity.Type {
 	case "VirtualMachine":
 		vm := ctx.Map.Get(entity).(*VirtualMachine)
-		return p.buildAvailablePerfMetricsQueryResponse(p.vmMetrics, int(vm.Summary.Config.NumCpu), vm.Datastore[0].Value)
+		ds := ""
+		if len(vm.Datastore) != 0 {
+			ds = vm.Datastore[0].Value
+		}
+		return p.buildAvailablePerfMetricsQueryResponse(p.vmMetrics, int(vm.Summary.Config.NumCpu), ds)
 	case "HostSystem":
 		host := ctx.Map.Get(entity).(*HostSystem)
 		return p.buildAvailablePerfMetricsQueryResponse(p.hostMetrics, int(host.Hardware.CpuInfo.NumCpuThreads), host.Datastore[0].Value)

simulator/performance_manager_test.go

@@ -174,6 +174,15 @@ func TestQueryAvailablePerfMetric(t *testing.T) {
 		}
 	}
 
+	vm.Datastore = nil // e.g. vCLS VMs have no Datastore
+	if info, err := p.AvailableMetric(ctx, vm.Reference(), 20); err != nil {
+		t.Fatal(err)
+	} else {
+		if len(info) == 0 {
+			t.Fatal("Expected non-empty list of vm")
+		}
+	}
+
 	host := ctx.Map.Any("HostSystem").(*HostSystem)
 	if info, err := p.AvailableMetric(ctx, host.Reference(), 20); err != nil {
 		t.Fatal(err)