upload image only to dedicated PE Cluster (#13)

.gitignore

@@ -58,4 +58,4 @@ Temporary Items
 .apdisk
 
 ### VisualStudioCode ###
-.vscode/*
+.vscode/*

builder/nutanix/driver.go

@@ -21,7 +21,7 @@ type Driver interface {
 	//GetImage(string) (*nutanixImage, error)
 	GetHost(string) (*nutanixHost, error)
 	PowerOff(string) error
-	UploadImage(string) (*nutanixImage, error)
+	UploadImage(string, VmConfig) (*nutanixImage, error)
 	DeleteImage(string) error
 	SaveVMDisk(string, string) (*nutanixImage, error)
 	WaitForShutdown(string, <-chan struct{}) bool
@@ -321,7 +321,7 @@ func (d *NutanixDriver) CreateRequest(vm VmConfig) (*v3.VMIntentInput, error) {
 	} else if vm.ClusterName != "" {
 		cluster, err = findClusterByName(conn, vm.ClusterName)
 		if err != nil {
-			return nil, fmt.Errorf("subnet not found %s", vm.ClusterName)
+			return nil, fmt.Errorf("cluster not found %s", vm.ClusterName)
 		}
 	}
 
@@ -423,8 +423,8 @@ func (d *NutanixDriver) Delete(vmUUID string) error {
 	return nil
 }
 
-//UploadImage (string) (*nutanixImage, error)
-func (d *NutanixDriver) UploadImage(imagePath string) (*nutanixImage, error) {
+//UploadImage (string, VmConfig) (*nutanixImage, error)
+func (d *NutanixDriver) UploadImage(imagePath string, vm VmConfig) (*nutanixImage, error) {
 	configCreds := client.Credentials{
 		URL:      fmt.Sprintf("%s:%d", d.ClusterConfig.Endpoint, d.ClusterConfig.Port),
 		Endpoint: d.ClusterConfig.Endpoint,
@@ -441,10 +441,28 @@ func (d *NutanixDriver) UploadImage(imagePath string) (*nutanixImage, error) {
 
 	_, file := path.Split(imagePath)
 
+	cluster := &v3.ClusterIntentResponse{}
+	if vm.ClusterUUID != "" {
+		cluster, err = conn.V3.GetCluster(vm.ClusterUUID)
+		if err != nil {
+			return nil, fmt.Errorf("cluster not found %s", vm.ClusterUUID)
+		}
+	} else if vm.ClusterName != "" {
+		cluster, err = findClusterByName(conn, vm.ClusterName)
+		if err != nil {
+			return nil, fmt.Errorf("cluster not found %s", vm.ClusterName)
+		}
+	}
+
+	refvalue := BuildReferenceValue(*cluster.Metadata.UUID, "cluster")
+	InitialPlacementRef := []*v3.ReferenceValues{refvalue}
 	req := &v3.ImageIntentInput{
 		Spec: &v3.Image{
-			Name:      &file,
-			Resources: &v3.ImageResources{},
+			Name: &file,
+			Resources: &v3.ImageResources{
+				ImageType:               StringPtr("ISO_IMAGE"),
+				InitialPlacementRefList: InitialPlacementRef,
+			},
 		},
 		Metadata: &v3.Metadata{
 			Kind: StringPtr("image"),
@@ -460,7 +478,7 @@ func (d *NutanixDriver) UploadImage(imagePath string) (*nutanixImage, error) {
 	for {
 		running, err := conn.V3.GetImage(*image.Metadata.UUID)
 		if err != nil {
-			log.Printf("Error while image create, %s", err.Error())
+			log.Printf("Error while retrieve image create status, %s", err.Error())
 			return nil, err
 		}
 		log.Printf("Creating Image: %s", *running.Status.State)
@@ -478,7 +496,7 @@ func (d *NutanixDriver) UploadImage(imagePath string) (*nutanixImage, error) {
 	for {
 		running, err := conn.V3.GetImage(*image.Metadata.UUID)
 		if err != nil {
-			log.Printf("Error while upload, %s", err.Error())
+			log.Printf("Error while retrieve upload status, %s", err.Error())
 			return nil, err
 		}
 		if *running.Status.State == "COMPLETE" {
@@ -502,10 +520,12 @@ func (d *NutanixDriver) DeleteImage(imageUUID string) error {
 
 	conn, err := v3.NewV3Client(configCreds)
 	if err != nil {
+		log.Printf("Error while creating new client connection, %s", err.Error())
 		return err
 	}
 	_, err = conn.V3.DeleteImage(imageUUID)
 	if err != nil {
+		log.Printf("Error while deleting image, %s", err.Error())
 		return err
 	}
 	return nil
@@ -617,6 +637,7 @@ func (d *NutanixDriver) SaveVMDisk(diskUUID string, imageName string) (*nutanixI
 	if err != nil {
 		return nil, err
 	}
+
 	req := &v3.ImageIntentInput{
 		Spec: &v3.Image{
 			Name: &imageName,

builder/nutanix/step_build_vm.go

@@ -21,12 +21,14 @@ func (s *stepBuildVM) Run(ctx context.Context, state multistep.StateBag) multist
 	config := state.Get("config").(*Config)
 
 	// Determine if we even have a cd_files disk to attach
+	log.Println("Check for temporary iso-disks to attach")
 	if cdPathRaw, ok := state.GetOk("cd_path"); ok {
 		cdFilesPath := cdPathRaw.(string)
-		log.Println("cdrom found, "+cdFilesPath)
-		cdfilesImage, err := d.UploadImage(cdFilesPath)
+		log.Println("temporary iso found, "+cdFilesPath)
+		cdfilesImage, err := d.UploadImage(cdFilesPath, config.VmConfig)
 		if err != nil {
-			ui.Error("Error uploading image"+ err.Error())
+			ui.Error("Error uploading temporary image:")
+			ui.Error(err.Error())
 			return multistep.ActionHalt
 		}
 		ui.Say("Temporary ISO uploaded")
@@ -37,7 +39,7 @@ func (s *stepBuildVM) Run(ctx context.Context, state multistep.StateBag) multist
 		}
 		config.VmConfig.VmDisks=append(config.VmConfig.VmDisks,temp_cd)
 	} else {
-		log.Println("No cdrom, not attaching.")
+		log.Println("No temporary iso, not attaching.")
 	}
 
 	//CreateRequest()

builder/nutanix/step_copy_image.go

@@ -19,7 +19,7 @@ func (s *stepCopyImage) Run(ctx context.Context, state multistep.StateBag) multi
 	d := state.Get("driver").(Driver)
 	vm, _ := d.GetVM(vmUUID)
 
-	ui.Say("Saving VM for uuid: " + vmUUID)
+	ui.Say("Creating image for uuid: " + vmUUID)
 
 	ui.Message("Initiatiating save VM DISK task.")
 	// Choose disk to replicate - looking for first "DISK"
@@ -46,7 +46,7 @@ func (s *stepCopyImage) Run(ctx context.Context, state multistep.StateBag) multi
 		state.Put("error", err)
 		return multistep.ActionHalt
 	}
-	ui.Message("Successfully saved vm disk: " + *imageResponse.image.Metadata.UUID)
+	ui.Message("Successfully created image: " + *imageResponse.image.Metadata.UUID)
 	state.Put("vm_disk_uuid", (*imageResponse.image.Metadata.UUID))
 	return multistep.ActionContinue
 }

builder/nutanix/utils.go

@@ -15,3 +15,11 @@ func BuildReference(uuid, kind string) *v3.Reference {
 		UUID: StringPtr(uuid),
 	}
 }
+
+// BuildReferenceValue create referencevalue from defined object
+func BuildReferenceValue(uuid, kind string) *v3.ReferenceValues {
+	return &v3.ReferenceValues{
+		Kind: kind,
+		UUID: uuid,
+	}
+}