Added - ExaDB-C@C (EXACC) Data Plane Guest VMs (API/UI Only)

Kaihua Shi · sagarp337 · commit 0951ce89f73a · 2023-05-19T15:22:57.000-05:00
diff --git a/internal/integrationtest/database_exadata_infrastructure_test.go b/internal/integrationtest/database_exadata_infrastructure_test.go
@@ -420,6 +420,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "exadata_infrastructures.0.additional_compute_count"),
 				resource.TestCheckResourceAttrSet(datasourceName, "exadata_infrastructures.0.additional_storage_count"),
 				resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.admin_network_cidr", "192.168.0.0/20"),
+				resource.TestCheckResourceAttrSet(datasourceName, "exadata_infrastructures.0.availability_domain"),
 				resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.cloud_control_plane_server1", "10.32.88.2"),
 				resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.cloud_control_plane_server2", "10.32.88.4"),
 				resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.compartment_id", compartmentId),
@@ -488,6 +489,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "additional_compute_count"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "additional_storage_count"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "admin_network_cidr", "192.168.0.0/20"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "availability_domain"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "cloud_control_plane_server1", "10.32.88.2"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "cloud_control_plane_server2", "10.32.88.4"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
diff --git a/internal/integrationtest/database_vm_cluster_test.go b/internal/integrationtest/database_vm_cluster_test.go
@@ -243,6 +243,7 @@ func TestDatabaseVmClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "state", "AVAILABLE"),
 
 				resource.TestCheckResourceAttr(datasourceName, "vm_clusters.#", "1"),
+				resource.TestCheckResourceAttrSet(datasourceName, "vm_clusters.0.availability_domain"),
 				resource.TestCheckResourceAttr(datasourceName, "vm_clusters.0.compartment_id", compartmentId),
 				resource.TestCheckResourceAttrSet(datasourceName, "vm_clusters.0.cpus_enabled"),
 				resource.TestCheckResourceAttr(datasourceName, "vm_clusters.0.data_collection_options.#", "1"),
@@ -277,6 +278,7 @@ func TestDatabaseVmClusterResource_basic(t *testing.T) {
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "vm_cluster_id"),
 
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "availability_domain"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "cpus_enabled"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "data_collection_options.#", "1"),
diff --git a/internal/service/database/database_exadata_infrastructure_data_source.go b/internal/service/database/database_exadata_infrastructure_data_source.go
@@ -86,6 +86,10 @@ func (s *DatabaseExadataInfrastructureDataSourceCrud) SetData() error {
 		s.D.Set("admin_network_cidr", *s.Res.AdminNetworkCIDR)
 	}
 
+	if s.Res.AvailabilityDomain != nil {
+		s.D.Set("availability_domain", *s.Res.AvailabilityDomain)
+	}
+
 	if s.Res.CloudControlPlaneServer1 != nil {
 		s.D.Set("cloud_control_plane_server1", *s.Res.CloudControlPlaneServer1)
 	}
diff --git a/internal/service/database/database_exadata_infrastructure_resource.go b/internal/service/database/database_exadata_infrastructure_resource.go
@@ -324,6 +324,10 @@ func DatabaseExadataInfrastructureResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"availability_domain": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"cpus_enabled": {
 				Type:     schema.TypeInt,
 				Computed: true,
@@ -932,6 +936,10 @@ func (s *DatabaseExadataInfrastructureResourceCrud) SetData() error {
 		s.D.Set("admin_network_cidr", *s.Res.AdminNetworkCIDR)
 	}
 
+	if s.Res.AvailabilityDomain != nil {
+		s.D.Set("availability_domain", *s.Res.AvailabilityDomain)
+	}
+
 	if s.Res.CloudControlPlaneServer1 != nil {
 		s.D.Set("cloud_control_plane_server1", *s.Res.CloudControlPlaneServer1)
 	}
diff --git a/internal/service/database/database_exadata_infrastructures_data_source.go b/internal/service/database/database_exadata_infrastructures_data_source.go
@@ -130,6 +130,10 @@ func (s *DatabaseExadataInfrastructuresDataSourceCrud) SetData() error {
 			exadataInfrastructure["admin_network_cidr"] = *r.AdminNetworkCIDR
 		}
 
+		if r.AvailabilityDomain != nil {
+			exadataInfrastructure["availability_domain"] = *r.AvailabilityDomain
+		}
+
 		if r.CloudControlPlaneServer1 != nil {
 			exadataInfrastructure["cloud_control_plane_server1"] = *r.CloudControlPlaneServer1
 		}
diff --git a/internal/service/database/database_vm_cluster_add_virtual_machine_resource.go b/internal/service/database/database_vm_cluster_add_virtual_machine_resource.go
@@ -62,6 +62,10 @@ func DatabaseVmClusterAddVirtualMachineResource() *schema.Resource {
 			},
 
 			// Computed
+			"availability_domain": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -272,6 +276,10 @@ func (s *DatabaseVmClusterAddVirtualMachineResourceCrud) Create() error {
 }
 
 func (s *DatabaseVmClusterAddVirtualMachineResourceCrud) SetData() error {
+	if s.Res.AvailabilityDomain != nil {
+		s.D.Set("availability_domain", *s.Res.AvailabilityDomain)
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}
diff --git a/internal/service/database/database_vm_cluster_data_source.go b/internal/service/database/database_vm_cluster_data_source.go
@@ -66,6 +66,10 @@ func (s *DatabaseVmClusterDataSourceCrud) SetData() error {
 
 	s.D.SetId(*s.Res.Id)
 
+	if s.Res.AvailabilityDomain != nil {
+		s.D.Set("availability_domain", *s.Res.AvailabilityDomain)
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}
diff --git a/internal/service/database/database_vm_cluster_remove_virtual_machine_resource.go b/internal/service/database/database_vm_cluster_remove_virtual_machine_resource.go
@@ -54,6 +54,10 @@ func DatabaseVmClusterRemoveVirtualMachineResource() *schema.Resource {
 			// Optional
 
 			// Computed
+			"availability_domain": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -264,6 +268,10 @@ func (s *DatabaseVmClusterRemoveVirtualMachineResourceCrud) Create() error {
 }
 
 func (s *DatabaseVmClusterRemoveVirtualMachineResourceCrud) SetData() error {
+	if s.Res.AvailabilityDomain != nil {
+		s.D.Set("availability_domain", *s.Res.AvailabilityDomain)
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}
diff --git a/internal/service/database/database_vm_cluster_resource.go b/internal/service/database/database_vm_cluster_resource.go
@@ -170,6 +170,10 @@ func DatabaseVmClusterResource() *schema.Resource {
 			},
 
 			// Computed
+			"availability_domain": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"cpus_enabled": {
 				Type:     schema.TypeInt,
 				Computed: true,
@@ -556,6 +560,10 @@ func (s *DatabaseVmClusterResourceCrud) Delete() error {
 }
 
 func (s *DatabaseVmClusterResourceCrud) SetData() error {
+	if s.Res.AvailabilityDomain != nil {
+		s.D.Set("availability_domain", *s.Res.AvailabilityDomain)
+	}
+
 	if s.Res.CompartmentId != nil {
 		s.D.Set("compartment_id", *s.Res.CompartmentId)
 	}
diff --git a/internal/service/database/database_vm_clusters_data_source.go b/internal/service/database/database_vm_clusters_data_source.go
@@ -119,6 +119,10 @@ func (s *DatabaseVmClustersDataSourceCrud) SetData() error {
 			"compartment_id": *r.CompartmentId,
 		}
 
+		if r.AvailabilityDomain != nil {
+			vmCluster["availability_domain"] = *r.AvailabilityDomain
+		}
+
 		if r.CpusEnabled != nil {
 			vmCluster["cpus_enabled"] = *r.CpusEnabled
 			vmCluster["cpu_core_count"] = *r.CpusEnabled
diff --git a/website/docs/d/database_exadata_infrastructure.html.markdown b/website/docs/d/database_exadata_infrastructure.html.markdown
@@ -43,6 +43,7 @@ The following attributes are exported:
 * `additional_compute_system_model` - Oracle Exadata System Model specification. The system model determines the amount of compute or storage server resources available for use. For more information, please see [System and Shape Configuration Options] (https://docs.oracle.com/en/engineered-systems/exadata-cloud-at-customer/ecccm/ecc-system-config-options.html#GUID-9E090174-5C57-4EB1-9243-B470F9F10D6B) 
 * `additional_storage_count` - The requested number of additional storage servers for the Exadata infrastructure.
 * `admin_network_cidr` - The CIDR block for the Exadata administration network.
+* `availability_domain` - The name of the availability domain that the Exadata infrastructure is located in.
 * `cloud_control_plane_server1` - The IP address for the first control plane server.
 * `cloud_control_plane_server2` - The IP address for the second control plane server.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
diff --git a/website/docs/d/database_exadata_infrastructures.html.markdown b/website/docs/d/database_exadata_infrastructures.html.markdown
@@ -53,6 +53,7 @@ The following attributes are exported:
 * `additional_compute_system_model` - Oracle Exadata System Model specification. The system model determines the amount of compute or storage server resources available for use. For more information, please see [System and Shape Configuration Options] (https://docs.oracle.com/en/engineered-systems/exadata-cloud-at-customer/ecccm/ecc-system-config-options.html#GUID-9E090174-5C57-4EB1-9243-B470F9F10D6B) 
 * `additional_storage_count` - The requested number of additional storage servers for the Exadata infrastructure.
 * `admin_network_cidr` - The CIDR block for the Exadata administration network.
+* `availability_domain` - The name of the availability domain that the Exadata infrastructure is located in.
 * `cloud_control_plane_server1` - The IP address for the first control plane server.
 * `cloud_control_plane_server2` - The IP address for the second control plane server.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
diff --git a/website/docs/d/database_vm_cluster.html.markdown b/website/docs/d/database_vm_cluster.html.markdown
@@ -33,6 +33,7 @@ The following arguments are supported:
 
 The following attributes are exported:
 
+* `availability_domain` - The name of the availability domain that the VM cluster is located in.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
 * `cpus_enabled` - The number of enabled CPU cores.
 * `data_collection_options` - Indicates user preferences for the various diagnostic collection options for the VM cluster/Cloud VM cluster/VMBM DBCS. 
diff --git a/website/docs/d/database_vm_clusters.html.markdown b/website/docs/d/database_vm_clusters.html.markdown
@@ -48,6 +48,7 @@ The following attributes are exported:
 
 The following attributes are exported:
 
+* `availability_domain` - The name of the availability domain that the VM cluster is located in.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
 * `cpus_enabled` - The number of enabled CPU cores.
 * `data_collection_options` - Indicates user preferences for the various diagnostic collection options for the VM cluster/Cloud VM cluster/VMBM DBCS. 
diff --git a/website/docs/r/database_autonomous_container_database.html.markdown b/website/docs/r/database_autonomous_container_database.html.markdown
@@ -182,8 +182,8 @@ The following attributes are exported:
 * `autonomous_exadata_infrastructure_id` - **No longer used.** For Autonomous Database on dedicated Exadata infrastructure, the container database is created within a specified `cloudAutonomousVmCluster`.  
 * `autonomous_vm_cluster_id` - The OCID of the Autonomous VM Cluster.
 * `cloud_autonomous_vm_cluster_id` - The OCID of the Cloud Autonomous VM Cluster.
-* `availability_domain` - The availability domain of the Autonomous Container Database.
-* `available_cpus` - Sum of OCPUs available on the Autonomous VM Cluster + Sum of reclaimable OCPUs available in the Autonomous Container Database.
+* `availability_domain` - The availability domain of the Autonomous Container Database
+* `available_cpus` - Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database.<br> For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. See [Compute Models in Autonomous Database on Dedicated Exadata Infrastructure](https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak) for more details.
 * `backup_config` - Backup options for the Autonomous Container Database. 
 	* `backup_destination_details` - Backup destination details.
 		* `dbrs_policy_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the DBRS policy used for backup.
diff --git a/website/docs/r/database_exadata_infrastructure.html.markdown b/website/docs/r/database_exadata_infrastructure.html.markdown
@@ -145,6 +145,7 @@ The following attributes are exported:
 * `additional_compute_system_model` - Oracle Exadata System Model specification. The system model determines the amount of compute or storage server resources available for use. For more information, please see [System and Shape Configuration Options] (https://docs.oracle.com/en/engineered-systems/exadata-cloud-at-customer/ecccm/ecc-system-config-options.html#GUID-9E090174-5C57-4EB1-9243-B470F9F10D6B) 
 * `additional_storage_count` - The requested number of additional storage servers for the Exadata infrastructure.
 * `admin_network_cidr` - The CIDR block for the Exadata administration network.
+* `availability_domain` - The name of the availability domain that the Exadata infrastructure is located in.
 * `cloud_control_plane_server1` - The IP address for the first control plane server.
 * `cloud_control_plane_server2` - The IP address for the second control plane server.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
diff --git a/website/docs/r/database_vm_cluster.html.markdown b/website/docs/r/database_vm_cluster.html.markdown
@@ -82,6 +82,7 @@ Any change to a property that does not support update will force the destruction
 
 The following attributes are exported:
 
+* `availability_domain` - The name of the availability domain that the VM cluster is located in.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
 * `cpus_enabled` - The number of enabled CPU cores.
 * `data_collection_options` - Indicates user preferences for the various diagnostic collection options for the VM cluster/Cloud VM cluster/VMBM DBCS. 
diff --git a/website/docs/r/database_vm_cluster_add_virtual_machine.html.markdown b/website/docs/r/database_vm_cluster_add_virtual_machine.html.markdown
@@ -44,6 +44,7 @@ Any change to a property that does not support update will force the destruction
 
 The following attributes are exported:
 
+* `availability_domain` - The name of the availability domain that the VM cluster is located in.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
 * `cpus_enabled` - The number of enabled CPU cores.
 * `data_collection_options` - Indicates user preferences for the various diagnostic collection options for the VM cluster/Cloud VM cluster/VMBM DBCS. 
diff --git a/website/docs/r/database_vm_cluster_remove_virtual_machine.html.markdown b/website/docs/r/database_vm_cluster_remove_virtual_machine.html.markdown
@@ -42,6 +42,7 @@ Any change to a property that does not support update will force the destruction
 
 The following attributes are exported:
 
+* `availability_domain` - The name of the availability domain that the VM cluster is located in.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
 * `cpus_enabled` - The number of enabled CPU cores.
 * `data_collection_options` - Indicates user preferences for the various diagnostic collection options for the VM cluster/Cloud VM cluster/VMBM DBCS. 

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,10 @@ func (s *DatabaseExadataInfrastructureDataSourceCrud) SetData() error {`
`86`	`86`	`s.D.Set("admin_network_cidr", *s.Res.AdminNetworkCIDR)`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ if s.Res.AvailabilityDomain != nil {`
	`90`	`+ s.D.Set("availability_domain", *s.Res.AvailabilityDomain)`
	`91`	`+ }`
	`92`	`+`
`89`	`93`	`if s.Res.CloudControlPlaneServer1 != nil {`
`90`	`94`	`s.D.Set("cloud_control_plane_server1", *s.Res.CloudControlPlaneServer1)`
`91`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,10 @@ func (s *DatabaseExadataInfrastructuresDataSourceCrud) SetData() error {`
`130`	`130`	`exadataInfrastructure["admin_network_cidr"] = *r.AdminNetworkCIDR`
`131`	`131`	`}`
`132`	`132`
	`133`	`+ if r.AvailabilityDomain != nil {`
	`134`	`+ exadataInfrastructure["availability_domain"] = *r.AvailabilityDomain`
	`135`	`+ }`
	`136`	`+`
`133`	`137`	`if r.CloudControlPlaneServer1 != nil {`
`134`	`138`	`exadataInfrastructure["cloud_control_plane_server1"] = *r.CloudControlPlaneServer1`
`135`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,10 @@ func (s *DatabaseVmClusterDataSourceCrud) SetData() error {`
`66`	`66`
`67`	`67`	`s.D.SetId(*s.Res.Id)`
`68`	`68`
	`69`	`+ if s.Res.AvailabilityDomain != nil {`
	`70`	`+ s.D.Set("availability_domain", *s.Res.AvailabilityDomain)`
	`71`	`+ }`
	`72`	`+`
`69`	`73`	`if s.Res.CompartmentId != nil {`
`70`	`74`	`s.D.Set("compartment_id", *s.Res.CompartmentId)`
`71`	`75`	`}`