Rename vmdkDirectoryName to templateDirectoryName;

Kelvin Liu · mitechie · commit fe67c7b1fbe6 · 2020-02-10T14:25:30.000Z
diff --git a/provider/vsphere/environ.go b/provider/vsphere/environ.go
@@ -239,7 +239,7 @@ func (env *sessionEnviron) DestroyController(ctx callcontext.ProviderCallContext
 		return errors.Annotate(err, "listing datastores")
 	}
 	for _, ds := range datastores {
-		datastorePath := fmt.Sprintf("[%s] %s", ds.Name, vmdkDirectoryName(env.getVMFolder(), controllerUUID))
+		datastorePath := fmt.Sprintf("[%s] %s", ds.Name, templateDirectoryName(env.getVMFolder(), controllerUUID))
 		logger.Debugf("deleting: %s", datastorePath)
 		if err := env.client.DeleteDatastoreFile(env.ctx, datastorePath); err != nil {
 			HandleCredentialError(err, env, ctx)
diff --git a/provider/vsphere/environ_broker.go b/provider/vsphere/environ_broker.go
@@ -55,9 +55,9 @@ func modelFolderName(modelUUID, modelName string) string {
 	return fmt.Sprintf("Model %q (%s)", modelName, modelUUID)
 }
 
-// vmdkDirectoryName returns the name of the datastore directory in which
-// the base VMDKs are stored for the controller.
-func vmdkDirectoryName(parentfolder string, controllerFolderName string) string {
+// templateDirectoryName returns the name of the datastore directory in which
+// the VM templates are stored for the controller.
+func templateDirectoryName(parentfolder string, controllerFolderName string) string {
 	dName := path.Join(controllerFolderName, "templates")
 	if parentfolder != "" {
 		dName = path.Join(parentfolder, dName)
@@ -224,7 +224,7 @@ func (env *sessionEnviron) newRawInstance(
 		Series:                 series,
 		ReadOVA:                readOVA,
 		OVASHA256:              img.Sha256,
-		VMDKDirectory:          vmdkDirectoryName(env.getVMFolder(), controllerFolderName(args.ControllerUUID)),
+		VMDKDirectory:          templateDirectoryName(env.getVMFolder(), controllerFolderName(args.ControllerUUID)),
 		UserData:               string(userData),
 		Metadata:               args.InstanceConfig.Tags,
 		Constraints:            cons,

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ func (env *sessionEnviron) DestroyController(ctx callcontext.ProviderCallContext`
`239`	`239`	`return errors.Annotate(err, "listing datastores")`
`240`	`240`	`}`
`241`	`241`	`for _, ds := range datastores {`
`242`		`- datastorePath := fmt.Sprintf("[%s] %s", ds.Name, vmdkDirectoryName(env.getVMFolder(), controllerUUID))`
	`242`	`+ datastorePath := fmt.Sprintf("[%s] %s", ds.Name, templateDirectoryName(env.getVMFolder(), controllerUUID))`
`243`	`243`	`logger.Debugf("deleting: %s", datastorePath)`
`244`	`244`	`if err := env.client.DeleteDatastoreFile(env.ctx, datastorePath); err != nil {`
`245`	`245`	`HandleCredentialError(err, env, ctx)`