Storage controller support (ddcloud_storage_controller) (#86)

* Expose SCSI bus number for inline disks on ddcloud_server.
* If both IPv4 and VLAN Id are specified for a network adapter, ignore VLAN Id.
* Handle the fact that ExpandDisk is part of the v2.x API and therefore returns ResponseCodeInProgress rather than ResultSuccess.
* Only build master and development/vXXX.
* Initial sketch of implementation for ddcloud_storage_controller (this is a prototype of option 1 for #84).
* Mark all storage controller properties as ForceNew.
* Start implementing update / delete for ddcloud_storage_controller resource.
* Fix bugs and improve diagnostic logging for deployment of ddcloud_storage_controller.
* Fix incorrectly-propagated scsi_bus_number on ddcloud_storage_controller.disk.
* Log server remaining disk count before removing a disk.
* Refactor access to target storage controller.
* Create initial acceptance test for ddcloud_storage_controller (default controller, single image disk).
* Fix broken cleanup checks for ddcloud_storage_controller acceptance tests.
* Add acceptance test for ddcloud_storage_controller (default controller, 1 additional disk).
* Remove SCSI controller when ddcloud_storage_controller is destroyed (unless it's the last storage controller in the target server).
* Fix buggy handling for removal of server's last disk.
* Add refresh step before verifying server disk configuration in acceptance tests for ddcloud_storage_controller.
* Fix broken ddcloud_storage_controller acceptance test (default controller with 1 image disk and 1 additional disk).
* Fix another broken acceptance test for ddcloud_storage_controller, and improve output from testCheckXXX functions.
* Add docs for ddcloud_storage_controller.
* Update version info and change log (v1.3.0-alpha2).
* Fix failing unit tests due to CloudControl schema change.
* Add ddcloud_storage_controller to provider documentation

Author: tintoy

.travis.yml

@@ -3,6 +3,11 @@ language: go
 go:
     - 1.8
 
+branches:
+  only:
+    - master
+    - /^development\/v.*$/
+
 install:
   - go get github.com/hashicorp/terraform
   - pushd $GOPATH/src/github.com/hashicorp/terraform

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+# v1.3.0-alpha2
+
+* Support for multiple storage controllers (using `ddcloud_storage_controller` resource).
+
 # v1.3.0-alpha1
 
 * Support for additional disk storage tier (`ECONOMY`) and network adapter types (`E1000E`, `ENHANCED_VMXNET2`, and `FLEXIBLE_PCNET32`).

Makefile

@@ -1,6 +1,6 @@
 PROVIDER_NAME = ddcloud
 
-VERSION = 1.3.0-alpha1
+VERSION = 1.3.0-alpha2
 VERSION_INFO_FILE = ./$(PROVIDER_NAME)/version-info.go
 
 BIN_DIRECTORY   = _bin

ddcloud/provider.go

@@ -78,6 +78,9 @@ func Provider() terraform.ResourceProvider {
 			// A server (virtual machine).
 			"ddcloud_server": resourceServer(),
 
+			// A storage controller (e.g. SCSI controller) in a server
+			"ddcloud_storage_controller": resourceStorageController(),
+
 			// A network adapter.
 			"ddcloud_network_adapter": resourceNetworkAdapter(),
 

ddcloud/resource_network_adapter.go

@@ -380,8 +380,8 @@ func validateNetworkAdapterAdapterType(value interface{}, propertyName string) (
 	switch adapterType {
 	case compute.NetworkAdapterTypeE1000:
 	case compute.NetworkAdapterTypeE1000E:
-	case compute.NetworkAdapterTypeENHANCED_VMXNET2:
-	case compute.NetworkAdapterTypeFLEXIBLE_PCNET32:
+	case compute.NetworkAdapterTypeEnhancedVMXNET2:
+	case compute.NetworkAdapterTypeFlexiblePCNET32:
 	case compute.NetworkAdapterTypeVMXNET3:
 		break
 	default:

ddcloud/resource_server.go

@@ -305,19 +305,22 @@ func resourceServerCreate(data *schema.ResourceData, provider interface{}) error
 
 	// Validate disk configuration.
 	configuredDisks := propertyHelper.GetDisks()
-	err = validateDisks(configuredDisks)
+	err = validateServerDisks(configuredDisks)
 	if err != nil {
 		return err
 	}
 
 	// Image disk speeds
-	configuredDisksByUnitID := configuredDisks.ByUnitID()
-	for index := range deploymentConfiguration.Disks {
-		deploymentDisk := &deploymentConfiguration.Disks[index]
-
-		configuredDisk, ok := configuredDisksByUnitID[deploymentDisk.SCSIUnitID]
-		if ok {
-			deploymentDisk.Speed = configuredDisk.Speed
+	configuredDisksBySCSIPath := configuredDisks.BySCSIPath()
+	for controllerIndex := range deploymentConfiguration.SCSIControllers {
+		deploymentSCSIController := &deploymentConfiguration.SCSIControllers[controllerIndex]
+		for diskIndex := range deploymentSCSIController.Disks {
+			deploymentDisk := &deploymentSCSIController.Disks[diskIndex]
+
+			configuredDisk, ok := configuredDisksBySCSIPath[models.SCSIPath(deploymentSCSIController.BusNumber, deploymentDisk.SCSIUnitID)]
+			if ok {
+				deploymentDisk.Speed = configuredDisk.Speed
+			}
 		}
 	}
 
@@ -419,7 +422,7 @@ func resourceServerCreate(data *schema.ResourceData, provider interface{}) error
 	}
 	data.SetPartial(resourceKeyServerTag)
 
-	err = createDisks(server.Disks, data, providerState)
+	err = createDisks(server.SCSIControllers, data, providerState)
 	if err != nil {
 		return err
 	}
@@ -483,7 +486,7 @@ func resourceServerRead(data *schema.ResourceData, provider interface{}) error {
 	}
 
 	propertyHelper.SetDisks(
-		models.NewDisksFromVirtualMachineDisks(server.Disks),
+		models.NewDisksFromVirtualMachineSCSIControllers(server.SCSIControllers),
 	)
 
 	return nil

ddcloud/resource_server_disks.go

@@ -11,11 +11,12 @@ import (
 )
 
 const (
-	resourceKeyServerDisk       = "disk"
-	resourceKeyServerDiskID     = "id"
-	resourceKeyServerDiskUnitID = "scsi_unit_id"
-	resourceKeyServerDiskSizeGB = "size_gb"
-	resourceKeyServerDiskSpeed  = "speed"
+	resourceKeyServerDisk          = "disk"
+	resourceKeyServerDiskID        = "id"
+	resourceKeyServerDiskBusNumber = "scsi_bus_number"
+	resourceKeyServerDiskUnitID    = "scsi_unit_id"
+	resourceKeyServerDiskSizeGB    = "size_gb"
+	resourceKeyServerDiskSpeed     = "speed"
 )
 
 func schemaDisk() *schema.Schema {
@@ -24,14 +25,19 @@ func schemaDisk() *schema.Schema {
 		Optional:    true,
 		Computed:    true,
 		Default:     nil,
-		Description: "The set of virtual disks attached to the server",
+		Description: "The set of virtual disks attached to a server or storage controller",
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				resourceKeyServerDiskID: &schema.Schema{
 					Type:        schema.TypeString,
 					Computed:    true,
 					Description: "The CloudControl identifier for the virtual disk (computed when the disk is first created)",
 				},
+				resourceKeyServerDiskBusNumber: &schema.Schema{
+					Type:        schema.TypeInt,
+					Computed:    true,
+					Description: "The SCSI bus number for the disk",
+				},
 				resourceKeyServerDiskUnitID: &schema.Schema{
 					Type:        schema.TypeInt,
 					Required:    true,
@@ -56,8 +62,9 @@ func schemaDisk() *schema.Schema {
 }
 
 // When creating a server resource, synchronise the server's disks with its resource data.
-// imageDisks refers to the newly-deployed server's collection of disks (i.e. image disks).
-func createDisks(imageDisks []compute.VirtualMachineDisk, data *schema.ResourceData, providerState *providerState) error {
+//
+// imageSCSIControllers refers to the newly-deployed server's collection of SCSI controllers and their associated disks.
+func createDisks(imageSCSIControllers compute.VirtualMachineSCSIControllers, data *schema.ResourceData, providerState *providerState) error {
 	propertyHelper := propertyHelper(data)
 	serverID := data.Id()
 
@@ -66,16 +73,17 @@ func createDisks(imageDisks []compute.VirtualMachineDisk, data *schema.ResourceD
 	// Since this is the first time, populate image disks.
 	configuredDisks := propertyHelper.GetDisks()
 	log.Printf("Configuration for server '%s' specifies %d disks: %#v.", serverID, len(configuredDisks), configuredDisks)
-	actualDisks := models.NewDisksFromVirtualMachineDisks(imageDisks)
+	actualDisks := models.NewDisksFromVirtualMachineSCSIControllers(imageSCSIControllers)
 	configuredDisks.CaptureIDs(actualDisks)
 
-	err := validateDisks(configuredDisks)
+	err := validateServerDisks(configuredDisks)
 	if err != nil {
 		return err
 	}
 
-	log.Printf("Configuration for server '%s' specifies %d disks: %#v.", serverID, len(configuredDisks), configuredDisks)
 	if len(configuredDisks) == 0 {
+		log.Printf("Configuration for server '%s' does not specify any disks; the provider will assume all disks are either image-only, or configured via ddcloud_storage_controller.", serverID)
+
 		propertyHelper.SetDisks(actualDisks)
 		propertyHelper.SetPartial(resourceKeyServerDisk)
 
@@ -84,6 +92,8 @@ func createDisks(imageDisks []compute.VirtualMachineDisk, data *schema.ResourceD
 		return nil
 	}
 
+	log.Printf("Configuration for server '%s' specifies %d disks: %#v.", serverID, len(configuredDisks), configuredDisks)
+
 	propertyHelper.SetDisks(configuredDisks)
 	propertyHelper.SetPartial(resourceKeyServerDisk)
 
@@ -99,7 +109,7 @@ func createDisks(imageDisks []compute.VirtualMachineDisk, data *schema.ResourceD
 
 	// After initial server deployment, we only need to handle disks that were part of the original server image (and of those, only ones we need to modify after the initial deployment completed deployment).
 	log.Printf("Configure image disks for server '%s'...", serverID)
-	actualDisks = models.NewDisksFromVirtualMachineDisks(server.Disks)
+	actualDisks = models.NewDisksFromVirtualMachineSCSIControllers(server.SCSIControllers)
 	addDisks, modifyDisks, _ := configuredDisks.SplitByAction(actualDisks) // Ignore removeDisks since not all disks have been created yet
 	if addDisks.IsEmpty() && modifyDisks.IsEmpty() {
 		log.Printf("No post-deploy changes required for disks of server '%s'.", serverID)
@@ -138,24 +148,44 @@ func updateDisks(data *schema.ResourceData, providerState *providerState) error
 
 		return fmt.Errorf("server '%s' has been deleted", serverID)
 	}
-	actualDisks := models.NewDisksFromVirtualMachineDisks(server.Disks)
+	actualDisks := models.NewDisksFromVirtualMachineSCSIControllers(server.SCSIControllers)
 
 	configuredDisks := propertyHelper.GetDisks()
 	log.Printf("Configuration for server '%s' specifies %d disks: %#v.", serverID, len(configuredDisks), configuredDisks)
 
-	err = validateDisks(configuredDisks)
+	// Detect switch to / from inline disks.
+	previouslyConfiguredDisks := propertyHelper.GetOldDisks()
+	if previouslyConfiguredDisks.IsEmpty() && !configuredDisks.IsEmpty() {
+		// Switched to inline declaration of server disks.
+		log.Printf("Disks for server '%s' are now configured inline, but were previously unspecified or configured via one or more ddcloud_storage_controllers.",
+			serverID,
+		)
+
+		// Can only switch to inline disks if there is a single (default) SCSI controller.
+		if len(server.SCSIControllers) > 1 {
+			return fmt.Errorf("server '%s' has multiple SCSI controllers, so disks cannot be configured inline",
+				serverID,
+			)
+		}
+	} else if !previouslyConfiguredDisks.IsEmpty() && configuredDisks.IsEmpty() {
+		// Switched to external declaration of server disks.
+
+		log.Printf("Disks for server '%s' are now unspecified or configured via one or more ddcloud_storage_controllers, but were previously configured inline.",
+			serverID,
+		)
+	}
+
+	err = validateServerDisks(configuredDisks)
 	if err != nil {
 		return err
 	}
 
 	if configuredDisks.IsEmpty() {
 		// No explicitly-configured disks.
-		propertyHelper.SetDisks(
-			models.NewDisksFromVirtualMachineDisks(server.Disks),
-		)
+		propertyHelper.SetDisks(actualDisks)
 		propertyHelper.SetPartial(resourceKeyServerDisk)
 
-		log.Printf("Server '%s' now has %d disks: %#v.", serverID, len(server.Disks), server.Disks)
+		log.Printf("Server '%s' now has %d disks: %#v.", serverID, server.SCSIControllers.GetDiskCount(), server.SCSIControllers)
 
 		return nil
 	}
@@ -243,11 +273,11 @@ func processAddDisks(addDisks models.Disks, data *schema.ResourceData, providerS
 
 		server := resource.(*compute.Server)
 		propertyHelper.SetDisks(
-			models.NewDisksFromVirtualMachineDisks(server.Disks),
+			models.NewDisksFromVirtualMachineSCSIControllers(server.SCSIControllers),
 		)
 		propertyHelper.SetPartial(resourceKeyServerDisk)
 
-		log.Printf("Server '%s' now has %d disks: %#v.", serverID, len(server.Disks), server.Disks)
+		log.Printf("Server '%s' now has %d disks: %#v.", serverID, server.SCSIControllers.GetDiskCount(), server.SCSIControllers)
 
 		log.Printf("Added disk '%s' with SCSI unit ID %d to server '%s'.",
 			addDisk.ID,
@@ -279,13 +309,13 @@ func processModifyDisks(modifyDisks models.Disks, data *schema.ResourceData, pro
 
 		return fmt.Errorf("server '%s' has been deleted", serverID)
 	}
-	actualDisks := models.NewDisksFromVirtualMachineDisks(server.Disks)
-	actualDisksByUnitID := actualDisks.ByUnitID()
+	actualDisks := models.NewDisksFromVirtualMachineSCSIControllers(server.SCSIControllers)
+	actualDisksBySCSIPath := actualDisks.BySCSIPath()
 
 	for index := range modifyDisks {
 		modifyDisk := &modifyDisks[index]
 		log.Printf("modifyDisk = %#v", modifyDisk)
-		actualImageDisk := actualDisksByUnitID[modifyDisk.SCSIUnitID]
+		actualImageDisk := actualDisksBySCSIPath[modifyDisk.SCSIPath()]
 
 		// Can't shrink disk, only grow it.
 		if modifyDisk.SizeGB < actualImageDisk.SizeGB {
@@ -313,16 +343,15 @@ func processModifyDisks(modifyDisks models.Disks, data *schema.ResourceData, pro
 				asyncLock := providerState.AcquireAsyncOperationLock(operationDescription)
 				defer asyncLock.Release()
 
-				response, resizeError := apiClient.ResizeServerDisk(serverID, modifyDisk.ID, modifyDisk.SizeGB)
+				response, resizeError := apiClient.ExpandDisk(modifyDisk.ID, modifyDisk.SizeGB)
 				if compute.IsResourceBusyError(resizeError) {
 					context.Retry()
 				} else if resizeError != nil {
 					context.Fail(resizeError)
 				}
-				if response.Result != compute.ResultSuccess {
-					context.Fail(response.ToError(
-						"Unexpected result '%s' when resizing server disk '%s' for server '%s'.",
-						response.Result,
+				if response.ResponseCode != compute.ResponseCodeInProgress {
+					context.Fail(response.ToError("unexpected response code '%s' when expanding server disk '%s' for server '%s'",
+						response.ResponseCode,
 						modifyDisk.ID,
 						serverID,
 					))
@@ -354,11 +383,11 @@ func processModifyDisks(modifyDisks models.Disks, data *schema.ResourceData, pro
 
 			server := resource.(*compute.Server)
 			propertyHelper.SetDisks(
-				models.NewDisksFromVirtualMachineDisks(server.Disks),
+				models.NewDisksFromVirtualMachineSCSIControllers(server.SCSIControllers),
 			)
 			propertyHelper.SetPartial(resourceKeyServerDisk)
 
-			log.Printf("Server '%s' now has %d disks: %#v.", serverID, len(server.Disks), server.Disks)
+			log.Printf("Server '%s' now has %d disks: %#v.", serverID, server.SCSIControllers.GetDiskCount(), server.SCSIControllers)
 
 			log.Printf(
 				"Resized disk '%s' for server '%s' (from %d to GB to %d).",
@@ -417,7 +446,7 @@ func processModifyDisks(modifyDisks models.Disks, data *schema.ResourceData, pro
 
 			server = resource.(*compute.Server)
 			propertyHelper.SetDisks(
-				models.NewDisksFromVirtualMachineDisks(server.Disks),
+				models.NewDisksFromVirtualMachineSCSIControllers(server.SCSIControllers),
 			)
 			propertyHelper.SetPartial(resourceKeyServerDisk)
 
@@ -488,7 +517,7 @@ func processRemoveDisks(removeDisks models.Disks, data *schema.ResourceData, pro
 
 		server := resource.(*compute.Server)
 		propertyHelper.SetDisks(
-			models.NewDisksFromVirtualMachineDisks(server.Disks),
+			models.NewDisksFromVirtualMachineSCSIControllers(server.SCSIControllers),
 		)
 		propertyHelper.SetPartial(resourceKeyServerDisk)
 
@@ -527,7 +556,7 @@ func validateDisks(disks models.Disks) error {
 	for _, disk := range disks {
 		_, duplicate := disksByUnitID[disk.SCSIUnitID]
 		if duplicate {
-			return fmt.Errorf("Multiple disks with SCSI unit ID '%d'", disk.SCSIUnitID)
+			return fmt.Errorf("multiple disks with SCSI unit ID %d", disk.SCSIUnitID)
 		}
 
 		disksByUnitID[disk.SCSIUnitID] = disk
@@ -536,6 +565,22 @@ func validateDisks(disks models.Disks) error {
 	return nil
 }
 
+func validateServerDisks(disks models.Disks) error {
+	err := validateDisks(disks)
+	if err != nil {
+		return err
+	}
+
+	for _, disk := range disks {
+		// Cannot target non-default SCSI controllers if disks are declared directly on the server.
+		if disk.SCSIBusNumber != 0 {
+			return fmt.Errorf("unsupported configuration: disk configured to use non-default SCSI bus %d (declare the disk on a ddcloud_storage controller if targeting a SCSI bus other than 0)", disk.SCSIBusNumber)
+		}
+	}
+
+	return nil
+}
+
 func validateDiskSpeed(value interface{}, propertyName string) (messages []string, errors []error) {
 	if value == nil {
 		return
@@ -551,7 +596,7 @@ func validateDiskSpeed(value interface{}, propertyName string) (messages []strin
 	}
 
 	switch adapterType {
-	case compute.ServerDiskSpeedEcomony:
+	case compute.ServerDiskSpeedEconomy:
 	case compute.ServerDiskSpeedStandard:
 	case compute.ServerDiskSpeedHighPerformance:
 		break

ddcloud/resource_server_network_adapter_test.go

@@ -146,7 +146,7 @@ func testCheckDDCloudServerNICDestroy(state *terraform.State) error {
 		if err != nil {
 			return nil
 		}
-		if server != nil {
+		if server == nil {
 			nics := server.Network.AdditionalNetworkAdapters
 			for _, nic := range nics {
 				return fmt.Errorf("Nic '%s' still exists", *nic.ID)