Skip to content

Commit 4e1784a

Browse files
Sonali PurdhaniMaxrovr
Sonali Purdhani
authored and
Maxrovr
committed
Added - Support for ADB-D and ADB on ExaCC | ECPU Billing
1 parent 18c37ca commit 4e1784a

File tree

32 files changed

+381
-80
lines changed

32 files changed

+381
-80
lines changed

‎examples/database/atp-d/exadata.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ resource "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cl
7575
memory_per_oracle_compute_unit_in_gbs = 27
7676
cpu_core_count_per_node = 50
7777
total_container_databases = 12
78+
compute_model = "ECPU"
7879
}
7980

8081
resource "oci_core_network_security_group" "test_network_security_group" {

‎examples/database/atp-d/main.tf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
6767
#Required
6868
admin_password = random_string.autonomous_database_admin_password.result
6969
compartment_id = var.compartment_ocid
70-
cpu_core_count = "1"
70+
compute_count = "1"
7171
data_storage_size_in_tbs = "1"
7272
db_name = "atpdb1"
7373

@@ -77,14 +77,15 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
7777
display_name = "example_autonomous_database-007"
7878
freeform_tags = var.autonomous_database_freeform_tags
7979
is_dedicated = "true"
80-
rotate_key_trigger = "true"
80+
rotate_key_trigger = "true"
81+
compute_model = "ECPU"
8182
}
8283

8384
resource "oci_database_autonomous_database" "test_autonomous_database_character_set_support" {
8485
#Required
8586
admin_password = random_string.autonomous_database_admin_password.result
8687
compartment_id = var.compartment_ocid
87-
cpu_core_count = "1"
88+
compute_count = "1"
8889
data_storage_size_in_tbs = "1"
8990
db_name = "atpdb2"
9091

‎internal/integrationtest/database_autonomous_container_database_dataguard_association_test.go‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,40 +48,29 @@ var (
4848
ATPDCloudAutonomousVmClusterRepresentation = acctest.RepresentationCopyWithRemovedProperties(DatabaseCloudAutonomousVmClusterRepresentation, []string{"nsg_ids"})
4949
PeerCloudAvmRepresentation = acctest.GetUpdatedRepresentationCopy("cloud_exadata_infrastructure_id", acctest.Representation{RepType: acctest.Required, Create: `${oci_database_cloud_exadata_infrastructure.peer_cloud_exadata_infrastructure.id}`}, ATPDCloudAutonomousVmClusterRepresentation)
5050

51-
ExaCCACDResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", acctest.Required, acctest.Create,
52-
acctest.RepresentationCopyWithNewProperties(exadataInfrastructureRepresentationWithContacts, map[string]interface{}{"activation_file": acctest.Representation{RepType: acctest.Required, Create: activationFilePath}})) +
53-
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_vm_cluster", "test_autonomous_vm_cluster", acctest.Required, acctest.Create, DatabaseAutonomousVmClusterRepresentation) +
54-
acctest.GenerateResourceFromRepresentationMap("oci_database_vm_cluster_network", "test_vm_cluster_network", acctest.Required, acctest.Create,
55-
acctest.RepresentationCopyWithNewProperties(DatabaseVmClusterNetworkRepresentation, map[string]interface{}{"validate_vm_cluster_network": acctest.Representation{RepType: acctest.Required, Create: "true"}})) +
56-
acctest.GenerateDataSourceFromRepresentationMap("oci_database_db_servers", "test_db_servers", acctest.Required, acctest.Create, DatabaseDatabaseDbServerDataSourceRepresentation)
51+
ExaCCACDResourceDependencies = DatabaseAVMClusterWithSingleNetworkResourceDependencies +
52+
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_vm_cluster", "test_autonomous_vm_cluster", acctest.Required, acctest.Create, DatabaseOCPUAutonomousVmClusterRepresentation)
5753

5854
peerExadataInfraNewProperties = map[string]interface{}{
5955
"activation_file": acctest.Representation{RepType: acctest.Required, Create: activationFilePath},
6056
"display_name": acctest.Representation{RepType: acctest.Required, Create: `PeerExadataInfra`},
6157
}
6258
peerExadataInfraRepresentation = acctest.RepresentationCopyWithNewProperties(exadataInfrastructureRepresentationWithContacts, peerExadataInfraNewProperties)
6359

64-
peerVmClusterNetworkNewProperties = map[string]interface{}{
65-
"validate_vm_cluster_network": acctest.Representation{RepType: acctest.Required, Create: "true"},
66-
"display_name": acctest.Representation{RepType: acctest.Required, Create: `peerVmClusterNw`},
67-
"exadata_infrastructure_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_exadata_infrastructure.peer_exadata_infrastructure.id}`},
68-
}
69-
7060
peerAutonomousVmClusterNewProperties = map[string]interface{}{
7161
"display_name": acctest.Representation{RepType: acctest.Required, Create: `peerAutonomousVmCluster`},
7262
"exadata_infrastructure_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_exadata_infrastructure.peer_exadata_infrastructure.id}`},
7363
"is_local_backup_enabled": acctest.Representation{RepType: acctest.Optional, Create: `true`},
7464
"vm_cluster_network_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_vm_cluster_network.peer_vm_cluster_network.id}`},
7565
}
7666

77-
peerAutonomousVmClusterRepresentation = acctest.RepresentationCopyWithNewProperties(DatabaseAutonomousVmClusterRepresentation, peerAutonomousVmClusterNewProperties)
67+
peerAutonomousVmClusterRepresentation = acctest.RepresentationCopyWithNewProperties(DatabaseOCPUAutonomousVmClusterRepresentation, peerAutonomousVmClusterNewProperties)
7868

7969
ExaccACDWithDataGuardResourceDependencies = ExaCCACDResourceDependencies +
8070
acctest.GenerateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "peer_exadata_infrastructure", acctest.Required, acctest.Create, peerExadataInfraRepresentation) +
8171
acctest.GenerateResourceFromRepresentationMap("oci_database_vm_cluster_network", "peer_vm_cluster_network", acctest.Required, acctest.Create, DatabasePeerVmClusterNetworkRepresentation) +
8272
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_vm_cluster", "peer_autonomous_vm_cluster", acctest.Required, acctest.Create, peerAutonomousVmClusterRepresentation) +
83-
acctest.GenerateDataSourceFromRepresentationMap("oci_database_db_servers", "peer_db_servers", acctest.Required, acctest.Create, DatabaseDatabasePeerExaInfraDbServerDataSourceRepresentation) +
84-
DefinedTagsDependencies
73+
acctest.GenerateDataSourceFromRepresentationMap("oci_database_db_servers", "peer_db_servers", acctest.Required, acctest.Create, DatabaseDatabasePeerExaInfraDbServerDataSourceRepresentation)
8574

8675
ExaccACDWithDataGuardRepresentation = map[string]interface{}{
8776
"display_name": acctest.Representation{RepType: acctest.Required, Create: `ACD-DG-TF-TEST`},

‎internal/integrationtest/database_autonomous_container_database_resource_test.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
var (
2121
acbDBName = utils.RandomString(1, utils.CharsetWithoutDigits) + utils.RandomString(13, utils.Charset)
2222

23-
ACDatabaseResourceConfig = ACDatabaseResourceDependencies +
23+
ExaccACDResourceConfig = ACDatabaseResourceDependencies +
2424
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_container_database", "test_autonomous_container_database", acctest.Optional, acctest.Update, ACDatabaseRepresentation)
2525

2626
ACDatabaseDataSourceRepresentation = map[string]interface{}{
@@ -64,13 +64,9 @@ var (
6464
"recovery_window_in_days": acctest.Representation{RepType: acctest.Optional, Create: `7`},
6565
}
6666

67-
ACDatabaseResourceDependencies = DefinedTagsDependencies +
67+
ACDatabaseResourceDependencies = DatabaseAVMClusterWithSingleNetworkResourceDependencies +
6868
acctest.GenerateResourceFromRepresentationMap("oci_database_backup_destination", "test_backup_destination", acctest.Optional, acctest.Create, DatabaseBackupDestinationRepresentation) +
69-
acctest.GenerateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", acctest.Required, acctest.Create,
70-
acctest.RepresentationCopyWithNewProperties(exadataInfrastructureRepresentationWithContacts, map[string]interface{}{"activation_file": acctest.Representation{RepType: acctest.Required, Create: activationFilePath}})) +
71-
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_vm_cluster", "test_autonomous_vm_cluster", acctest.Required, acctest.Create, DatabaseAutonomousVmClusterRepresentation) +
72-
acctest.GenerateResourceFromRepresentationMap("oci_database_vm_cluster_network", "test_vm_cluster_network", acctest.Required, acctest.Create,
73-
acctest.RepresentationCopyWithNewProperties(DatabaseVmClusterNetworkRepresentation, map[string]interface{}{"validate_vm_cluster_network": acctest.Representation{RepType: acctest.Required, Create: "true"}})) +
69+
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_vm_cluster", "test_autonomous_vm_cluster", acctest.Required, acctest.Create, DatabaseOCPUAutonomousVmClusterRepresentation) +
7470
acctest.GenerateResourceFromRepresentationMap("oci_database_key_store", "test_key_store", acctest.Optional, acctest.Create, DatabaseKeyStoreRepresentation) +
7571
KmsVaultIdVariableStr + OkvSecretVariableStr
7672

‎internal/integrationtest/database_autonomous_container_database_test.go‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ var (
6969
"recovery_window_in_days": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
7070
}
7171
DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsRepresentation = map[string]interface{}{
72-
"preference": acctest.Representation{RepType: acctest.Required, Create: `CUSTOM_PREFERENCE`},
73-
"custom_action_timeout_in_mins": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
74-
"days_of_week": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsDaysOfWeekRepresentation},
75-
"hours_of_day": acctest.Representation{RepType: acctest.Optional, Create: []string{`4`}, Update: []string{`8`}},
76-
"is_custom_action_timeout_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
77-
"lead_time_in_weeks": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
78-
"months": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsMonthsRepresentation},
79-
"patching_mode": acctest.Representation{RepType: acctest.Optional, Create: `ROLLING`, Update: `NONROLLING`},
80-
"weeks_of_month": acctest.Representation{RepType: acctest.Optional, Create: []string{`1`}, Update: []string{`2`}},
72+
"preference": acctest.Representation{RepType: acctest.Required, Create: `CUSTOM_PREFERENCE`},
73+
"custom_action_timeout_in_mins": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
74+
"days_of_week": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsDaysOfWeekRepresentation},
75+
"hours_of_day": acctest.Representation{RepType: acctest.Optional, Create: []string{`4`}, Update: []string{`8`}},
76+
//"is_custom_action_timeout_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
77+
//"lead_time_in_weeks": acctest.Representation{RepType: acctest.Optional, Create: `10`, Update: `11`},
78+
"months": []acctest.RepresentationGroup{{RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsMonthsRepresentation}, {RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsMonthsRepresentation2}, {RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsMonthsRepresentation3}, {RepType: acctest.Optional, Group: DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsMonthsRepresentation4}},
79+
//"patching_mode": acctest.Representation{RepType: acctest.Optional, Create: `ROLLING`, Update: `NONROLLING`},
80+
"weeks_of_month": acctest.Representation{RepType: acctest.Optional, Create: []string{`1`}, Update: []string{`2`}},
8181
}
8282
DatabaseAutonomousContainerDatabaseMaintenanceWindowDetailsNoPreferenceRepresentation = map[string]interface{}{
8383
"preference": acctest.Representation{RepType: acctest.Required, Create: `NO_PREFERENCE`},
@@ -100,16 +100,11 @@ var (
100100
"name": acctest.Representation{RepType: acctest.Required, Create: `OCTOBER`, Update: `NOVEMBER`},
101101
}
102102

103-
DatabaseAutonomousContainerDatabaseResourceDependencies = DefinedTagsDependencies +
104-
acctest.GenerateResourceFromRepresentationMap("oci_database_autonomous_vm_cluster", "test_autonomous_vm_cluster", acctest.Required, acctest.Create, DatabaseAutonomousVmClusterRepresentation) +
103+
DatabaseAutonomousContainerDatabaseResourceDependencies = DatabaseAutonomousVmClusterRequiredOnlyResource +
105104
KeyResourceDependencyConfig + kmsKeyIdCreateVariableStr + kmsKeyIdUpdateVariableStr +
106105
acctest.GenerateResourceFromRepresentationMap("oci_database_backup_destination", "test_backup_destination", acctest.Optional, acctest.Create, DatabaseBackupDestinationRepresentation) +
107106
OkvSecretVariableStr +
108-
acctest.GenerateResourceFromRepresentationMap("oci_database_key_store", "test_key_store", acctest.Optional, acctest.Create, DatabaseKeyStoreRepresentation) +
109-
acctest.GenerateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", acctest.Required, acctest.Create,
110-
acctest.RepresentationCopyWithNewProperties(exadataInfrastructureRepresentationWithContacts, map[string]interface{}{"activation_file": acctest.Representation{RepType: acctest.Required, Create: activationFilePath}})) +
111-
acctest.GenerateResourceFromRepresentationMap("oci_database_vm_cluster_network", "test_vm_cluster_network", acctest.Required, acctest.Create,
112-
acctest.RepresentationCopyWithNewProperties(DatabaseVmClusterNetworkRepresentation, map[string]interface{}{"validate_vm_cluster_network": acctest.Representation{RepType: acctest.Required, Create: "true"}}))
107+
acctest.GenerateResourceFromRepresentationMap("oci_database_key_store", "test_key_store", acctest.Optional, acctest.Create, DatabaseKeyStoreRepresentation)
113108

114109
ATPDAutonomousContainerDatabaseResourceDependencies = DatabaseCloudAutonomousVmClusterRequiredOnlyResource + KeyResourceDependencyConfig + kmsKeyIdCreateVariableStr + kmsKeyIdUpdateVariableStr
115110
)
@@ -350,6 +345,7 @@ func TestDatabaseAutonomousContainerDatabaseResource_basic(t *testing.T) {
350345
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.backup_config.#", "1"),
351346
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.backup_config.0.recovery_window_in_days", "11"),
352347
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.compartment_id", compartmentId),
348+
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_databases.0.compute_model"),
353349
resource.TestCheckResourceAttrSet(datasourceName, "autonomous_container_databases.0.db_version"),
354350
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.display_name", "displayName2"),
355351
resource.TestCheckResourceAttr(datasourceName, "autonomous_container_databases.0.freeform_tags.%", "1"),
@@ -389,6 +385,7 @@ func TestDatabaseAutonomousContainerDatabaseResource_basic(t *testing.T) {
389385
resource.TestCheckResourceAttr(singularDatasourceName, "backup_config.#", "1"),
390386
resource.TestCheckResourceAttr(singularDatasourceName, "backup_config.0.recovery_window_in_days", "11"),
391387
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
388+
resource.TestCheckResourceAttrSet(singularDatasourceName, "compute_model"),
392389
resource.TestCheckResourceAttrSet(singularDatasourceName, "db_version"),
393390
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
394391
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),

0 commit comments

Comments
 (0)