Reorder a few params to match the ordering in the docs

Author: svanharmelen

cloudstack/resource_cloudstack_autoscale_vm_profile.go

@@ -19,34 +19,34 @@ func resourceCloudStackAutoScaleVMProfile() *schema.Resource {
 		Delete: resourceCloudStackAutoScaleVMProfileDelete,
 
 		Schema: map[string]*schema.Schema{
-			"zone": {
+			"service_offering": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"service_offering": {
+			"template": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 			},
 
-			"template": {
+			"zone": {
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true,
 			},
 
-			"other_deploy_params": {
-				Type:     schema.TypeMap,
+			"destroy_vm_grace_period": {
+				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
-				ForceNew: true,
 			},
 
-			"destroy_vm_grace_period": {
-				Type:     schema.TypeString,
+			"other_deploy_params": {
+				Type:     schema.TypeMap,
 				Optional: true,
 				Computed: true,
+				ForceNew: true,
 			},
 
 			"metadata": metadataSchema(),
@@ -77,6 +77,14 @@ func resourceCloudStackAutoScaleVMProfileCreate(d *schema.ResourceData, meta int
 
 	p := cs.AutoScale.NewCreateAutoScaleVmProfileParams(serviceofferingid, templateid, zoneid)
 
+	if v, ok := d.GetOk("destroy_vm_grace_period"); ok {
+		duration, err := time.ParseDuration(v.(string))
+		if err != nil {
+			return err
+		}
+		p.SetDestroyvmgraceperiod(int(duration.Seconds()))
+	}
+
 	if v, ok := d.GetOk("other_deploy_params"); ok {
 		otherMap := v.(map[string]interface{})
 		result := url.Values{}
@@ -86,14 +94,6 @@ func resourceCloudStackAutoScaleVMProfileCreate(d *schema.ResourceData, meta int
 		p.SetOtherdeployparams(result.Encode())
 	}
 
-	if v, ok := d.GetOk("destroy_vm_grace_period"); ok {
-		duration, err := time.ParseDuration(v.(string))
-		if err != nil {
-			return err
-		}
-		p.SetDestroyvmgraceperiod(int(duration.Seconds()))
-	}
-
 	// Create the new vm profile
 	r, err := cs.AutoScale.CreateAutoScaleVmProfile(p)
 	if err != nil {
@@ -141,9 +141,11 @@ func resourceCloudStackAutoScaleVMProfileRead(d *schema.ResourceData, meta inter
 		return err
 	}
 
-	setValueOrID(d, "zone", zone.Name, p.Zoneid)
 	setValueOrID(d, "service_offering", offering.Name, p.Serviceofferingid)
 	setValueOrID(d, "template", template.Name, p.Templateid)
+	setValueOrID(d, "zone", zone.Name, p.Zoneid)
+
+	d.Set("destroy_vm_grace_period", (time.Duration(p.Destroyvmgraceperiod) * time.Second).String())
 
 	if p.Otherdeployparams != "" {
 		var values url.Values
@@ -158,8 +160,6 @@ func resourceCloudStackAutoScaleVMProfileRead(d *schema.ResourceData, meta inter
 		d.Set("other_deploy_params", otherParams)
 	}
 
-	d.Set("destroy_vm_grace_period", (time.Duration(p.Destroyvmgraceperiod) * time.Second).String())
-
 	metadata, err := getMetadata(cs, d, "AutoScaleVmProfile")
 	if err != nil {
 		return err

cloudstack/resource_cloudstack_autoscale_vm_profile_test.go

@@ -110,14 +110,14 @@ func testAccCheckCloudStackAutoscaleVMProfileExists(
 func testAccCheckCloudStackAutoscaleVMProfileBasicAttributes(
 	vmProfile *cloudstack.AutoScaleVmProfile) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-
 		cs := testAccProvider.Meta().(*cloudstack.CloudStackClient)
-		zoneid, e := retrieveID(cs, "zone", "Sandbox-simulator")
+
+		serviceofferingid, e := retrieveID(cs, "service_offering", "Small Instance")
 		if e != nil {
 			return e.Error()
 		}
 
-		serviceofferingid, e := retrieveID(cs, "service_offering", "Small Instance")
+		zoneid, e := retrieveID(cs, "zone", "Sandbox-simulator")
 		if e != nil {
 			return e.Error()
 		}
@@ -127,10 +127,6 @@ func testAccCheckCloudStackAutoscaleVMProfileBasicAttributes(
 			return e.Error()
 		}
 
-		if vmProfile.Zoneid != zoneid {
-			return fmt.Errorf("Bad zone: %s", vmProfile.Zoneid)
-		}
-
 		if vmProfile.Serviceofferingid != serviceofferingid {
 			return fmt.Errorf("Bad offering: %s", vmProfile.Serviceofferingid)
 		}
@@ -139,6 +135,10 @@ func testAccCheckCloudStackAutoscaleVMProfileBasicAttributes(
 			return fmt.Errorf("Bad template: %s", vmProfile.Templateid)
 		}
 
+		if vmProfile.Zoneid != zoneid {
+			return fmt.Errorf("Bad zone: %s", vmProfile.Zoneid)
+		}
+
 		if vmProfile.Otherdeployparams != "displayname=display1&networkids=net1" {
 			return fmt.Errorf("Bad otherdeployparams: %s", vmProfile.Otherdeployparams)
 		}
@@ -182,26 +182,29 @@ func testAccCheckCloudStackAutoscaleVMProfileDestroy(s *terraform.State) error {
 
 var testAccCloudStackAutoscaleVMProfile_basic = `
 resource "cloudstack_autoscale_vm_profile" "foo" {
-  zone = "Sandbox-simulator"
   service_offering = "Small Instance"
-  template = "CentOS 5.6 (64-bit) no GUI (Simulator)"
+  template         = "CentOS 5.6 (64-bit) no GUI (Simulator)"
+  zone             = "Sandbox-simulator"
+
   other_deploy_params = {
-    networkids = "net1"
+    networkids  = "net1"
     displayname = "display1"
   }
+
   metadata = {
     terraform-meta = "true"
   }
 }`
 
 var testAccCloudStackAutoscaleVMProfile_update = `
 resource "cloudstack_autoscale_vm_profile" "foo" {
-  zone = "Sandbox-simulator"
-  service_offering = "Small Instance"
-  template = "CentOS 5.6 (64-bit) no GUI (Simulator)"
+  service_offering        = "Small Instance"
+  template                = "CentOS 5.6 (64-bit) no GUI (Simulator)"
+  zone                    = "Sandbox-simulator"
   destroy_vm_grace_period = "10s"
+
   other_deploy_params = {
-    networkids = "net1"
+    networkids  = "net1"
     displayname = "display1"
   }
 }`