Support accelerator and boot disk size in cvdr.toml #403
Conversation
Signed-off-by: Johnny Yip <[email protected]>
| @@ -82,7 +82,8 @@ const ( | |||
| const ( | |||
| gcpMachineTypeFlag = "gcp_machine_type" | |||
| gcpMinCPUPlatformFlag = "gcp_min_cpu_platform" | |||
| gcpBootDiskSizeGB = "gcp_boot_disk_size_gb" | |||
| gcpBootDiskSizeGBFlag = "gcp_boot_disk_size_gb" | |||
There was a problem hiding this comment.
Thanks for noticing gcpBootDiskSizeGB is missing the Flag suffix. However, let's have this fix in a different commit to keep this commit focused on accelerator config.
| @@ -82,7 +82,8 @@ const ( | |||
| const ( | |||
| gcpMachineTypeFlag = "gcp_machine_type" | |||
| gcpMinCPUPlatformFlag = "gcp_min_cpu_platform" | |||
| gcpBootDiskSizeGB = "gcp_boot_disk_size_gb" | |||
| gcpBootDiskSizeGBFlag = "gcp_boot_disk_size_gb" | |||
| acceleratorFlag = "gcp_accelerator" | |||
There was a problem hiding this comment.
let's name it: gcpAcceleratorFlag
| @@ -541,6 +542,7 @@ func hostCommand(opts *subCommandOpts) *cobra.Command { | |||
| } | |||
|
|
|||
| func cvdCommands(opts *subCommandOpts) []*cobra.Command { | |||
| acceleratorFlagValues := []string{} | |||
| @@ -644,6 +651,10 @@ func cvdCommands(opts *subCommandOpts) []*cobra.Command { | |||
| create.Flags().StringVar(f.ValueRef, name, f.Default, f.Desc) | |||
| create.MarkFlagsMutuallyExclusive(hostFlag, name) | |||
| } | |||
| create.Flags().Int64Var(&createFlags.GCP.BootDiskSizeGB, "host_"+gcpBootDiskSizeGBFlag, | |||
| opts.InitialConfig.DefaultService().Host.GCP.BootDiskSizeGB, gcpBootDiskSizeGBDesc) | |||
| create.Flags().StringSliceVar(&acceleratorFlagValues, acceleratorFlag, | |||
There was a problem hiding this comment.
let's rather add a new entry to the createHostFlags array above:
{
ValueRef: &gcpAcceleratorFlagValues,
Name: gcpAcceleratorFlag,
Default: opts.InitialConfig.DefaultService().Host.GCP.AcceleratorConfigs,
Desc: acceleratorFlagDesc,
},
There was a problem hiding this comment.
I didn't add a new entry to createHostFlags because ValueRef has a type *string whereas gcpAcceleratorFlagValues is a string array. I suppose an option is to make the accelerator flag a string instead of string array even though the underlying accelerator config can accept multiple values?
There was a problem hiding this comment.
I see, let's keep it as is then.
We still need to add the host_ prefix to the flag name, similar to other flags in createHostFlags, it's flag affecting the host and not the virtual device.
| @@ -644,6 +651,10 @@ func cvdCommands(opts *subCommandOpts) []*cobra.Command { | |||
| create.Flags().StringVar(f.ValueRef, name, f.Default, f.Desc) | |||
| create.MarkFlagsMutuallyExclusive(hostFlag, name) | |||
| } | |||
| create.Flags().Int64Var(&createFlags.GCP.BootDiskSizeGB, "host_"+gcpBootDiskSizeGBFlag, | |||
| opts.InitialConfig.DefaultService().Host.GCP.BootDiskSizeGB, gcpBootDiskSizeGBDesc) | |||
| create.Flags().StringSliceVar(&acceleratorFlagValues, acceleratorFlag, | |||
There was a problem hiding this comment.
I see, let's keep it as is then.
We still need to add the host_ prefix to the flag name, similar to other flags in createHostFlags, it's flag affecting the host and not the virtual device.
No description provided.