Support for Regional VLANs added to core

Author: rashik-bhasin

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Added
 - Support for Oracle distribution of Hadoop with Big Data service
 - Support for APM Synthetics service added
+- Support for Regional VLANs added to `core`
 
 ## 4.34.0 (July 07, 2021)
 

oci/core_vlan_resource.go

@@ -27,12 +27,6 @@ func CoreVlanResource() *schema.Resource {
 		Delete:   deleteCoreVlan,
 		Schema: map[string]*schema.Schema{
 			// Required
-			"availability_domain": {
-				Type:             schema.TypeString,
-				Required:         true,
-				ForceNew:         true,
-				DiffSuppressFunc: EqualIgnoreCaseSuppressDiff,
-			},
 			"cidr_block": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -48,6 +42,13 @@ func CoreVlanResource() *schema.Resource {
 			},
 
 			// Optional
+			"availability_domain": {
+				Type:             schema.TypeString,
+				Optional:         true,
+				Computed:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: EqualIgnoreCaseSuppressDiff,
+			},
 			"defined_tags": {
 				Type:             schema.TypeMap,
 				Optional:         true,

oci/core_vlan_test.go

@@ -42,10 +42,10 @@ var (
 	}
 
 	vlanRepresentation = map[string]interface{}{
-		"availability_domain": Representation{repType: Required, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
 		"cidr_block":          Representation{repType: Required, create: `10.0.0.0/24`, update: "10.0.0.0/16"},
 		"compartment_id":      Representation{repType: Required, create: `${var.compartment_id}`},
 		"vcn_id":              Representation{repType: Required, create: `${oci_core_vcn.test_vcn.id}`},
+		"availability_domain": Representation{repType: Optional, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
 		"defined_tags":        Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"display_name":        Representation{repType: Optional, create: `displayName`, update: `displayName2`},
 		"freeform_tags":       Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
@@ -101,7 +101,6 @@ func TestCoreVlanResource_basic(t *testing.T) {
 				Config: config + compartmentIdVariableStr + VlanResourceDependencies +
 					generateResourceFromRepresentationMap("oci_core_vlan", "test_vlan", Required, Create, vlanRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
 					resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/24"),
 					resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 					resource.TestCheckResourceAttrSet(resourceName, "vcn_id"),

website/docs/d/core_vlan.html.markdown

@@ -32,7 +32,7 @@ The following arguments are supported:
 
 The following attributes are exported:
 
-* `availability_domain` - The availability domain of the VLAN.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - The VLAN's availability domain. This attribute will be null if this is a regional VLAN rather than an AD-specific VLAN.  Example: `Uocm:PHX-AD-1` 
 * `cidr_block` - The range of IPv4 addresses that will be used for layer 3 communication with hosts outside the VLAN.  Example: `192.168.1.0/24` 
 * `compartment_id` - The OCID of the compartment containing the VLAN.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 

website/docs/d/core_vlans.html.markdown

@@ -47,7 +47,7 @@ The following attributes are exported:
 
 The following attributes are exported:
 
-* `availability_domain` - The availability domain of the VLAN.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - The VLAN's availability domain. This attribute will be null if this is a regional VLAN rather than an AD-specific VLAN.  Example: `Uocm:PHX-AD-1` 
 * `cidr_block` - The range of IPv4 addresses that will be used for layer 3 communication with hosts outside the VLAN.  Example: `192.168.1.0/24` 
 * `compartment_id` - The OCID of the compartment containing the VLAN.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}` 

website/docs/r/core_vlan.html.markdown

@@ -18,12 +18,12 @@ Creates a VLAN in the specified VCN and the specified compartment.
 ```hcl
 resource "oci_core_vlan" "test_vlan" {
 	#Required
-	availability_domain = var.vlan_availability_domain
 	cidr_block = var.vlan_cidr_block
 	compartment_id = var.compartment_id
 	vcn_id = oci_core_vcn.test_vcn.id
 
 	#Optional
+	availability_domain = var.vlan_availability_domain
 	defined_tags = {"Operations.CostCenter"= "42"}
 	display_name = var.vlan_display_name
 	freeform_tags = {"Department"= "Finance"}
@@ -37,7 +37,13 @@ resource "oci_core_vlan" "test_vlan" {
 
 The following arguments are supported:
 
-* `availability_domain` - (Required) The availability domain of the VLAN.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - (Optional) Controls whether the VLAN is regional or specific to an availability domain. A regional VLAN has the flexibility to implement failover across availability domains. Previously, all VLANs were AD-specific.
+
+	To create a regional VLAN, omit this attribute. Resources created subsequently in this VLAN (such as a Compute instance) can be created in any availability domain in the region.
+
+	To create an AD-specific VLAN, use this attribute to specify the availability domain. Resources created in this VLAN must be in that availability domain.
+
+	Example: `Uocm:PHX-AD-1` 
 * `cidr_block` - (Required) (Updatable) The range of IPv4 addresses that will be used for layer 3 communication with hosts outside the VLAN. The CIDR must maintain the following rules -
 
   a. The CIDR block is valid and correctly formatted. b. The new range is within one of the parent VCN ranges.
@@ -61,7 +67,7 @@ Any change to a property that does not support update will force the destruction
 
 The following attributes are exported:
 
-* `availability_domain` - The availability domain of the VLAN.  Example: `Uocm:PHX-AD-1` 
+* `availability_domain` - The VLAN's availability domain. This attribute will be null if this is a regional VLAN rather than an AD-specific VLAN.  Example: `Uocm:PHX-AD-1` 
 * `cidr_block` - The range of IPv4 addresses that will be used for layer 3 communication with hosts outside the VLAN.  Example: `192.168.1.0/24` 
 * `compartment_id` - The OCID of the compartment containing the VLAN.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`