Added - Support for X11 M | Exadata Infrastructure Support on ExaDB-C@C

Author: yj115

examples/database/exadata_cc/exadata-infrastructure.tf

@@ -42,13 +42,15 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
   infini_band_network_cidr    = "10.31.8.0/21"
   netmask                     = "255.255.255.0"
   ntp_server                  = ["10.231.225.76"]
-  shape                       = "ExadataCC.X7"
+  shape                       = "ExadataCC.X11M"
   time_zone                   = "US/Pacific"
   activation_file             = "activation.zip"
   storage_count               = 3
   compute_count               = 2
   is_cps_offline_report_enabled = false
   is_multi_rack_deployment      = false
+  database_server_type        = "X11M"
+  storage_server_type         = "X11M-HC"
 
   #Optional
   network_bonding_mode_details {

examples/database/exadata_cc/vm_cluster.tf

@@ -187,7 +187,7 @@ resource "oci_database_vm_cluster" "test_vm_cluster" {
   cpu_core_count            = "4"
   display_name              = "testVmCluster"
   exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
-  gi_version                = "23.0.0.0.0"
+  gi_version                = data.oci_database_gi_versions.gi_version.gi_versions.0.version
   ssh_public_keys           = [var.ssh_public_key]
   vm_cluster_network_id     = oci_database_vm_cluster_network.test_vm_cluster_network.id
   db_servers                = [data.oci_database_db_servers.test_db_servers.db_servers.0.id, data.oci_database_db_servers.test_db_servers.db_servers.1.id]
@@ -344,9 +344,9 @@ data "oci_database_vm_clusters" "test_vm_clusters" {
   #Optional
   exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
 }
-/*
+
 resource "local_file" "test_vm_cluster_network_downloaded_config_file" {
   content  = data.oci_database_vm_cluster_network_download_config_file.test_vm_cluster_network_download_config_file.content
   filename = "${path.module}/vm_cluster_config.txt"
 }
-*/
+

internal/integrationtest/database_db_server_test.go

@@ -71,6 +71,7 @@ func TestDatabaseDbServerResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "db_servers.0.autonomous_virtual_machine_ids.#", "0"),
 					resource.TestCheckResourceAttr(datasourceName, "db_servers.0.autonomous_vm_cluster_ids.#", "0"),
 					resource.TestCheckResourceAttrSet(datasourceName, "db_servers.0.compartment_id"),
+					resource.TestCheckResourceAttrSet(datasourceName, "db_servers.0.compute_model"),
 					resource.TestCheckResourceAttrSet(datasourceName, "db_servers.0.cpu_core_count"),
 					resource.TestCheckResourceAttr(datasourceName, "db_servers.0.db_node_ids.#", "0"),
 					resource.TestCheckResourceAttrSet(datasourceName, "db_servers.0.db_node_storage_size_in_gbs"),
@@ -99,6 +100,7 @@ func TestDatabaseDbServerResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "autonomous_virtual_machine_ids.#", "0"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "autonomous_vm_cluster_ids.#", "0"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "compartment_id"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "compute_model"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "cpu_core_count"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "db_node_ids.#", "0"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "db_node_storage_size_in_gbs"),

internal/integrationtest/database_db_system_shape_test.go

@@ -49,6 +49,7 @@ func TestDatabaseDbSystemShapeResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
 
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.#"),
+				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.are_server_types_supported"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.available_core_count"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.available_core_count_per_node"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.available_data_storage_in_tbs"),
@@ -57,7 +58,10 @@ func TestDatabaseDbSystemShapeResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.available_db_node_storage_in_gbs"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.available_memory_in_gbs"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.available_memory_per_node_in_gbs"),
+				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.compute_model"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.core_count_increment"),
+				//display_name is expected to set only for X11 and later models.
+				//resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.display_name"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.max_storage_count"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.maximum_node_count"),
 				resource.TestCheckResourceAttrSet(datasourceName, "db_system_shapes.0.min_core_count_per_node"),