Resource and data source vcd_edgegateway add network support for multiple subnets, sub-allocated pools and rate limits

CHANGELOG.md

@@ -28,7 +28,8 @@ IMPROVEMENTS:
   passthrough - [GH-384]
 * Fix code warnings from `staticcheck` and add command `make static` to Travis tests
 * `resource/vcd_edge_gateway` and `datasource/vcd_edge_gateway` add `default_external_network_ip`
-  field to export default edge gateway IP address - [GH-389]
+  and `external_network_ips` fields to export default edge gateway IP address and other external
+  network IPs used on gateway interfaces - [GH-389, GH-401]
 * Add `token` to the `vcd` provider for the ability of connecting with an authorization token - [GH-280]
 * Add command `make token` to create an authorization token from testing credentials
 * Clean up interpolation-only expressions from tests (as allowed in terraform v0.12.11+)
@@ -38,6 +39,12 @@ IMPROVEMENTS:
 * `resource/vcd_network_direct` Add property `description`
 * `resource/vcd_network_routed` Add check for valid IPs [GH-374]
 * `resource/vcd_network_isolated` Add check for valid IPs [GH-373]
+* `resource/vcd_edgegateway` new fields `fips_mode_enabled`, `use_default_route_for_dns_relay`
+  - [GH-401]
+* `resource/vcd_edgegateway`  new `external_network` block for advanced configurations of external
+  networks including multiple subnets, IP pool sub-allocation and rate limits - [GH-401]
+* `resource/vcd_edgegateway` enables read support for field `distributed_routing` after switch to
+  vCD API v29.0 - [GH-401]
 
 BUG FIXES:
 
@@ -52,6 +59,8 @@ BUG FIXES:
 DEPRECATIONS:
 
 * Deprecated property `storage_profile` in resource `vcd_vapp`, as the corresponding field is now enabled in `vcd_vapp_vm`
+* `resource/vcd_edgegateway` deprecates fields `external_networks` and `default_gateway_network` in
+  favor of new `external_network` block(s) - [GH-401] 
 
 ## 2.5.0 (October 28, 2019)
 
@@ -115,6 +124,7 @@ IMPROVEMENTS:
 * Import functions can now use custom separators instead of "." ([#343](https://github.com/terraform-providers/terraform-provider-vcd/issues/343))
 * `resource/vcd_vapp_vm` has new field `computer_name` ([#334](https://github.com/terraform-providers/terraform-provider-vcd/issues/334), [#347](https://github.com/terraform-providers/terraform-provider-vcd/issues/347))
 
+
 BUG FIXES:
 
 * Change default value for `vcd_org.deployed_vm_quota` and `vcd_org.stored_vm_quota`. It was incorrectly set at `-1` instead of `0`.

vcd/datasource_vcd_edgegateway.go

@@ -42,20 +42,30 @@ func datasourceVcdEdgeGateway() *schema.Resource {
 				Type:        schema.TypeList,
 				Computed:    true,
 				Description: "A list of external networks to be used by the edge gateway",
+				Deprecated:  "Please use the more advanced 'external_network' block(s)",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
 			},
 			"default_gateway_network": &schema.Schema{
 				Type:        schema.TypeString,
 				Computed:    true,
+				Deprecated:  "Please use the more advanced 'external_network' block(s)",
 				Description: "External network to be used as default gateway. Its name must be included in 'external_networks'. An empty value will skip the default gateway",
 			},
 			"default_external_network_ip": &schema.Schema{
 				Type:        schema.TypeString,
 				Computed:    true,
 				Description: "IP address of edge gateway interface which is used as default.",
 			},
+			"external_network_ips": {
+				Computed:    true,
+				Type:        schema.TypeList,
+				Description: "List of IP addresses set on edge gateway external network interfaces",
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"distributed_routing": &schema.Schema{
 				Type:        schema.TypeBool,
 				Computed:    true,
@@ -97,6 +107,90 @@ func datasourceVcdEdgeGateway() *schema.Resource {
 				Computed:    true,
 				Description: "'accept' or 'deny'. Default 'deny'",
 			},
+			"fips_mode_enabled": &schema.Schema{
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "Enable FIPS mode. FIPS mode turns on the cipher suites that comply with FIPS. (False by default)",
+			},
+			"use_default_route_for_dns_relay": &schema.Schema{
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "If true, default gateway will be used for the edge gateways' default routing and DNS forwarding.(False by default)",
+			},
+			"external_network": {
+				Type:        schema.TypeSet,
+				Description: "One or more blocks with external network information to be attached to this gateway's interface",
+				Computed:    true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"name": {
+							Computed:    true,
+							Type:        schema.TypeString,
+							Description: "External network name",
+						},
+						"enable_rate_limit": {
+							Computed:    true,
+							Type:        schema.TypeBool,
+							Description: "Enable rate limitting",
+						},
+						"incoming_rate_limit": {
+							Computed:    true,
+							Type:        schema.TypeFloat,
+							Description: "Incoming rate limit (Mbps)",
+						},
+						"outgoing_rate_limit": {
+							Computed:    true,
+							Type:        schema.TypeFloat,
+							Description: "Outgoing rate limit (Mbps)",
+						},
+						"subnet": {
+							Computed: true,
+							Type:     schema.TypeSet,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"gateway": {
+										Computed:    true,
+										Description: "Gateway address for a subnet",
+										Type:        schema.TypeString,
+									},
+									"netmask": {
+										Computed:    true,
+										Description: "Netmask address for a subnet",
+										Type:        schema.TypeString,
+									},
+									"ip_address": {
+										Computed:    true,
+										Type:        schema.TypeString,
+										Description: "IP address on the edge gateway - will be auto-assigned if not defined",
+									},
+									"use_for_default_route": {
+										Computed:    true,
+										Type:        schema.TypeBool,
+										Description: "Defines if this subnet should be used as default gateway for edge",
+									},
+									"suballocate_pool": {
+										Type:        schema.TypeSet,
+										Computed:    true,
+										Description: "Define zero or more blocks to sub-allocate pools on the edge gateway",
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"start_address": {
+													Computed: true,
+													Type:     schema.TypeString,
+												},
+												"end_address": {
+													Computed: true,
+													Type:     schema.TypeString,
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
 		},
 	}
 }