Skip to content

Commit f05a2eb

Browse files
parrneetparrneet
committed
Fix DBaaS test network dependencies
1 parent ba72019 commit f05a2eb

File tree

2 files changed

+59
-37
lines changed

2 files changed

+59
-37
lines changed

‎oci/database_db_system_resource_basic_test.go‎

Lines changed: 57 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,42 +16,50 @@ import (
1616
)
1717

1818
var (
19-
DbSystemResourceConfig = SubnetRequiredOnlyResource + `
20-
resource "oci_database_db_system" "test_db_system" {
21-
availability_domain = "${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}"
22-
compartment_id = "${var.compartment_id}"
23-
subnet_id = "${oci_core_subnet.test_subnet.id}"
24-
database_edition = "ENTERPRISE_EDITION"
25-
disk_redundancy = "NORMAL"
26-
shape = "BM.DenseIO2.52"
27-
cpu_core_count = "2"
28-
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
29-
domain = "${oci_core_subnet.test_subnet.subnet_domain_name}"
30-
hostname = "myOracleDB"
31-
data_storage_size_in_gb = "256"
32-
license_model = "LICENSE_INCLUDED"
33-
node_count = "1"
34-
display_name = "tfDbSystemTest"
35-
db_home {
36-
db_version = "12.1.0.2"
37-
display_name = "dbHome1"
38-
database {
39-
admin_password = "BEstrO0ng_#11"
40-
db_name = "tfDbName"
19+
DbSystemResourceDependencies = generateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Optional, Create, representationCopyWithNewProperties(subnetRepresentation, map[string]interface{}{
20+
"route_table_id": Representation{repType: Optional, create: `${oci_core_route_table.test_route_table.id}`}})) +
21+
generateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", Optional, Create, vcnRepresentation) +
22+
generateResourceFromRepresentationMap("oci_core_route_table", "test_route_table", Optional, Create, routeTableRepresentation) +
23+
generateResourceFromRepresentationMap("oci_core_internet_gateway", "test_internet_gateway", Optional, Create, internetGatewayRepresentation)
24+
25+
DbSystemResourceConfig = DbSystemResourceDependencies + AvailabilityDomainConfig + DefinedTagsDependencies + `
26+
27+
resource "oci_database_db_system" "test_db_system" {
28+
availability_domain = "${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}"
29+
compartment_id = "${var.compartment_id}"
30+
subnet_id = "${oci_core_subnet.test_subnet.id}"
31+
database_edition = "ENTERPRISE_EDITION"
32+
disk_redundancy = "NORMAL"
33+
shape = "BM.DenseIO2.52"
34+
cpu_core_count = "2"
35+
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
36+
domain = "${oci_core_subnet.test_subnet.subnet_domain_name}"
37+
hostname = "myOracleDB"
38+
data_storage_size_in_gb = "256"
39+
license_model = "LICENSE_INCLUDED"
40+
node_count = "1"
41+
display_name = "tfDbSystemTest"
42+
db_home {
43+
db_version = "12.1.0.2"
44+
display_name = "dbHome1"
45+
database {
46+
admin_password = "BEstrO0ng_#11"
47+
db_name = "tfDbName"
48+
}
4149
}
4250
}
43-
}
51+
52+
data "oci_database_db_homes" "t" {
53+
compartment_id = "${var.compartment_id}"
54+
db_system_id = "${oci_database_db_system.test_db_system.id}"
55+
filter {
56+
name = "display_name"
57+
values = ["dbHome1"]
58+
}
59+
}`
60+
61+
ResourceDatabaseBaseConfig = legacyTestProviderConfig() + DefinedTagsDependencies + `
4462
45-
data "oci_database_db_homes" "t" {
46-
compartment_id = "${var.compartment_id}"
47-
db_system_id = "${oci_database_db_system.test_db_system.id}"
48-
filter {
49-
name = "display_name"
50-
values = ["dbHome1"]
51-
}
52-
}
53-
`
54-
ResourceDatabaseBaseConfig = legacyTestProviderConfig() + `
5563
data "oci_identity_availability_domains" "ADs" {
5664
compartment_id = "${var.compartment_id}"
5765
}
@@ -63,13 +71,27 @@ data "oci_database_db_homes" "t" {
6371
dns_label = "tfvcn"
6472
}
6573
74+
resource "oci_core_route_table" "t" {
75+
compartment_id = "${var.compartment_id}"
76+
vcn_id = "${oci_core_virtual_network.t.id}"
77+
route_rules {
78+
cidr_block = "0.0.0.0/0"
79+
network_entity_id = "${oci_core_internet_gateway.t.id}"
80+
}
81+
}
82+
resource "oci_core_internet_gateway" "t" {
83+
compartment_id = "${var.compartment_id}"
84+
vcn_id = "${oci_core_virtual_network.t.id}"
85+
display_name = "-tf-internet-gateway"
86+
}
87+
6688
resource "oci_core_subnet" "t" {
6789
availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
6890
cidr_block = "10.1.20.0/24"
6991
display_name = "TFSubnet1"
7092
compartment_id = "${var.compartment_id}"
7193
vcn_id = "${oci_core_virtual_network.t.id}"
72-
route_table_id = "${oci_core_virtual_network.t.default_route_table_id}"
94+
route_table_id = "${oci_core_route_table.t.id}"
7395
dhcp_options_id = "${oci_core_virtual_network.t.default_dhcp_options_id}"
7496
security_list_ids = ["${oci_core_virtual_network.t.default_security_list_id}"]
7597
dns_label = "tfsubnet"
@@ -80,7 +102,7 @@ data "oci_database_db_homes" "t" {
80102
display_name = "TFSubnet2"
81103
compartment_id = "${var.compartment_id}"
82104
vcn_id = "${oci_core_virtual_network.t.id}"
83-
route_table_id = "${oci_core_virtual_network.t.default_route_table_id}"
105+
route_table_id = "${oci_core_route_table.t.id}"
84106
dhcp_options_id = "${oci_core_virtual_network.t.default_dhcp_options_id}"
85107
security_list_ids = ["${oci_core_virtual_network.t.default_security_list_id}"]
86108
dns_label = "tfsubnet2"

‎oci/database_db_system_resource_frombackup_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestResourceDatabaseDBSystemFromBackup(t *testing.T) {
7979
Steps: []resource.TestStep{
8080
// create
8181
{
82-
Config: ResourceDatabaseBaseConfig + SubnetRequiredOnlyResource + DataBaseSystemWithBackup + `
82+
Config: ResourceDatabaseBaseConfig + DbSystemResourceDependencies + DataBaseSystemWithBackup + AvailabilityDomainConfig + `
8383
data "oci_database_databases" "t" {
8484
compartment_id = "${var.compartment_id}"
8585
db_home_id = "${data.oci_database_db_homes.t.db_homes.0.id}"
@@ -95,7 +95,7 @@ func TestResourceDatabaseDBSystemFromBackup(t *testing.T) {
9595
{
9696
PreConfig: waitTillCondition(testAccProvider, &resId, dbBackupAvailableWaitCondition, DBWaitConditionDuration,
9797
listBackupsFetchOperation, "core", false),
98-
Config: ResourceDatabaseBaseConfig + SubnetRequiredOnlyResource + DataBaseSystemWithBackup + `
98+
Config: ResourceDatabaseBaseConfig + DbSystemResourceDependencies + DataBaseSystemWithBackup + AvailabilityDomainConfig + `
9999
data "oci_database_databases" "t" {
100100
compartment_id = "${var.compartment_id}"
101101
db_home_id = "${data.oci_database_db_homes.t.db_homes.0.id}"

0 commit comments

Comments
 (0)