Added - Autonomous Data Guard v2-Observer Support

Author: varmax2511

examples/database/atp-d/exadata.tf

@@ -51,45 +51,25 @@ resource "oci_core_subnet" "exadata_subnet" {
   dns_label           = "subnetexadata"
 }
 
-resource "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exadata_infrastructure" {
+resource "oci_database_cloud_exadata_infrastructure" "test_cloud_exadata_infrastructure" {
+  #Required
   availability_domain = data.oci_identity_availability_domain.ad.name
   compartment_id      = var.compartment_ocid
-  display_name        = "TestExadata11"
-  domain              = var.autonomous_exadata_infrastructure_domain
-  freeform_tags       = var.autonomous_database_freeform_tags
-  license_model       = "LICENSE_INCLUDED"
-
-  maintenance_window_details {
-    preference = "CUSTOM_PREFERENCE"
-
-    days_of_week {
-      name = "MONDAY"
-    }
-
-    hours_of_day = ["4"]
-
-    months {
-      name = "JANUARY"
-    }
+  display_name        = "TFATPD"
+  shape               = var.cloud_exadata_infrastructure_shape
 
-    months {
-      name = "APRIL"
-    }
-
-    months {
-      name = "JULY"
-    }
-
-    months {
-      name = "OCTOBER"
-    }
-
-    weeks_of_month = ["2"]
-  }
+  #Optional
+  compute_count = var.cloud_exadata_infrastructure_compute_count
+  storage_count = var.cloud_exadata_infrastructure_storage_count
+}
 
-  nsg_ids   = [oci_core_network_security_group.test_network_security_group.id]
-  shape     = "Exadata.X8M"
-  subnet_id = oci_core_subnet.exadata_subnet.id
+resource "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cluster" {
+  cloud_exadata_infrastructure_id = oci_database_cloud_exadata_infrastructure.test_cloud_exadata_infrastructure.id
+  compartment_id                  = var.compartment_ocid
+  display_name                    = "TestCloudAutonomousVmCluster"
+  freeform_tags                   = var.autonomous_database_freeform_tags
+  license_model                   = "LICENSE_INCLUDED"
+  subnet_id                       = oci_core_subnet.exadata_subnet.id
 }
 
 resource "oci_core_network_security_group" "test_network_security_group" {
@@ -98,18 +78,6 @@ resource "oci_core_network_security_group" "test_network_security_group" {
   vcn_id         = oci_core_vcn.test_vcn.id
 }
 
-data "oci_database_autonomous_exadata_infrastructures" "test_autonomous_exadata_infrastructures" {
-  availability_domain = data.oci_identity_availability_domain.ad.name
-  compartment_id      = var.compartment_ocid
-  display_name        = "TestExadata"
-  state               = "AVAILABLE"
-}
-
-data "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exadata_infrastructure" {
-  autonomous_exadata_infrastructure_id = oci_database_autonomous_exadata_infrastructure.test_autonomous_exadata_infrastructure.id
-}
-
-output "test_autonomous_exadata_infrastructures" {
-  value = [data.oci_database_autonomous_exadata_infrastructures.test_autonomous_exadata_infrastructures.autonomous_exadata_infrastructures]
-}
-
+data "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cluster" {
+  cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
+}

examples/database/atp-d/main.tf

@@ -11,7 +11,7 @@ provider "oci" {
 
 resource "oci_database_autonomous_container_database" "test_autonomous_container_database" {
   #Required
-  autonomous_exadata_infrastructure_id = oci_database_autonomous_exadata_infrastructure.test_autonomous_exadata_infrastructure.id
+  cloud_autonomous_vm_cluster_id       = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
   display_name                         = "example-container-database"
   patch_model                          = "RELEASE_UPDATES"
 
@@ -85,7 +85,7 @@ data "oci_database_autonomous_container_databases" "test_autonomous_container_da
   compartment_id = var.compartment_ocid
 
   #Optional
-  autonomous_exadata_infrastructure_id = oci_database_autonomous_exadata_infrastructure.test_autonomous_exadata_infrastructure.id
+  cloud_autonomous_vm_cluster_id       = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
   availability_domain                  = data.oci_identity_availability_domain.ad.name
   display_name                         = "example-container-database"
   state                                = "AVAILABLE"
@@ -101,15 +101,6 @@ data "oci_database_autonomous_databases" "autonomous_databases" {
   db_workload                      = "OLTP"
 }
 
-data "oci_database_autonomous_exadata_infrastructure_ocpu" "test_autonomous_exadata_infrastructure_ocpu" {
-  #Required
-  autonomous_exadata_infrastructure_id = oci_database_autonomous_exadata_infrastructure.test_autonomous_exadata_infrastructure.id
-}
-
-output "autonomous_database_consumed_cpu" {
-  value = data.oci_database_autonomous_exadata_infrastructure_ocpu.test_autonomous_exadata_infrastructure_ocpu.consumed_cpu
-}
-
 output "autonomous_database_admin_password" {
   value = random_string.autonomous_database_admin_password.result
 }

examples/database/atp-d/variables.tf

@@ -41,3 +41,14 @@ variable "autonomous_container_database_backup_config_recovery_window_in_days" {
   default = 10
 }
 
+variable "cloud_exadata_infrastructure_shape" {
+  default = "Exadata.X8M"
+}
+
+variable "cloud_exadata_infrastructure_compute_count" {
+  default = "2"
+}
+
+variable "cloud_exadata_infrastructure_storage_count" {
+  default = "3"
+}

internal/integrationtest/database_autonomous_container_database_dataguard_association_operation_resource_test.go

@@ -54,7 +54,6 @@ var (
 
 // issue-routing-tag: database/dbaas-atp-d
 func TestDatabaseAutonomousContainerDatabaseDataguardAssociationOperationResource_basic(t *testing.T) {
-	t.Skip("Skipping Test for TeamCity")
 	httpreplay.SetScenario("TestDatabaseAutonomousContainerDatabaseDataguardAssociationOperationResource_basic")
 	defer httpreplay.SaveScenario()