Add fault domains in instance pool

Author: jiangong

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Added
 - Support for creating `oci_database_autonomous_database` resource with the specified `whitelisted_ips`
 - Support for `customer_asn` attribute in `core_virtual_circuit` resource
+- Support for Instance Pool with Fault Domain
 
 ### Deprecated
 - Virtual Circuit resource: The `customer_bgp_asn` attribute is now deprecated. Please use the `customer_asn` instead.

examples/compute/instance_pool/instance_pool.tf

@@ -169,6 +169,7 @@ resource "oci_core_instance_pool" "test_instance_pool" {
 
   placement_configurations {
     availability_domain = "${data.oci_identity_availability_domain.ad.name}"
+    fault_domains       = ["FAULT-DOMAIN-1"]
     primary_subnet_id   = "${oci_core_subnet.test_subnet.id}"
   }
 

oci/core_cluster_network_resource.go

@@ -134,6 +134,13 @@ func CoreClusterNetworkResource() *schema.Resource {
 										Type:     schema.TypeString,
 										Computed: true,
 									},
+									"fault_domains": {
+										Type:     schema.TypeList,
+										Computed: true,
+										Elem: &schema.Schema{
+											Type: schema.TypeString,
+										},
+									},
 									"primary_subnet_id": {
 										Type:     schema.TypeString,
 										Computed: true,

oci/core_cluster_network_test.go

@@ -82,10 +82,11 @@ var (
 
 	instanceConfigurationInstanceDetailsLaunchDetailsClusterNetworkRepresentation = getUpdatedRepresentationCopy("shape", Representation{repType: Optional, create: `BM.HPC2.36`}, instanceConfigurationInstanceDetailsLaunchDetailsRepresentation)
 
-	ClusterNetworkResourceRequiredOnlyDependencies = AvailabilityDomainClusterNetworkConfig + DhcpOptionsRequiredOnlyResource + RouteTableRequiredOnlyResource + AnotherSecurityListRequiredOnlyResource +
+	ClusterNetworkResourceRequiredOnlyDependencies = AvailabilityDomainClusterNetworkConfig + DefinedTagsDependencies + VcnResourceConfig + DhcpOptionsRequiredOnlyResource + AnotherSecurityListRequiredOnlyResource +
+		generateResourceFromRepresentationMap("oci_core_route_table", "test_route_table", Required, Create, routeTableRepresentation) +
 		generateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Optional, Update, getUpdatedRepresentationCopy("cidr_block", Representation{repType: Required, create: `10.0.2.0/24`}, subnetRepresentation)) +
 		OciImageIdsVariable +
-		generateResourceFromRepresentationMap("oci_core_network_security_group", "test_network_security_group1", Required, Create, networkSecurityGroupRepresentation)
+		generateResourceFromRepresentationMap("oci_core_network_security_group", "test_network_security_group", Required, Create, networkSecurityGroupRepresentation)
 
 	ClusterNetworkResourceDependencies = ClusterNetworkResourceRequiredOnlyDependencies +
 		generateResourceFromRepresentationMap("oci_core_instance_configuration", "test_instance_configuration", Optional, Create, getUpdatedRepresentationCopy("instance_details", RepresentationGroup{Optional, instanceConfigurationInstanceDetailsClusterNetworkRepresentation}, instanceConfigurationRepresentation))

oci/core_instance_pool_resource.go

@@ -56,6 +56,15 @@ func CoreInstancePoolResource() *schema.Resource {
 						},
 
 						// Optional
+						"fault_domains": {
+							Type:     schema.TypeList,
+							Optional: true,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type:             schema.TypeString,
+								DiffSuppressFunc: EqualIgnoreCaseSuppressDiff,
+							},
+						},
 						"secondary_vnic_subnets": {
 							Type:     schema.TypeList,
 							Optional: true,
@@ -616,6 +625,19 @@ func (s *CoreInstancePoolResourceCrud) mapToCreateInstancePoolPlacementConfigura
 		result.AvailabilityDomain = &tmp
 	}
 
+	if faultDomains, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "fault_domains")); ok {
+		interfaces := faultDomains.([]interface{})
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "fault_domains")) {
+			result.FaultDomains = tmp
+		}
+	}
+
 	if primarySubnetId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "primary_subnet_id")); ok {
 		tmp := primarySubnetId.(string)
 		result.PrimarySubnetId = &tmp
@@ -649,6 +671,19 @@ func (s *CoreInstancePoolResourceCrud) mapToUpdateInstancePoolPlacementConfigura
 		result.AvailabilityDomain = &tmp
 	}
 
+	if faultDomains, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "fault_domains")); ok {
+		interfaces := faultDomains.([]interface{})
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "fault_domains")) {
+			result.FaultDomains = tmp
+		}
+	}
+
 	if primarySubnetId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "primary_subnet_id")); ok {
 		tmp := primarySubnetId.(string)
 		result.PrimarySubnetId = &tmp
@@ -679,6 +714,8 @@ func InstancePoolPlacementConfigurationToMap(obj oci_core.InstancePoolPlacementC
 		result["availability_domain"] = string(*obj.AvailabilityDomain)
 	}
 
+	result["fault_domains"] = obj.FaultDomains
+
 	if obj.PrimarySubnetId != nil {
 		result["primary_subnet_id"] = string(*obj.PrimarySubnetId)
 	}

oci/core_instance_pool_test.go

@@ -53,6 +53,7 @@ var (
 	instancePoolPlacementConfigurationsRepresentation = map[string]interface{}{
 		"availability_domain":    Representation{repType: Required, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
 		"primary_subnet_id":      Representation{repType: Required, create: `${oci_core_subnet.test_subnet.id}`},
+		"fault_domains":          Representation{repType: Optional, create: []string{`FAULT-DOMAIN-1`}, update: []string{`FAULT-DOMAIN-2`}},
 		"secondary_vnic_subnets": RepresentationGroup{Optional, instancePoolPlacementConfigurationsSecondaryVnicSubnetsRepresentation},
 	}
 	instancePoolLoadBalancersRepresentation = map[string]interface{}{
@@ -193,6 +194,7 @@ func TestCoreInstancePoolResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "load_balancers.0.vnic_selection", "PrimaryVnic"),
 					resource.TestCheckResourceAttr(resourceName, "placement_configurations.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.availability_domain"),
+					resource.TestCheckResourceAttr(resourceName, "placement_configurations.0.fault_domains.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.primary_subnet_id"),
 					resource.TestCheckResourceAttr(resourceName, "placement_configurations.0.secondary_vnic_subnets.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "placement_configurations.0.secondary_vnic_subnets.0.display_name", "backend-servers-pool"),
@@ -237,6 +239,7 @@ func TestCoreInstancePoolResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "load_balancers.0.vnic_selection", "PrimaryVnic"),
 					resource.TestCheckResourceAttr(resourceName, "placement_configurations.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.availability_domain"),
+					resource.TestCheckResourceAttr(resourceName, "placement_configurations.0.fault_domains.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.primary_subnet_id"),
 					resource.TestCheckResourceAttr(resourceName, "size", "2"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
@@ -273,6 +276,7 @@ func TestCoreInstancePoolResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "load_balancers.0.vnic_selection", "PrimaryVnic"),
 					resource.TestCheckResourceAttr(resourceName, "placement_configurations.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.availability_domain"),
+					resource.TestCheckResourceAttr(resourceName, "placement_configurations.0.fault_domains.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.primary_subnet_id"),
 					resource.TestCheckResourceAttr(resourceName, "size", "3"),
 					resource.TestCheckResourceAttr(resourceName, "state", "RUNNING"),
@@ -386,6 +390,7 @@ func TestCoreInstancePoolResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "load_balancers.0.vnic_selection", "PrimaryVnic"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "placement_configurations.#", "1"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "placement_configurations.0.availability_domain"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "placement_configurations.0.fault_domains.#", "1"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "size", "3"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),

website/docs/d/core_cluster_network.html.markdown

@@ -56,6 +56,7 @@ The following attributes are exported:
 		* `vnic_selection` - Indicates which VNIC on each instance in the instance pool should be used to associate with the load balancer. Possible values are "PrimaryVnic" or the displayName of one of the secondary VNICs on the instance configuration that is associated with the instance pool.
 	* `placement_configurations` - The placement configurations for the instance pool.
 		* `availability_domain` - The availability domain to place instances. Example: `Uocm:PHX-AD-1` 
+		* `fault_domains` - The fault domains to place instances. 
 		* `primary_subnet_id` - The OCID of the primary subnet to place instances.
 		* `secondary_vnic_subnets` - The set of secondary VNIC data for instances in the pool.
 			* `display_name` - The displayName of the vnic. This is also use to match against the Instance Configuration defined secondary vnic. 

website/docs/d/core_cluster_networks.html.markdown

@@ -68,6 +68,7 @@ The following attributes are exported:
 		* `vnic_selection` - Indicates which VNIC on each instance in the instance pool should be used to associate with the load balancer. Possible values are "PrimaryVnic" or the displayName of one of the secondary VNICs on the instance configuration that is associated with the instance pool.
 	* `placement_configurations` - The placement configurations for the instance pool.
 		* `availability_domain` - The availability domain to place instances. Example: `Uocm:PHX-AD-1` 
+		* `fault_domains` - The fault domains to place instances. 
 		* `primary_subnet_id` - The OCID of the primary subnet to place instances.
 		* `secondary_vnic_subnets` - The set of secondary VNIC data for instances in the pool.
 			* `display_name` - The displayName of the vnic. This is also use to match against the Instance Configuration defined secondary vnic. 

website/docs/d/core_instance_pool.html.markdown

@@ -48,6 +48,7 @@ The following attributes are exported:
 	* `vnic_selection` - Indicates which VNIC on each instance in the instance pool should be used to associate with the load balancer. Possible values are "PrimaryVnic" or the displayName of one of the secondary VNICs on the instance configuration that is associated with the instance pool.
 * `placement_configurations` - The placement configurations for the instance pool.
 	* `availability_domain` - The availability domain to place instances. Example: `Uocm:PHX-AD-1` 
+	* `fault_domains` - The fault domains to place instances. 
 	* `primary_subnet_id` - The OCID of the primary subnet to place instances.
 	* `secondary_vnic_subnets` - The set of secondary VNIC data for instances in the pool.
 		* `display_name` - The displayName of the vnic. This is also use to match against the Instance Configuration defined secondary vnic. 

website/docs/d/core_instance_pools.html.markdown

@@ -60,6 +60,7 @@ The following attributes are exported:
 	* `vnic_selection` - Indicates which VNIC on each instance in the instance pool should be used to associate with the load balancer. Possible values are "PrimaryVnic" or the displayName of one of the secondary VNICs on the instance configuration that is associated with the instance pool.
 * `placement_configurations` - The placement configurations for the instance pool.
 	* `availability_domain` - The availability domain to place instances. Example: `Uocm:PHX-AD-1` 
+	* `fault_domains` - The fault domains to place instances. 
 	* `primary_subnet_id` - The OCID of the primary subnet to place instances.
 	* `secondary_vnic_subnets` - The set of secondary VNIC data for instances in the pool.
 		* `display_name` - The displayName of the vnic. This is also use to match against the Instance Configuration defined secondary vnic.