Fixed several errors

juanfont · Feb 17, 2021 · e9c723f · e9c723f
1 parent c1a9ae0
commit e9c723f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/driver/helpers.go b/driver/helpers.go
@@ -61,12 +61,14 @@ func (d *Driver) getVApp() (*govcd.VApp, error) {
 	}
 
 	if d.VAppHREF != "" { // this is way quicker
+		log.Infof("Fetching vApp the quick way")
 		vapp := govcd.NewVApp(&client.Client)
 		vapp.VApp.HREF = d.VAppHREF
 		err = vapp.Refresh()
 		if err != nil {
 			return nil, err
 		}
+		return vapp, nil
 	}
 
 	log.Infof("Trying alternative method to fetch the vApp...")
@@ -92,12 +94,14 @@ func (d *Driver) getVM() (*govcd.VM, error) {
 		return nil, err
 	}
 	if d.VMHREF != "" {
+		log.Infof("Fetching VM the quick way")
 		vm := govcd.NewVM(&client.Client)
 		vm.VM.HREF = d.VMHREF
 		err = vm.Refresh()
 		if err != nil {
-			return vm, nil
+			return nil, err
 		}
+		return vm, nil
 	}
 
 	log.Infof("Trying alternative method to fetch the VM...")

diff --git a/driver/vcd.go b/driver/vcd.go
@@ -143,6 +143,7 @@ func (d *Driver) Create() error {
 	if err != nil {
 		return err
 	}
+	d.VAppHREF = vapp.VApp.HREF
 
 	if len(vapp.VApp.Children.VM) != 1 {
 		return fmt.Errorf("VM count != 1")
@@ -155,6 +156,7 @@ func (d *Driver) Create() error {
 		return err
 	}
 	log.Infof("Found VM: %s...", vm.VM.Name)
+	d.VMHREF = vm.VM.HREF
 
 	cWait := make(chan string, 1)
 	go func() {