Merge pull request #45 from luthermonson/ui-tweaks

split param to vm/template/library/legacy for ui
rancher · Nov 4, 2019 · 8ebe1f8 · 8ebe1f8
2 parents fb18c42 + 30be8bf
commit 8ebe1f8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/drivers/vmwarevsphere/flags.go b/drivers/vmwarevsphere/flags.go
@@ -11,6 +11,13 @@ import (
 	"github.com/vmware/govmomi/vim25/types"
 )
 
+var creationTypes = map[string]bool{
+	"vm":       true,
+	"template": true,
+	"library":  true,
+	"legacy":   true,
+}
+
 func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 	return []mcnflag.Flag{
 		mcnflag.IntFlag{
@@ -125,7 +132,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 		mcnflag.StringFlag{
 			EnvVar: "VSPHERE_CREATION_TYPE",
 			Name:   "vmwarevsphere-creation-type",
-			Usage:  "Creation type when creating a new virtual machine. Supported values: default or clone",
+			Usage:  "Creation type when creating a new virtual machine. Supported values: vm, template, library, legacy",
 			Value:  defaultCreationType,
 		},
 		mcnflag.StringFlag{
@@ -217,10 +224,14 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	d.VAppProperties = flags.StringSlice("vmwarevsphere-vapp-property")
 	d.SetSwarmConfigFromFlags(flags)
 	d.ISO = d.ResolveStorePath(isoFilename)
+
 	d.CreationType = flags.String("vmwarevsphere-creation-type")
-	d.ContentLibrary = flags.String("vmwarevsphere-content-library")
+	if _, ok := creationTypes[d.CreationType]; !ok {
+		return fmt.Errorf("Creation type %s not supported", d.CreationType)
+	}
 
-	if d.CreationType == "clone" {
+	d.ContentLibrary = flags.String("vmwarevsphere-content-library")
+	if d.CreationType != "legacy" {
 		d.CloneFrom = flags.String("vmwarevsphere-clone-from")
 		if d.CloneFrom == "" {
 			return fmt.Errorf("Creation type clone needs a VM name to clone from, use --vmwarevsphere-clone-from.")

diff --git a/drivers/vmwarevsphere/vsphere.go b/drivers/vmwarevsphere/vsphere.go
@@ -335,14 +335,14 @@ func (d *Driver) Create() error {
 	}
 
 	switch d.CreationType {
-	case "default":
+	case "legacy":
 		log.Infof("Creating VM...")
 		b2dutils := mcnutils.NewB2dUtils(d.StorePath)
 		if err := b2dutils.CopyIsoToMachineDir(d.Boot2DockerURL, d.MachineName); err != nil {
 			return err
 		}
 		return d.createManual()
-	case "clone":
+	case "vm", "template", "libary":
 		if d.ContentLibrary != "" {
 			log.Infof("Creating VM from /%s/%s...", d.ContentLibrary, d.CloneFrom)
 			return d.createFromLibraryName()