Move vSphere vmdk tempalte to <controller-folder>/templates/bionic/ path;

ycliuhw · mitechie · commit 72c66d035075 · 2020-02-10T14:25:30.000Z
diff --git a/provider/vsphere/environ_broker.go b/provider/vsphere/environ_broker.go
@@ -57,8 +57,8 @@ func modelFolderName(modelUUID, modelName string) string {
 
 // vmdkDirectoryName returns the name of the datastore directory in which
 // the base VMDKs are stored for the controller.
-func vmdkDirectoryName(parentfolder string, controllerUUID string) string {
-	dName := path.Join("juju-vmdks", controllerUUID)
+func vmdkDirectoryName(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("", args.ControllerUUID),
+		VMDKDirectory:          vmdkDirectoryName(env.getVMFolder(), controllerFolderName(args.ControllerUUID)),
 		UserData:               string(userData),
 		Metadata:               args.InstanceConfig.Tags,
 		Constraints:            cons,
diff --git a/provider/vsphere/internal/vsphereclient/client.go b/provider/vsphere/internal/vsphereclient/client.go
@@ -302,12 +302,11 @@ func (c *Client) ResourcePools(ctx context.Context, path string) ([]*object.Reso
 	return items, nil
 }
 
-// EnsureVMFolder creates the a VM folder with the given path if it doesn't
-// already exist.
-// LP: #1849194
-// Two string arguments needed: folderPath will be split on "/"
-// whereas credAttrFolder is added as subfolder structure from DC's root-folder
-func (c *Client) EnsureVMFolder(ctx context.Context, credAttrFolder string, folderPath string) (*object.Folder, error) {
+// EnsureVMFolder creates the a VM folder with the given path if it doesn't already exist.
+// Two string arguments needed: relativeFolderPath will be split on "/"
+// whereas parentFolderName is the subfolder in DC's root-folder.
+// The parentFolderName will fallback to DC's root-folder if it's an empty string.
+func (c *Client) EnsureVMFolder(ctx context.Context, parentFolderName string, relativeFolderPath string) (*object.Folder, error) {
 
 	finder, _, err := c.finder(ctx)
 	if err != nil {
@@ -335,18 +334,12 @@ func (c *Client) EnsureVMFolder(ctx context.Context, credAttrFolder string, fold
 		return nil, errors.Trace(err)
 	}
 
-	// LP: #1849194
-	// User do not necessarily own permission to create credAttrFolder
-	// since that demands Add_folder permissions from the root-folder's DC.
-	// Join paths folders.VMFolder and credentials attribute.
-	parentFolder, err := c.FindFolder(ctx, credAttrFolder)
-	// Consider the case where folder from credential attribute comes empty:
-	// path.Join ignores empty entries.
+	parentFolder, err := c.FindFolder(ctx, parentFolderName)
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
 	// Creating "Juju Controller (...)" folder and then model folder, for example.
-	for _, name := range strings.Split(folderPath, "/") {
+	for _, name := range strings.Split(relativeFolderPath, "/") {
 		folder, err := createFolder(parentFolder, name)
 		if err != nil {
 			return nil, errors.Annotatef(err, "creating folder %q in %q", name, parentFolder.InventoryPath)
diff --git a/provider/vsphere/internal/vsphereclient/createvm.go b/provider/vsphere/internal/vsphereclient/createvm.go
@@ -166,18 +166,18 @@ func (c *Client) ensureTemplateVM(
 	datastore *object.Datastore,
 	args CreateVirtualMachineParams,
 ) (vm *object.VirtualMachine, err error) {
-	finder, _, err := c.finder(ctx)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
 
-	templateFolder, err := c.FindFolder(ctx, path.Join(args.Folder, vmTemplatePath(args)))
+	templateFolder, err := c.FindFolder(ctx, vmTemplatePath(args))
 	if err != nil && !errors.IsNotFound(err) {
 		return nil, errors.Trace(err)
 	}
 	// Consider only the case without error: it means folder already exists
 	// and we can look if there is a template inside.
 	if err == nil {
+		finder, _, err := c.finder(ctx)
+		if err != nil {
+			return nil, errors.Trace(err)
+		}
 		templateVM, err := finder.VirtualMachine(ctx, path.Join(templateFolder.InventoryPath, vmTemplateName(args)))
 		if err == nil && templateVM != nil {
 			return templateVM, nil
@@ -192,7 +192,7 @@ func (c *Client) ensureTemplateVM(
 		return nil, errors.Annotate(err, "creating import spec")
 	}
 
-	vmFolder, err := c.EnsureVMFolder(ctx, args.Folder, vmTemplatePath(args))
+	vmFolder, err := c.EnsureVMFolder(ctx, "", vmTemplatePath(args))
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
