Skip to content

Commit 83b4533

Browse files
committed
Exempted removed extra changes pushed into 66ae119
1 parent 267bc88 commit 83b4533

File tree

48 files changed

+34
-5925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+34
-5925
lines changed

examples/databasemanagement/main.tf

Lines changed: 1 addition & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -791,170 +791,4 @@ data "oci_database_management_external_db_system_connectors" "test_external_db_s
791791
# #Required
792792
# external_db_system_id = oci_database_management_external_db_system.test_external_db_system.id
793793
# enable_database_management = false
794-
#}
795-
796-
####################### Exadata Infrastructure Monitoring #########################
797-
798-
variable "external_exadata_infrastructure_database_managements_management_license_model" {
799-
default = "LICENSE_INCLUDED"
800-
}
801-
802-
variable "enable_database_management" {
803-
default = false
804-
}
805-
806-
variable "external_exadata_infrastructure_db_system_ids" {
807-
default = []
808-
}
809-
810-
variable "external_exadata_infrastructure_display_name" {
811-
default = "exadata-Terraform-Testing"
812-
}
813-
814-
variable "external_exadata_infrastructure_license_model" {
815-
default = "LICENSE_INCLUDED"
816-
}
817-
818-
variable "external_exadata_infrastructure_storage_server_names" {
819-
default = []
820-
}
821-
822-
variable "external_exadata_storage_connector_connection_uri" {
823-
default = "https://exaInfra01celadm01.us.oracle.com/MS/RESTService/"
824-
}
825-
826-
variable "external_exadata_storage_connector_connector_name" {
827-
default = "connectorName"
828-
}
829-
830-
variable "external_exadata_storage_connector_credential_info_password" {
831-
default = "BEstrO0ng_#11"
832-
}
833-
834-
variable "external_exadata_storage_connector_credential_info_ssl_trust_store_location" {
835-
default = "sslTrustStoreLocation"
836-
}
837-
838-
variable "external_exadata_storage_connector_credential_info_ssl_trust_store_password" {
839-
default = "sslTrustStorePassword"
840-
}
841-
842-
variable "external_exadata_storage_connector_credential_info_ssl_trust_store_type" {
843-
default = "JKS"
844-
}
845-
846-
variable "external_exadata_storage_connector_credential_info_username" {
847-
default = "username"
848-
}
849-
850-
variable "external_exadata_storage_connector_display_name" {
851-
default = "exaInfra01celadm01-conn"
852-
}
853-
854-
variable "external_exadata_storage_grid_id" {
855-
default = "id"
856-
}
857-
858-
variable "external_exadata_storage_server_id" {
859-
default = "id"
860-
}
861-
862-
resource "oci_database_management_external_exadata_infrastructure" "test_external_exadata_infrastructure" {
863-
#Required
864-
compartment_id = var.compartment_id
865-
db_system_ids = var.external_exadata_infrastructure_db_system_ids
866-
display_name = var.external_exadata_infrastructure_display_name
867-
868-
#Optional
869-
discovery_key = var.external_exadata_infrastructure_discovery_key
870-
license_model = var.external_exadata_infrastructure_license_model
871-
storage_server_names = var.external_exadata_infrastructure_storage_server_names
872-
}
873-
874-
data "oci_database_management_external_exadata_infrastructures" "test_external_exadata_infrastructures" {
875-
#Required
876-
compartment_id = var.compartment_id
877-
878-
#Optional
879-
display_name = var.external_exadata_infrastructure_display_name
880-
}
881-
882-
data "oci_database_management_external_exadata_infrastructure" "test_external_exadata_infrastructure" {
883-
#Required
884-
external_exadata_infrastructure_id = oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id
885-
}
886-
887-
resource "oci_database_management_external_exadata_storage_connector" "test_external_exadata_storage_connector" {
888-
#Required
889-
agent_id = oci_cloud_bridge_agent.test_agent.id
890-
connection_uri = var.external_exadata_storage_connector_connection_uri
891-
connector_name = var.external_exadata_storage_connector_connector_name
892-
credential_info {
893-
#Required
894-
password = var.external_exadata_storage_connector_credential_info_password
895-
username = var.external_exadata_storage_connector_credential_info_username
896-
897-
#Optional
898-
ssl_trust_store_location = var.external_exadata_storage_connector_credential_info_ssl_trust_store_location
899-
ssl_trust_store_password = var.external_exadata_storage_connector_credential_info_ssl_trust_store_password
900-
ssl_trust_store_type = var.external_exadata_storage_connector_credential_info_ssl_trust_store_type
901-
}
902-
storage_server_id = oci_database_management_storage_server.test_storage_server.id
903-
}
904-
905-
data "oci_database_management_external_exadata_storage_connectors" "test_external_exadata_storage_connectors" {
906-
#Required
907-
compartment_id = var.compartment_id
908-
external_exadata_infrastructure_id = oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id
909-
910-
#Optional
911-
display_name = var.external_exadata_storage_connector_display_name
912-
}
913-
914-
data "oci_database_management_external_exadata_storage_connector" "test_external_exadata_storage_connector" {
915-
#Required
916-
external_exadata_storage_connector_id = oci_database_management_external_exadata_storage_connector.test_external_exadata_storage_connector.id
917-
}
918-
919-
data "oci_database_management_external_exadata_storage_grid" "test_external_exadata_storage_grid" {
920-
#Required
921-
external_exadata_storage_grid_id = var.external_exadata_storage_grid_id
922-
}
923-
924-
data "oci_database_management_external_exadata_storage_server_iorm_plan" "test_external_exadata_storage_server_iorm_plan" {
925-
#Required
926-
external_exadata_storage_server_id = var.external_exadata_storage_server_id
927-
}
928-
929-
data "oci_database_management_external_exadata_storage_server_open_alert_history" "test_external_exadata_storage_server_open_alert_history" {
930-
#Required
931-
external_exadata_storage_server_id = var.external_exadata_storage_server_id
932-
}
933-
934-
data "oci_database_management_external_exadata_storage_server_top_sql_cpu_activity" "test_external_exadata_storage_server_top_sql_cpu_activity" {
935-
#Required
936-
external_exadata_storage_server_id = var.external_exadata_storage_server_id
937-
}
938-
939-
data "oci_database_management_external_exadata_storage_server" "test_external_exadata_storage_server" {
940-
#Required
941-
external_exadata_storage_server_id = var.external_exadata_storage_server_id
942-
}
943-
944-
data "oci_database_management_external_exadata_storage_servers" "test_external_exadata_storage_servers" {
945-
#Required
946-
compartment_id = var.compartment_id
947-
external_exadata_infrastructure_id = oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id
948-
949-
#Optional
950-
display_name = var.external_exadata_storage_server_display_name
951-
}
952-
953-
resource "oci_database_management_external_exadata_infrastructure_database_managements_management" "test_external_exadata_infrastructure_database_managements_management" {
954-
#Required
955-
external_exadata_infrastructure_id = oci_database_management_external_exadata_infrastructure.test_external_exadata_infrastructure.id
956-
enable_database_management = var.enable_database_management
957-
958-
#Optional
959-
license_model = var.external_exadata_infrastructure_database_managements_management_license_model
960-
}
794+
#}

internal/integrationtest/database_management_external_db_node_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ var (
3737
}
3838

3939
DatabaseManagementExternalDbNodeRepresentation = map[string]interface{}{
40-
"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}`},
41-
"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}`},
40+
"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}`},
41+
"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}`},
4242
}
4343

4444
DatabaseManagementExternalDbNodeResourceDependencies = acctest.GenerateDataSourceFromRepresentationMap("oci_database_management_external_db_nodes", "test_external_db_nodes", acctest.Required, acctest.Create, DatabaseManagementDatabaseManagementExternalDbNodeDataSourceRepresentation)

internal/integrationtest/database_management_external_exadata_infrastructure_database_managements_management_test.go

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)