From 7d1b95c907383a4e67a7e0db0035fe826b5d446f Mon Sep 17 00:00:00 2001 From: Danny Lockard Date: Fri, 16 Jan 2015 10:34:12 -0600 Subject: [PATCH] Formatting fix :) --- builder/virtualbox/common/driver.go | 6 +++--- builder/virtualbox/common/driver_4_2.go | 2 +- builder/virtualbox/common/driver_mock.go | 8 ++++---- builder/virtualbox/iso/step_create_disk.go | 24 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/builder/virtualbox/common/driver.go b/builder/virtualbox/common/driver.go index 9fb82f7da..add59c7f1 100644 --- a/builder/virtualbox/common/driver.go +++ b/builder/virtualbox/common/driver.go @@ -18,9 +18,9 @@ import ( type Driver interface { // Create a SATA controller. CreateSATAController(vm string, controller string) error - - // Create a SCSI controller. - CreateSCSIController(vm string, controller string) error + + // Create a SCSI controller. + CreateSCSIController(vm string, controller string) error // Delete a VM by name Delete(string) error diff --git a/builder/virtualbox/common/driver_4_2.go b/builder/virtualbox/common/driver_4_2.go index f53a7ac4b..c375fba32 100644 --- a/builder/virtualbox/common/driver_4_2.go +++ b/builder/virtualbox/common/driver_4_2.go @@ -42,7 +42,7 @@ func (d *VBox42Driver) CreateSCSIController(vmName string, name string) error { "storagectl", vmName, "--name", name, "--add", "scsi", - "--controller", "LSILogic", + "--controller", "LSILogic", } return d.VBoxManage(command...) diff --git a/builder/virtualbox/common/driver_mock.go b/builder/virtualbox/common/driver_mock.go index b0f5dbe94..da08ad072 100644 --- a/builder/virtualbox/common/driver_mock.go +++ b/builder/virtualbox/common/driver_mock.go @@ -9,7 +9,7 @@ type DriverMock struct { CreateSATAControllerController string CreateSATAControllerErr error - CreateSCSIControllerVM string + CreateSCSIControllerVM string CreateSCSIControllerController string CreateSCSIControllerErr error @@ -54,9 +54,9 @@ func (d *DriverMock) CreateSATAController(vm string, controller string) error { } func (d *DriverMock) CreateSCSIController(vm string, controller string) error { - d.CreateSCSIControllerVM = vm - d.CreateSCSIControllerController = vm - return d.CreateSCSIControllerErr + d.CreateSCSIControllerVM = vm + d.CreateSCSIControllerController = vm + return d.CreateSCSIControllerErr } func (d *DriverMock) Delete(name string) error { diff --git a/builder/virtualbox/iso/step_create_disk.go b/builder/virtualbox/iso/step_create_disk.go index 626ca9b28..82b849dbe 100644 --- a/builder/virtualbox/iso/step_create_disk.go +++ b/builder/virtualbox/iso/step_create_disk.go @@ -63,24 +63,24 @@ func (s *stepCreateDisk) Run(state multistep.StateBag) multistep.StepAction { } } - if config.HardDriveInterface == "scsi" { - if err := driver.CreateSCSIController(vmName, "SCSI Controller"); err != nil { - err := fmt.Errorf("Error creating disk controller: %s", err) - state.Put("error", err) - ui.Error(err.Error()) - return multistep.ActionHalt - } - } + if config.HardDriveInterface == "scsi" { + if err := driver.CreateSCSIController(vmName, "SCSI Controller"); err != nil { + err := fmt.Errorf("Error creating disk controller: %s", err) + state.Put("error", err) + ui.Error(err.Error()) + return multistep.ActionHalt + } + } // Attach the disk to the controller controllerName := "IDE Controller" if config.HardDriveInterface == "sata" { controllerName = "SATA Controller" } - - if config.HardDriveInterface == "scsi" { - controllerName = "SCSI Controller" - } + + if config.HardDriveInterface == "scsi" { + controllerName = "SCSI Controller" + } command = []string{ "storageattach", vmName,