Added - Support for DBM Service: External Exadata Infrastructure Monitoring

Author: Shuo Yang

examples/databasemanagement/main.tf

@@ -296,6 +296,18 @@ resource "oci_core_network_security_group" "test_network_security_group" {
   vcn_id         = oci_core_vcn.test_vcn.id
 }
 
+data "oci_database_management_managed_databases" "test_managed_databases" {
+	#Required
+	compartment_id = var.compartment_id
+
+	#Optional
+	deployment_type = var.managed_database_deployment_type
+	external_exadata_infrastructure_id = oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id
+	id = var.managed_database_id
+	management_option = var.managed_database_management_option
+	name = var.managed_database_name
+}
+
 resource "oci_database_management_db_management_private_endpoint" "test_db_management_private_endpoint" {
   #Required
   compartment_id = var.compartment_id
@@ -791,4 +803,170 @@ data "oci_database_management_external_db_system_connectors" "test_external_db_s
 #  #Required
 #  external_db_system_id      = oci_database_management_external_db_system.test_external_db_system.id
 #  enable_database_management = false
-#}
+#}
+
+####################### Exadata Infrastructure Monitoring #########################
+
+variable "external_exadata_infrastructure_database_managements_management_license_model" {
+  default = "LICENSE_INCLUDED"
+}
+
+variable "enable_exadata" {
+  default = false
+}
+
+variable "external_exadata_infrastructure_db_system_ids" {
+  default = []
+}
+
+variable "external_exadata_infrastructure_display_name" {
+  default = "exadata-Terraform-Testing"
+}
+
+variable "external_exadata_infrastructure_license_model" {
+  default = "LICENSE_INCLUDED"
+}
+
+variable "external_exadata_infrastructure_storage_server_names" {
+  default = []
+}
+
+variable "external_exadata_storage_connector_connection_uri" {
+  default = "https://exaInfra01celadm01.us.oracle.com/MS/RESTService/"
+}
+
+variable "external_exadata_storage_connector_connector_name" {
+  default = "connectorName"
+}
+
+variable "external_exadata_storage_connector_credential_info_password" {
+  default = "BEstrO0ng_#11"
+}
+
+variable "external_exadata_storage_connector_credential_info_ssl_trust_store_location" {
+  default = "sslTrustStoreLocation"
+}
+
+variable "external_exadata_storage_connector_credential_info_ssl_trust_store_password" {
+  default = "sslTrustStorePassword"
+}
+
+variable "external_exadata_storage_connector_credential_info_ssl_trust_store_type" {
+  default = "JKS"
+}
+
+variable "external_exadata_storage_connector_credential_info_username" {
+  default = "username"
+}
+
+variable "external_exadata_storage_connector_display_name" {
+  default = "exaInfra01celadm01-conn"
+}
+
+variable "external_exadata_storage_grid_id" {
+  default = "id"
+}
+
+variable "external_exadata_storage_server_id" {
+  default = "id"
+}
+
+resource "oci_database_management_external_exadata_infrastructure" "test_external_exadata_infrastructure" {
+  #Required
+  compartment_id = var.compartment_id
+  db_system_ids  = var.external_exadata_infrastructure_db_system_ids
+  display_name   = var.external_exadata_infrastructure_display_name
+
+  #Optional
+  discovery_key        = var.external_exadata_infrastructure_discovery_key
+  license_model        = var.external_exadata_infrastructure_license_model
+  storage_server_names = var.external_exadata_infrastructure_storage_server_names
+}
+
+data "oci_database_management_external_exadata_infrastructures" "test_external_exadata_infrastructures" {
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  display_name = var.external_exadata_infrastructure_display_name
+}
+
+data "oci_database_management_external_exadata_infrastructure" "test_external_exadata_infrastructure" {
+	#Required
+	external_exadata_infrastructure_id = oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id
+}
+
+resource "oci_database_management_external_exadata_storage_connector" "test_external_exadata_storage_connector" {
+	#Required
+	agent_id = oci_cloud_bridge_agent.test_agent.id
+	connection_uri = var.external_exadata_storage_connector_connection_uri
+	connector_name = var.external_exadata_storage_connector_connector_name
+	credential_info {
+		#Required
+		password = var.external_exadata_storage_connector_credential_info_password
+		username = var.external_exadata_storage_connector_credential_info_username
+
+		#Optional
+		ssl_trust_store_location = var.external_exadata_storage_connector_credential_info_ssl_trust_store_location
+		ssl_trust_store_password = var.external_exadata_storage_connector_credential_info_ssl_trust_store_password
+		ssl_trust_store_type = var.external_exadata_storage_connector_credential_info_ssl_trust_store_type
+	}
+	storage_server_id = oci_database_management_storage_server.test_storage_server.id
+}
+
+data "oci_database_management_external_exadata_storage_connectors" "test_external_exadata_storage_connectors" {
+	#Required
+	compartment_id = var.compartment_id
+	external_exadata_infrastructure_id = oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id
+
+	#Optional
+	display_name = var.external_exadata_storage_connector_display_name
+}
+
+data "oci_database_management_external_exadata_storage_connector" "test_external_exadata_storage_connector" {
+	#Required
+	external_exadata_storage_connector_id = oci_database_management_external_exadata_storage_connector.test_external_exadata_storage_connector.id
+}
+
+data "oci_database_management_external_exadata_storage_grid" "test_external_exadata_storage_grid" {
+	#Required
+	external_exadata_storage_grid_id = var.external_exadata_storage_grid_id
+}
+
+data "oci_database_management_external_exadata_storage_server_iorm_plan" "test_external_exadata_storage_server_iorm_plan" {
+	#Required
+	external_exadata_storage_server_id = var.external_exadata_storage_server_id
+}
+
+data "oci_database_management_external_exadata_storage_server_open_alert_history" "test_external_exadata_storage_server_open_alert_history" {
+	#Required
+	external_exadata_storage_server_id = var.external_exadata_storage_server_id
+}
+
+data "oci_database_management_external_exadata_storage_server_top_sql_cpu_activity" "test_external_exadata_storage_server_top_sql_cpu_activity" {
+	#Required
+	external_exadata_storage_server_id = var.external_exadata_storage_server_id
+}
+
+data "oci_database_management_external_exadata_storage_server" "test_external_exadata_storage_server" {
+	#Required
+	external_exadata_storage_server_id = var.external_exadata_storage_server_id
+}
+
+data "oci_database_management_external_exadata_storage_servers" "test_external_exadata_storage_servers" {
+	#Required
+	compartment_id = var.compartment_id
+	external_exadata_infrastructure_id = oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id
+
+	#Optional
+	display_name = var.external_exadata_storage_server_display_name
+}
+
+resource "oci_database_management_external_exadata_infrastructure_exadata_management" "test_external_exadata_infrastructure_exadata_management" {
+	#Required
+	external_exadata_infrastructure_id = oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id
+	enable_exadata = var.enable_exadata
+
+	#Optional
+	license_model = var.external_exadata_infrastructure_database_managements_management_license_model
+}

internal/integrationtest/database_management_external_db_node_test.go

@@ -37,8 +37,8 @@ var (
 	}
 
 	DatabaseManagementExternalDbNodeRepresentation = map[string]interface{}{
-		"external_db_node_id":   acctest.Representation{RepType: acctest.Required, Create: `${data.oci_database_management_external_db_nodes.test_external_db_nodes.external_db_node_collection.0.items.0.id}`},
-		"external_connector_id": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_database_management_external_db_nodes.test_external_db_nodes.external_db_node_collection.0.items.0.external_connector_id}`},
+		"external_db_node_id":   acctest.Representation{RepType: acctest.Required, Create: `${data.oci_database_management_external_db_nodes.test_external_db_nodes.external_db_node_collection.0.items.1.id}`},
+		"external_connector_id": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_database_management_external_db_nodes.test_external_db_nodes.external_db_node_collection.0.items.1.external_connector_id}`},
 	}
 
 	DatabaseManagementExternalDbNodeResourceDependencies = acctest.GenerateDataSourceFromRepresentationMap("oci_database_management_external_db_nodes", "test_external_db_nodes", acctest.Required, acctest.Create, DatabaseManagementDatabaseManagementExternalDbNodeDataSourceRepresentation)
@@ -103,6 +103,7 @@ func TestDatabaseManagementExternalDbNodeResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "compartment_id"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "component_name"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "display_name"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "domain_name"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "host_name"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),

internal/integrationtest/database_management_external_exadata_infrastructure_exadata_management_test.go

@@ -0,0 +1,66 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package integrationtest
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
+	"github.com/oracle/terraform-provider-oci/httpreplay"
+	"github.com/oracle/terraform-provider-oci/internal/acctest"
+
+	"github.com/oracle/terraform-provider-oci/internal/utils"
+)
+
+var (
+	DatabaseManagementExternalExadataInfrastructureExadataManagementRepresentation = map[string]interface{}{
+		"external_exadata_infrastructure_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id}`},
+		"license_model":                      acctest.Representation{RepType: acctest.Required, Create: `LICENSE_INCLUDED`},
+		"enable_exadata":                     acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `true`},
+	}
+
+	ExternalExadataInfrastructureExadataManagementResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_database_management_external_exadata_infrastructure", "test_external_exadata_infrastructure", acctest.Required, acctest.Create, DatabaseManagementExternalExadataInfrastructureRepresentation)
+)
+
+// issue-routing-tag: database_management/default
+func TestDatabaseManagementExternalExadataInfrastructureExadataManagementResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestDatabaseManagementExternalExadataInfrastructureExadataManagementResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	dbSystemId := utils.GetEnvSettingWithBlankDefault("db_system_id")
+	dbSystemIdStr := fmt.Sprintf("variable \"db_system_id\" { default = \"%s\" }\n", dbSystemId)
+
+	resourceName := "oci_database_management_external_exadata_infrastructure_exadata_management.test_external_exadata_infrastructure_exadata_management"
+	parentResourceName := "oci_database_management_external_exadata_infrastructure_exadata_management.test_external_exadata_infrastructure_exadata_management"
+	// Save TF content to Create resource with only required properties. This has to be exactly the same as the config part in the create step in the test.
+	acctest.SaveConfigContent(config+compartmentIdVariableStr+ExternalExadataInfrastructureExadataManagementResourceDependencies+
+		acctest.GenerateResourceFromRepresentationMap("oci_database_management_external_exadata_infrastructure_exadata_management", "test_external_exadata_infrastructure_exadata_management", acctest.Required, acctest.Create, DatabaseManagementExternalExadataInfrastructureExadataManagementRepresentation), "databasemanagement", "externalExadataInfrastructureExadataManagement", t)
+
+	acctest.ResourceTest(t, nil, []resource.TestStep{
+		// create with disable
+		{
+			Config: config + dbSystemIdStr + compartmentIdVariableStr + ExternalExadataInfrastructureExadataManagementResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_database_management_external_exadata_infrastructure_exadata_management", "test_external_exadata_infrastructure_exadata_management", acctest.Required, acctest.Create, DatabaseManagementExternalExadataInfrastructureExadataManagementRepresentation),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(resourceName, "external_exadata_infrastructure_id"),
+				resource.TestCheckResourceAttr(resourceName, "license_model", "LICENSE_INCLUDED"),
+			),
+		},
+		// verify enable
+		{
+			Config: config + dbSystemIdStr + compartmentIdVariableStr + ExternalExadataInfrastructureExadataManagementResourceDependencies +
+				acctest.GenerateResourceFromRepresentationMap("oci_database_management_external_exadata_infrastructure_exadata_management", "test_external_exadata_infrastructure_exadata_management", acctest.Required, acctest.Update, DatabaseManagementExternalExadataInfrastructureExadataManagementRepresentation),
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(parentResourceName, "enable_exadata", "true"),
+			),
+		},
+	})
+}