Merge pull request #3752 from dougm/vcsim-importspec-version

dougm · web-flow · commit 053de4ac131a · 2025-04-03T10:36:19.000-07:00
vcsim: support multiple VirtualSystemType in OvfManager.CreateImportSpec
diff --git a/simulator/ovf_manager.go b/simulator/ovf_manager.go
@@ -190,7 +190,8 @@ func (m *OvfManager) CreateImportSpec(ctx *Context, req *types.CreateImportSpec)
 
 	hw := env.VirtualSystem.VirtualHardware[0]
 	if vmx := hw.System.VirtualSystemType; vmx != nil {
-		spec.ConfigSpec.Version = *vmx
+		version := strings.Split(*vmx, ",")[0]
+		spec.ConfigSpec.Version = strings.TrimSpace(version)
 	}
 
 	ndisk := 0

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,8 @@ func (m OvfManager) CreateImportSpec(ctx Context, req *types.CreateImportSpec)`
`190`	`190`
`191`	`191`	`hw := env.VirtualSystem.VirtualHardware[0]`
`192`	`192`	`if vmx := hw.System.VirtualSystemType; vmx != nil {`
`193`		`- spec.ConfigSpec.Version = *vmx`
	`193`	`+ version := strings.Split(*vmx, ",")[0]`
	`194`	`+ spec.ConfigSpec.Version = strings.TrimSpace(version)`
`194`	`195`	`}`
`195`	`196`
`196`	`197`	`ndisk := 0`