Merge pull request #131 from DimensionDataResearch/development/v2.0

Static route, IP address reservation and bug fixing

Author: samuelchong

.gitignore

@@ -36,4 +36,4 @@ AccTest.log
 #.bak
 **/.idea
 *.old
-*.OLD
+*.OLD

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-    - "1.10"
+    - "1.12.1"
 
 branches:
   only:
@@ -14,7 +14,7 @@ install:
   - go get github.com/pkg/errors
   - go get github.com/hashicorp/terraform
   - pushd $GOPATH/src/github.com/hashicorp/terraform
-  - git checkout v0.11.11
+  - git checkout v0.11.13
   - popd
 
 script:

Makefile

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

ddcloud/datasource_vlan.go

@@ -47,6 +47,16 @@ func dataSourceVLAN() *schema.Resource {
 				Computed:    true,
 				Description: "The VLAN's IPv6 prefix length.",
 			},
+			resourceKeyVLANIPv6GatewayAddress: &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The VLAN's IPv6 Gateway Address",
+			},
+			resourceKeyVLANIPv4GatewayAddress: &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The VLAN's IPv4 Gateway Address",
+			},
 		},
 	}
 }
@@ -71,6 +81,9 @@ func dataSourceVLANRead(data *schema.ResourceData, provider interface{}) error {
 		data.Set(resourceKeyVLANIPv4PrefixSize, vlan.IPv4Range.PrefixSize)
 		data.Set(resourceKeyVLANIPv6BaseAddress, vlan.IPv6Range.BaseAddress)
 		data.Set(resourceKeyVLANIPv6PrefixSize, vlan.IPv6Range.PrefixSize)
+		data.Set(resourceKeyVLANIPv4GatewayAddress, vlan.IPv4GatewayAddress)
+		data.Set(resourceKeyVLANIPv6GatewayAddress, vlan.IPv6GatewayAddress)
+
 	} else {
 		return fmt.Errorf("failed to find VLAN '%s' in network domain '%s'", name, networkDomainID)
 	}

ddcloud/provider.go

@@ -21,17 +21,17 @@ func Provider() terraform.ResourceProvider {
 		// Provider settings schema
 		Schema: map[string]*schema.Schema{
 			"region": &schema.Schema{
-				Type:        schema.TypeString,
-				Optional:    true,
-				Default:     "",
-				Description: "The region code that identifies the target end-point for the Dimension Data CloudControl API.",
+				Type:          schema.TypeString,
+				Optional:      true,
+				Default:       "",
+				Description:   "The region code that identifies the target end-point for the Dimension Data CloudControl API.",
 				ConflictsWith: []string{"cloudcontrol_endpoint"},
 			},
 			"cloudcontrol_endpoint": &schema.Schema{
-				Type:        schema.TypeString,
-				Optional:    true,
-				Default:     "",
-				Description: "The base URL of a custom target end-point for the Dimension Data CloudControl API.",
+				Type:          schema.TypeString,
+				Optional:      true,
+				Default:       "",
+				Description:   "The base URL of a custom target end-point for the Dimension Data CloudControl API.",
 				ConflictsWith: []string{"region"},
 			},
 			"username": &schema.Schema{

ddcloud/resource_address.go

@@ -1,6 +1,9 @@
 package ddcloud
 
 import (
+	"fmt"
+	"github.com/DimensionDataResearch/dd-cloud-compute-terraform/retry"
+	"github.com/DimensionDataResearch/go-dd-cloud-compute/compute"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/pkg/errors"
 	"log"
@@ -14,6 +17,7 @@ const (
 	resourceKeyAddressPrefixSize      = "prefix_size"
 	resourceKeyAddressNetworkDomainID = "networkdomain"
 	resourceKeyAddressListID          = "addresslist_id"
+	resourceKeyAddressAddressListName = "addresslist_name"
 )
 
 func resourceAddress() *schema.Resource {
@@ -31,11 +35,11 @@ func resourceAddress() *schema.Resource {
 				Required:    true,
 				Description: "The Id of the network domain in which the address applies",
 			},
-			resourceKeyAddressListID: &schema.Schema{
+			resourceKeyAddressAddressListName: &schema.Schema{
 				Type:        schema.TypeString,
 				ForceNew:    true,
 				Required:    true,
-				Description: "The Id of the address list",
+				Description: "The Name of the address list",
 			},
 			resourceKeyAddressBegin: &schema.Schema{
 				Type:        schema.TypeString,
@@ -64,9 +68,17 @@ func resourceAddress() *schema.Resource {
 // Check if an address list resource exists.
 func resourceAddressExists(data *schema.ResourceData, provider interface{}) (bool, error) {
 	log.Printf("resourceAddressExists")
-	addressListId := data.Get(resourceKeyAddressListID).(string)
-
 	client := provider.(*providerState).Client()
+	networkDomainId := data.Get(resourceKeyAddressNetworkDomainID).(string)
+	addressListName := data.Get(resourceKeyAddressAddressListName).(string)
+	addrList, _ := client.GetIPAddressListByName(addressListName, networkDomainId)
+
+	var addressListId string
+	if addrList == nil {
+		return false, nil
+	} else {
+		addressListId = addrList.ID
+	}
 
 	begin, okBegin := data.GetOk(resourceKeyAddressBegin)
 	network, okNetwork := data.GetOk(resourceKeyAddressNetwork)
@@ -92,7 +104,19 @@ func resourceAddressCreate(data *schema.ResourceData, provider interface{}) erro
 	var network string
 	var prefixSize int
 
-	addressListId := data.Get(resourceKeyAddressListID).(string)
+	providerState := provider.(*providerState)
+	client := providerState.Client()
+
+	addressListName := data.Get(resourceKeyAddressAddressListName).(string)
+	networkDomainId := data.Get(resourceKeyAddressNetworkDomainID).(string)
+	addrList, err := client.GetIPAddressListByName(addressListName, networkDomainId)
+
+	var addressListId string
+	if err != nil {
+		return err
+	} else {
+		addressListId = addrList.ID
+	}
 
 	valBegin, beginOk := data.GetOk(resourceKeyAddressBegin)
 	if beginOk {
@@ -124,8 +148,26 @@ func resourceAddressCreate(data *schema.ResourceData, provider interface{}) erro
 		}
 	}
 
-	client := provider.(*providerState).Client()
-	_, err := client.AddAddress(addressListId, begin, end, network, prefixSize)
+	operationDescription := fmt.Sprintf("Add Address to FW  Address List'")
+
+	err = providerState.RetryAction(operationDescription, func(context retry.Context) {
+		// CloudControl has issues if more than one asynchronous operation is initated at a time (returns UNEXPECTED_ERROR).
+		asyncLock := providerState.AcquireAsyncOperationLock("Create Address begin:'%s' end:%s network:%s prefix:%d",
+			valBegin, valEnd, valNetwork, valPrefix)
+		defer asyncLock.Release()
+
+		_, deployError := client.AddAddress(addressListId, begin, end, network, prefixSize)
+
+		if deployError != nil {
+			if compute.IsResourceBusyError(deployError) {
+				context.Retry()
+			} else {
+				context.Fail(deployError)
+			}
+		}
+
+		asyncLock.Release()
+	})
 
 	if err != nil {
 		return err
@@ -147,12 +189,22 @@ func resourceAddressCreate(data *schema.ResourceData, provider interface{}) erro
 func resourceAddressRead(data *schema.ResourceData, provider interface{}) error {
 	log.Printf("resourceAddressRead")
 
-	addressListId := data.Get(resourceKeyAddressListID).(string)
 	begin, _ := data.GetOk(resourceKeyAddressBegin)
 	network, _ := data.GetOk(resourceKeyAddressNetwork)
 
 	client := provider.(*providerState).Client()
 
+	networkDomainId := data.Get(resourceKeyAddressNetworkDomainID).(string)
+	addressListName := data.Get(resourceKeyAddressAddressListName).(string)
+	addrList, err := client.GetIPAddressListByName(addressListName, networkDomainId)
+
+	var addressListId string
+	if err != nil {
+		return err
+	} else {
+		addressListId = addrList.ID
+	}
+
 	// Check if address exists in cloud
 	addr, addrOk := client.GetAddressOk(addressListId, begin.(string), network.(string))
 	if !addrOk {
@@ -192,7 +244,19 @@ func resourceAddressUpdate(data *schema.ResourceData, provider interface{}) erro
 	// Enable partial state mode
 	// data.Partial(true)
 
-	addressListId := data.Get(resourceKeyAddressListID).(string)
+	providerState := provider.(*providerState)
+	client := providerState.Client()
+
+	networkDomainId := data.Get(resourceKeyAddressNetworkDomainID).(string)
+	addressListName := data.Get(resourceKeyAddressAddressListName).(string)
+	addrList, err := client.GetIPAddressListByName(addressListName, networkDomainId)
+
+	var addressListId string
+	if err != nil {
+		return err
+	} else {
+		addressListId = addrList.ID
+	}
 
 	valBegin, beginOk := data.GetOk(resourceKeyAddressBegin)
 	if beginOk {
@@ -214,8 +278,6 @@ func resourceAddressUpdate(data *schema.ResourceData, provider interface{}) erro
 		prefixSize = valPrefix.(int)
 	}
 
-	client := provider.(*providerState).Client()
-
 	oldBegin, _ := data.GetChange(resourceKeyAddressBegin)
 	oldNetwork, _ := data.GetChange(resourceKeyAddressNetwork)
 
@@ -227,33 +289,49 @@ func resourceAddressUpdate(data *schema.ResourceData, provider interface{}) erro
 		ipAddress = oldNetwork.(string)
 	}
 
-	// Update step 1: Remove old address
-	_, errOld := client.DeleteAddress(addressListId, ipAddress)
-	if errOld != nil {
-		return errOld
-	}
+	operationDescription := fmt.Sprintf("Delete Address in FW Address List'")
+
+	err = providerState.RetryAction(operationDescription, func(context retry.Context) {
+		// CloudControl has issues if more than one asynchronous operation is initated at a time (returns UNEXPECTED_ERROR).
+		asyncLock := providerState.AcquireAsyncOperationLock("Delete Address '%s'", valBegin)
+		defer asyncLock.Release()
+
+		// Update step 1: Remove old address
+		_, deployErr := client.DeleteAddress(addressListId, ipAddress)
+		if deployErr != nil {
+			return
+		}
 
-	// Update step 2: Add new address
-	newAddress, err := client.AddAddress(addressListId, begin, end, network, prefixSize)
+		// Update step 2: Add new address
+		newAddress, deployErr := client.AddAddress(addressListId, begin, end, network, prefixSize)
+
+		if deployErr != nil {
+			return
+		}
+
+		log.Printf("Updated address: %s", newAddress.Begin)
+
+		// We succeeded, disable partial mode. This causes Terraform to save
+		// all fields again.
+		// data.Partial(false)
+
+		asyncLock.Release()
+	})
 
 	if err != nil {
 		return err
 	}
 
-	log.Printf("Updated address: %s", newAddress.Begin)
-
-	// We succeeded, disable partial mode. This causes Terraform to save
-	// all fields again.
-	// data.Partial(false)
-
 	return resourceAddressRead(data, provider)
 }
 
 // Delete an address list resource.
 func resourceAddressDelete(data *schema.ResourceData, provider interface{}) error {
 	log.Printf("resourceAddressDelete")
 
-	addressListId := data.Get(resourceKeyAddressListID).(string)
+	providerState := provider.(*providerState)
+	client := providerState.Client()
+
 	begin := data.Get(resourceKeyAddressBegin).(string)
 	network := data.Get(resourceKeyAddressNetwork).(string)
 
@@ -264,8 +342,35 @@ func resourceAddressDelete(data *schema.ResourceData, provider interface{}) erro
 		ip = network
 	}
 
-	client := provider.(*providerState).Client()
-	_, err := client.DeleteAddress(addressListId, ip)
+	networkDomainId := data.Get(resourceKeyAddressNetworkDomainID).(string)
+	addressListName := data.Get(resourceKeyAddressAddressListName).(string)
+	addrList, err := client.GetIPAddressListByName(addressListName, networkDomainId)
+
+	var addressListId string
+	if err != nil {
+		return err
+	} else {
+		addressListId = addrList.ID
+	}
+
+	operationDescription := fmt.Sprintf("Delete Address in FW Address List'")
+
+	err = providerState.RetryAction(operationDescription, func(context retry.Context) {
+		// CloudControl has issues if more than one asynchronous operation is initated at a time (returns UNEXPECTED_ERROR).
+		asyncLock := providerState.AcquireAsyncOperationLock("Delete Address '%s'", begin)
+		defer asyncLock.Release()
+		_, deployError := client.DeleteAddress(addressListId, ip)
+
+		if deployError != nil {
+			if compute.IsResourceBusyError(deployError) {
+				context.Retry()
+			} else {
+				context.Fail(deployError)
+			}
+		}
+
+		asyncLock.Release()
+	})
 
 	if err != nil {
 		return err