Support cvdr create --num_instances=N with local source flags

Author: 0405ysj

pkg/cli/cvd.go

@@ -162,43 +162,53 @@ func (c *cvdCreator) Create() ([]*hoapi.CVD, error) {
 	return c.createCVDFromAndroidCI()
 }
 
-const uaEnvConfigTmplStr = `
-{
-  "common": {
-    "host_package": "{{.HostPkg}}"
-  },
-  "instances": [
-    {
-      "vm": {
-        "memory_mb": 8192,
-        "setupwizard_mode": "OPTIONAL",
-        "cpus": 8
-      },
-      "disk": {
-        "default_build": "{{.Artifacts}}"
-      }
-    }
-  ]
-}
-`
-
 var uaEnvConfigTmpl *template.Template
 
 func init() {
-	var err error
-	if uaEnvConfigTmpl, err = template.New("").Parse(uaEnvConfigTmplStr); err != nil {
-		panic(err)
+	const uaEnvConfigTmplStr = `
+	{
+		"common": {
+			"host_package": "{{.HostPkg}}"
+		},
+		"instances": [
+			{{range $idx, $_ := .Instances}}{{if gt $idx 0}}, {{end}}{{template "uaInstanceConfig" .}}{{end}}
+		]
+	}
+	`
+	const uaInstanceConfigTmplStr = `
+	{
+		"vm": {
+			"memory_mb": 8192,
+			"setupwizard_mode": "OPTIONAL",
+			"cpus": 8
+		},
+		"disk": {
+			"default_build": "{{.Artifacts}}"
+		}
 	}
+	`
+	uaEnvConfigTmpl = template.Must(template.New("").Parse(uaEnvConfigTmplStr))
+	template.Must(uaEnvConfigTmpl.New("uaInstanceConfig").Parse(uaInstanceConfigTmplStr))
 }
 
-type uaEnvConfigTmplData struct {
+type uaInstanceConfigTmplData struct {
 	Artifacts string
+}
+
+type uaEnvConfigTmplData struct {
+	Instances []*uaInstanceConfigTmplData
 	HostPkg   string
 }
 
-func buildUAEnvConfig(artifacts []string, hostPkg string) (map[string]interface{}, error) {
+func buildUAEnvConfig(artifacts []string, hostPkg string, numInstance int) (map[string]interface{}, error) {
 	var b bytes.Buffer
-	if err := uaEnvConfigTmpl.Execute(&b, uaEnvConfigTmplData{Artifacts: strings.Join(artifacts, ","), HostPkg: hostPkg}); err != nil {
+	instance := uaInstanceConfigTmplData{Artifacts: strings.Join(artifacts, ",")}
+	instances := make([]*uaInstanceConfigTmplData, numInstance)
+	for idx := 0; idx < numInstance; idx++ {
+		instances[idx] = &instance
+	}
+	config := uaEnvConfigTmplData{Instances: instances, HostPkg: hostPkg}
+	if err := uaEnvConfigTmpl.Execute(&b, config); err != nil {
 		return nil, fmt.Errorf("failed to fulfill template: %w", err)
 	}
 
@@ -239,7 +249,7 @@ func (c *cvdCreator) createCVDFromLocalBuild() ([]*hoapi.CVD, error) {
 	if err := verifyCVDHostPackageTar(hostOut); err != nil {
 		return nil, err
 	}
-	envConfig, err := buildUAEnvConfig(artifacts, filepath.Join(hostOut, CVDHostPackageName))
+	envConfig, err := buildUAEnvConfig(artifacts, filepath.Join(hostOut, CVDHostPackageName), c.opts.NumInstances)
 	if err != nil {
 		return nil, err
 	}
@@ -422,7 +432,7 @@ func (c *cvdCreator) createCVDFromLocalSrcs() ([]*hoapi.CVD, error) {
 	if err := c.opts.CreateCVDLocalOpts.validate(); err != nil {
 		return nil, fmt.Errorf("invalid local source: %w", err)
 	}
-	envConfig, err := buildUAEnvConfig(c.opts.CreateCVDLocalOpts.artifacts(), c.opts.CreateCVDLocalOpts.LocalCVDHostPkgSrc)
+	envConfig, err := buildUAEnvConfig(c.opts.CreateCVDLocalOpts.artifacts(), c.opts.CreateCVDLocalOpts.LocalCVDHostPkgSrc, c.opts.NumInstances)
 	if err != nil {
 		return nil, err
 	}