Bump sdk, self review, improve import and tests

Signed-off-by: Dainius Serplis <dserplis@vmware.com>

Author: Didainius

vcd/datasource_vcd_tm_edge_cluster.go

@@ -32,7 +32,7 @@ func datasourceVcdTmEdgeCluster() *schema.Resource {
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Default:     false,
-				Description: fmt.Sprintf(" %s", labelTmEdgeCluster),
+				Description: fmt.Sprintf("Will trigger SYNC operation before looking for a given %s", labelTmEdgeCluster),
 			},
 			"node_count": {
 				Type:        schema.TypeInt,

vcd/resource_vcd_tm_edge_cluster_qos.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -124,9 +125,21 @@ func resourceVcdTmEdgeClusterQosDelete(ctx context.Context, d *schema.ResourceDa
 
 func resourceVcdTmEdgeClusterQosImport(ctx context.Context, d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	vcdClient := meta.(*VCDClient)
-	ec, err := vcdClient.GetTmEdgeClusterByName(d.Id())
+	resourceURI := strings.Split(d.Id(), ImportSeparator)
+	if len(resourceURI) != 2 {
+		return nil, fmt.Errorf("resource name must be specified as region-name.edge-cluster-name")
+	}
+	regionName, edgeClusterName := resourceURI[0], resourceURI[1]
+
+	region, err := vcdClient.GetRegionByName(regionName)
+	if err != nil {
+		return nil, fmt.Errorf("error retrieving %s by name '%s': %s", labelTmRegion, regionName, err)
+	}
+
+	ec, err := vcdClient.GetTmEdgeClusterByNameAndRegionId(edgeClusterName, region.Region.ID)
 	if err != nil {
-		return nil, fmt.Errorf("error retrieving %s by Name '%s': %s", labelTmEdgeClusterQos, d.Id(), err)
+		return nil, fmt.Errorf("error retrieving %s by Name '%s' in %s '%s': %s",
+			labelTmEdgeClusterQos, edgeClusterName, labelTmRegion, regionName, err)
 	}
 
 	d.SetId(ec.TmEdgeCluster.ID)

vcd/resource_vcd_tm_edge_cluster_qos_test.go

@@ -41,10 +41,16 @@ func TestAccVcdTmEdgeCluster(t *testing.T) {
 	configText2 := templateFill(preRequisites+testAccVcdTmEdgeClusterQosStep2, params)
 	params["FuncName"] = t.Name() + "-step3"
 	configText3 := templateFill(preRequisites+testAccVcdTmEdgeClusterQosStep3, params)
+	params["FuncName"] = t.Name() + "-step4"
+	configText4 := templateFill(preRequisites+testAccVcdTmEdgeClusterQosStep4, params)
+	params["FuncName"] = t.Name() + "-step5"
+	configText5 := templateFill(preRequisites+testAccVcdTmEdgeClusterQosStep5, params)
 
 	debugPrintf("#[DEBUG] CONFIGURATION step1: %s\n", configText1)
 	debugPrintf("#[DEBUG] CONFIGURATION step2: %s\n", configText2)
-	debugPrintf("#[DEBUG] CONFIGURATION step4: %s\n", configText3)
+	debugPrintf("#[DEBUG] CONFIGURATION step3: %s\n", configText3)
+	debugPrintf("#[DEBUG] CONFIGURATION step4: %s\n", configText4)
+	debugPrintf("#[DEBUG] CONFIGURATION step5: %s\n", configText5)
 	if vcdShortTest {
 		t.Skip(acceptanceTestsSkipped)
 		return
@@ -107,7 +113,7 @@ func TestAccVcdTmEdgeCluster(t *testing.T) {
 				ResourceName:      "vcd_tm_edge_cluster_qos.demo",
 				ImportState:       true,
 				ImportStateVerify: true,
-				ImportStateId:     testConfig.Tm.NsxtEdgeCluster,
+				ImportStateId:     testConfig.Tm.Region + ImportSeparator + params["EdgeClusterName"].(string),
 			},
 			{
 				// Ensuring that the resource is removed (therefore QoS settings must be unset)
@@ -125,6 +131,26 @@ func TestAccVcdTmEdgeCluster(t *testing.T) {
 					resource.TestCheckResourceAttr("data.vcd_tm_edge_cluster_qos.demo2", "ingress_burst_size_bytes", ""),
 				),
 			},
+			{
+				// Ensuring that the resource is removed (therefore QoS settings must be unset)
+				Config: configText4,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("vcd_tm_edge_cluster_qos.demo", "egress_committed_bandwidth_mbps", "7"),
+					resource.TestCheckResourceAttr("vcd_tm_edge_cluster_qos.demo", "egress_burst_size_bytes", "8"),
+					resource.TestCheckResourceAttr("vcd_tm_edge_cluster_qos.demo", "ingress_committed_bandwidth_mbps", ""),
+					resource.TestCheckResourceAttr("vcd_tm_edge_cluster_qos.demo", "ingress_burst_size_bytes", ""),
+				),
+			},
+			{
+				// Ensuring that the resource is removed (therefore QoS settings must be unset)
+				Config: configText5,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("vcd_tm_edge_cluster_qos.demo", "egress_committed_bandwidth_mbps", ""),
+					resource.TestCheckResourceAttr("vcd_tm_edge_cluster_qos.demo", "egress_burst_size_bytes", ""),
+					resource.TestCheckResourceAttr("vcd_tm_edge_cluster_qos.demo", "ingress_committed_bandwidth_mbps", "5"),
+					resource.TestCheckResourceAttr("vcd_tm_edge_cluster_qos.demo", "ingress_burst_size_bytes", "6"),
+				),
+			},
 		},
 	})
 
@@ -167,3 +193,25 @@ data "vcd_tm_edge_cluster_qos" "demo2" {
   edge_cluster_id = data.vcd_tm_edge_cluster.demo.id
 }  
 `
+
+// egress only
+const testAccVcdTmEdgeClusterQosStep4 = testAccVcdTmEdgeClusterQosStep1 + `
+resource "vcd_tm_edge_cluster_qos" "demo" {
+  edge_cluster_id = data.vcd_tm_edge_cluster.demo.id
+
+  egress_committed_bandwidth_mbps  = 7
+  egress_burst_size_bytes          = 8
+
+}
+`
+
+// ingress only
+const testAccVcdTmEdgeClusterQosStep5 = testAccVcdTmEdgeClusterQosStep1 + `
+resource "vcd_tm_edge_cluster_qos" "demo" {
+  edge_cluster_id = data.vcd_tm_edge_cluster.demo.id
+
+  ingress_committed_bandwidth_mbps  = 5
+  ingress_burst_size_bytes          = 6
+
+}
+`

vcd/sample_vcd_test_config_tm.json

@@ -58,6 +58,8 @@
     "createNsxtManager": true,
     "nsxtManagerUsername": "admin",
     "nsxtManagerPassword": "",
-    "nsxtManagerUrl": "https://nsxmanager.my-company.com"
+    "nsxtManagerUrl": "https://nsxmanager.my-company.com",
+    "nsxtTier0Gateway": "existing-t0-gateway",
+    "nsxtEdgeCluster": "existing-edge-cluster"
   }
 }