Add load balancer server pool resource and datasource

CHANGELOG.md

@@ -1,14 +1,17 @@
 ## 2.4.0 (Unreleased)
 IMPROVEMENTS:
 
-* Change resource handling to use locking mechanism when resource parallel handling is not supported by vCD. [GH-#255] 
+* Change resource handling to use locking mechanism when resource parallel handling is not supported by vCD. [GH-255] 
+* Fix issue when vApp is power cycled during member VM deletion. [GH-261]
 
 FEATURES:
 
 * **New Resource:** Load Balancer Service Monitor `vcd_lb_service_monitor` - [GH-256]
 * **New Data Source:** Load Balancer Service Monitor `vcd_lb_service_monitor` - [GH-256]
-* **New Resource:** edge gateway `vcd_edgegateway` creates and deletes edge gateways - [GH-262](https://github.com/terraform-providers/terraform-provider-vcd/issues/262)
+* **New Resource:** edge gateway `vcd_edgegateway` creates and deletes edge gateways - [GH-262]
 * **New build command** `make test-env-build` can configure an empty vCD to run the test suite. See `TESTING.md` for details.
+* **New Resource:** Load Balancer Server Pool `vcd_lb_server_pool` - [GH-268]
+* **New Data Source:** Load Balancer Server Pool `vcd_lb_server_pool` - [GH-268]
 
 ## 2.3.0 (May 29, 2019)
 

go.mod

@@ -6,3 +6,5 @@ require (
 	github.com/hashicorp/terraform v0.12.0
 	github.com/vmware/go-vcloud-director/v2 v2.3.0-alpha.3
 )
+
+replace github.com/vmware/go-vcloud-director/v2 => github.com/Didainius/go-vcloud-director/v2 v2.3.0-alpha.3.0.20190628112042-5879cf3e5d47

go.sum

@@ -13,6 +13,8 @@ github.com/Azure/go-autorest v10.15.4+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxS
 github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4=
+github.com/Didainius/go-vcloud-director/v2 v2.3.0-alpha.3.0.20190628112042-5879cf3e5d47 h1:zhjWu9YTN6cbJhcLc6VkXagl34Dwv0jik+D1dyw2kd8=
+github.com/Didainius/go-vcloud-director/v2 v2.3.0-alpha.3.0.20190628112042-5879cf3e5d47/go.mod h1:HonlGxbjJ1NAibWh99eE4/S2l6ZOZ5KJzKK1rh2a9vc=
 github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod h1:KYCjqMOeHpNuTOiFQU6WEcTG7poCJrUs0YgyHNtn1no=
 github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw=
 github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
@@ -301,8 +303,6 @@ github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4A
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElywVZjjC6pqse21bKbEU=
 github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
-github.com/vmware/go-vcloud-director/v2 v2.3.0-alpha.3 h1:cgQGF5SmFtHPbwUESzlKu6C8mXBoCei/Wqkji8aScBM=
-github.com/vmware/go-vcloud-director/v2 v2.3.0-alpha.3/go.mod h1:+Hq7ryFfgZqsO6mXH29RQFnpIMSujCOMI57otHoXHhQ=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=

vcd/config_test.go

@@ -1,4 +1,4 @@
-// +build api functional catalog vapp network extnetwork org query vm vdc gateway disk binary ALL
+// +build api functional catalog vapp network extnetwork org query vm vdc gateway disk binary lb lbServiceMonitor lbServerPool ALL
 
 package vcd
 

vcd/datasource_vcd_lb_server_pool.go

@@ -0,0 +1,135 @@
+package vcd
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/vmware/go-vcloud-director/v2/types/v56"
+)
+
+func datasourceVcdLbServerPool() *schema.Resource {
+	return &schema.Resource{
+		Read: datasourceVcdLbServerPoolRead,
+		Schema: map[string]*schema.Schema{
+			"org": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "vCD organization in which the Service Monitor is located",
+			},
+			"vdc": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "vCD virtual datacenter in which the Service Monitor is located",
+			},
+			"edge_gateway": &schema.Schema{
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Edge gateway name in which the Server Pool is located",
+			},
+			"name": &schema.Schema{
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Server Pool name for lookup",
+			},
+			"description": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Server pool description",
+			},
+			"algorithm": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Balancing method for the service",
+			},
+			"algorithm_parameters": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Additional options for load balancing algorithm for http-header or url algorithms",
+			},
+			"monitor_id": &schema.Schema{
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Load Balancer Service Monitor ID",
+			},
+			"enable_transparency": &schema.Schema{
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "Makes client IP addresses visible to the backend servers",
+			},
+			"member": {
+				Computed: true,
+				Type:     schema.TypeList,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Pool member id (formatted as member-xx, where xx is a number)",
+						},
+						"condition": &schema.Schema{
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Defines member state. One of enabled, drain, disabled.",
+						},
+						"name": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Name of pool member",
+						},
+						"ip_address": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "IP address of member in server pool",
+						},
+						"port": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Port at which the member is to receive traffic from the load balancer",
+						},
+						"monitor_port": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Port at which the member is to receive health monitor requests. Can be the same as port",
+						},
+						"weight": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Proportion of traffic this member is to handle. Must be an integer in the range 1-256",
+						},
+						"min_connections": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Minimum number of concurrent connections a member must always accept",
+						},
+						"max_connections": {
+							Type:     schema.TypeInt,
+							Computed: true,
+							Description: "The maximum number of concurrent connections the member can handle. If exceeded " +
+								"requests are queued and the load balancer waits for a connection to be released",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func datasourceVcdLbServerPoolRead(d *schema.ResourceData, meta interface{}) error {
+	vcdClient := meta.(*VCDClient)
+	edgeGateway, err := vcdClient.GetEdgeGatewayFromResource(d, "edge_gateway")
+	if err != nil {
+		return fmt.Errorf(errorUnableToFindEdgeGateway, err)
+	}
+
+	readLBPool, err := edgeGateway.ReadLBServerPool(&types.LBPool{Name: d.Get("name").(string)})
+	if err != nil {
+		return fmt.Errorf("unable to find load balancer server pool with Name %s: %s",
+			d.Get("name").(string), err)
+	}
+
+	d.SetId(readLBPool.ID)
+	return setLBPoolData(d, readLBPool)
+}

vcd/datasource_vcd_lb_service_monitor.go

@@ -32,44 +32,54 @@ func datasourceVcdLbServiceMonitor() *schema.Resource {
 				Description: "Service Monitor name",
 			},
 			"interval": &schema.Schema{
-				Type:     schema.TypeInt,
-				Computed: true,
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Interval in seconds at which a server is to be monitored",
 			},
 			"timeout": &schema.Schema{
-				Type:     schema.TypeInt,
-				Computed: true,
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Maximum time in seconds within which a response from the server must be received",
 			},
 			"max_retries": &schema.Schema{
-				Type:     schema.TypeInt,
-				Computed: true,
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Number of times the specified monitoring Method must fail sequentially before the server is declared down",
 			},
 			"type": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Way in which you want to send the health check request to the server. One of http, https, tcp, icmp, or udp",
 			},
 			"expected": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "String that the monitor expects to match in the status line of the http or https response (for example, HTTP/1.1)",
 			},
 			"method": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Method to be used to detect server status. One of OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, or CONNECT",
 			},
 			"url": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "URL to be used in the server status request",
 			},
 			"send": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Data to be sent",
 			},
 			"receive": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "String to be matched in the response content",
 			},
 			"extension": {
-				Type:     schema.TypeMap,
-				Computed: true,
+				Type:        schema.TypeMap,
+				Computed:    true,
+				Description: "Advanced monitor parameters as key=value pairs",
 			},
 		},
 	}

vcd/provider.go

@@ -104,10 +104,12 @@ func Provider() terraform.ResourceProvider {
 			"vcd_independent_disk":   resourceVcdIndependentDisk(),  // 2.1
 			"vcd_external_network":   resourceVcdExternalNetwork(),  // 2.2
 			"vcd_lb_service_monitor": resourceVcdLbServiceMonitor(), // 2.4
+			"vcd_lb_server_pool":     resourceVcdLBServerPool(),     // 2.4
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{
-			"vcd_lb_service_monitor": datasourceVcdLbServiceMonitor(),
+			"vcd_lb_service_monitor": datasourceVcdLbServiceMonitor(), // 2.4
+			"vcd_lb_server_pool":     datasourceVcdLbServerPool(),     // 2.4
 		},
 
 		ConfigureFunc: providerConfigure,

vcd/provider_test.go

@@ -1,4 +1,4 @@
-// +build api functional catalog vapp network extnetwork org query vm vdc gateway disk binary ALL
+// +build api functional catalog vapp network extnetwork org query vm vdc gateway disk binary lb lbServiceMonitor lbServerPool ALL
 
 package vcd