Skip to content

Commit 8429a40

Browse files
varmax2511varmax2511
committed
value update for ExaCS tests
1 parent e3b9079 commit 8429a40

File tree

4 files changed

+24
-26
lines changed

4 files changed

+24
-26
lines changed

‎examples/database/exadata_cc/exadata-infrastructure.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ provider "oci" {
1818

1919
resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
2020
#Required
21-
admin_network_cidr = "192.168.19.2/16"
21+
admin_network_cidr = "192.168.0.0/16"
2222
cloud_control_plane_server1 = "192.168.19.1"
2323
cloud_control_plane_server2 = "192.168.19.2"
2424
compartment_id = "${var.compartment_id}"
2525
corporate_proxy = "http://192.168.19.1:80"
2626
display_name = "tstExaInfra"
2727
dns_server = ["192.168.10.10"]
2828
gateway = "192.168.20.1"
29-
infini_band_network_cidr = "10.172.19.1/22"
29+
infini_band_network_cidr = "10.172.0.0/19"
3030
netmask = "255.255.0.0"
3131
ntp_server = ["192.168.10.20"]
3232
shape = "ExadataCC.Quarter3.100"

‎examples/database/exadata_cc/vm_cluster.tf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ data "oci_database_vm_cluster_recommended_network" "test_vm_cluster_recommended_
109109
network_type = "CLIENT"
110110
prefix = "myprefix1"
111111
vlan_id = "10"
112-
domain = "oracle.com"
113112
}
114113

115114
networks {
@@ -121,7 +120,6 @@ data "oci_database_vm_cluster_recommended_network" "test_vm_cluster_recommended_
121120
network_type = "BACKUP"
122121
prefix = "myprefix2"
123122
vlan_id = "11"
124-
domain = "oracle.com"
125123
}
126124

127125
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedvalue")}"

‎oci/database_exadata_infrastructure_resource_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ var (
2121
generateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", Optional, Update, exadataInfrastructureActivateRepresentation)
2222

2323
exadataInfrastructureActivateRepresentation = map[string]interface{}{
24-
"admin_network_cidr": Representation{repType: Required, create: `192.168.19.2/16`, update: `192.168.19.2/20`},
24+
"admin_network_cidr": Representation{repType: Required, create: `192.168.0.0/16`, update: `192.168.0.0/20`},
2525
"cloud_control_plane_server1": Representation{repType: Required, create: `192.168.19.1`, update: `192.168.19.3`},
2626
"cloud_control_plane_server2": Representation{repType: Required, create: `192.168.19.2`, update: `192.168.19.4`},
2727
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
2828
"corporate_proxy": Representation{repType: Required, create: `http://192.168.19.1:80`, update: `http://192.168.19.2:80`},
2929
"display_name": Representation{repType: Required, create: `tstExaInfra`},
3030
"dns_server": Representation{repType: Required, create: []string{`192.168.10.10`}, update: []string{`192.168.10.11`, `192.168.10.12`}},
3131
"gateway": Representation{repType: Required, create: `192.168.20.1`, update: `192.168.20.2`},
32-
"infini_band_network_cidr": Representation{repType: Required, create: `10.172.19.1/24`, update: `10.172.19.1/20`},
32+
"infini_band_network_cidr": Representation{repType: Required, create: `10.172.0.0/19`, update: `10.172.0.0/20`},
3333
"netmask": Representation{repType: Required, create: `255.255.0.0`, update: `255.254.0.0`},
3434
"ntp_server": Representation{repType: Required, create: []string{`192.168.10.20`}, update: []string{`192.168.10.22`, `192.168.10.24`}},
3535
"shape": Representation{repType: Required, create: `ExadataCC.Quarter3.100`},
@@ -72,7 +72,7 @@ func TestResourceDatabaseExadataInfrastructure_basic(t *testing.T) {
7272
generateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", Optional, Update,
7373
representationCopyWithNewProperties(exadataInfrastructureActivateRepresentation, map[string]interface{}{"activation_file": Representation{repType: Optional, update: activationFilePath}})),
7474
Check: resource.ComposeAggregateTestCheckFunc(
75-
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.19.2/20"),
75+
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.0.0/20"),
7676
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server1", "192.168.19.3"),
7777
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server2", "192.168.19.4"),
7878
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -83,7 +83,7 @@ func TestResourceDatabaseExadataInfrastructure_basic(t *testing.T) {
8383
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
8484
resource.TestCheckResourceAttr(resourceName, "gateway", "192.168.20.2"),
8585
resource.TestCheckResourceAttrSet(resourceName, "id"),
86-
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.19.1/20"),
86+
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.0.0/20"),
8787
resource.TestCheckResourceAttr(resourceName, "netmask", "255.254.0.0"),
8888
resource.TestCheckResourceAttr(resourceName, "ntp_server.#", "2"),
8989
resource.TestCheckResourceAttr(resourceName, "shape", "ExadataCC.Quarter3.100"),
@@ -101,7 +101,7 @@ func TestResourceDatabaseExadataInfrastructure_basic(t *testing.T) {
101101
generateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", Optional, Update,
102102
representationCopyWithRemovedProperties(exadataInfrastructureActivateRepresentation, []string{`activation_file`})),
103103
Check: resource.ComposeAggregateTestCheckFunc(
104-
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.19.2/20"),
104+
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.0.0/20"),
105105
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server1", "192.168.19.3"),
106106
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server2", "192.168.19.4"),
107107
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -112,7 +112,7 @@ func TestResourceDatabaseExadataInfrastructure_basic(t *testing.T) {
112112
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
113113
resource.TestCheckResourceAttr(resourceName, "gateway", "192.168.20.2"),
114114
resource.TestCheckResourceAttrSet(resourceName, "id"),
115-
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.19.1/20"),
115+
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.0.0/20"),
116116
resource.TestCheckResourceAttr(resourceName, "netmask", "255.254.0.0"),
117117
resource.TestCheckResourceAttr(resourceName, "ntp_server.#", "2"),
118118
resource.TestCheckResourceAttr(resourceName, "shape", "ExadataCC.Quarter3.100"),
@@ -131,7 +131,7 @@ func TestResourceDatabaseExadataInfrastructure_basic(t *testing.T) {
131131
generateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", Optional, Update,
132132
representationCopyWithNewProperties(exadataInfrastructureActivateRepresentation, map[string]interface{}{"activation_file": Representation{repType: Optional, update: activationFilePath}})),
133133
Check: resource.ComposeAggregateTestCheckFunc(
134-
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.19.2/20"),
134+
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.0.0/20"),
135135
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server1", "192.168.19.3"),
136136
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server2", "192.168.19.4"),
137137
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -142,7 +142,7 @@ func TestResourceDatabaseExadataInfrastructure_basic(t *testing.T) {
142142
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
143143
resource.TestCheckResourceAttr(resourceName, "gateway", "192.168.20.2"),
144144
resource.TestCheckResourceAttrSet(resourceName, "id"),
145-
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.19.1/20"),
145+
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.0.0/20"),
146146
resource.TestCheckResourceAttr(resourceName, "netmask", "255.254.0.0"),
147147
resource.TestCheckResourceAttr(resourceName, "ntp_server.#", "2"),
148148
resource.TestCheckResourceAttr(resourceName, "shape", "ExadataCC.Quarter3.100"),

‎oci/database_exadata_infrastructure_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ var (
4040
}
4141

4242
exadataInfrastructureRepresentation = map[string]interface{}{
43-
"admin_network_cidr": Representation{repType: Required, create: `192.168.19.2/16`, update: `192.168.19.2/20`},
43+
"admin_network_cidr": Representation{repType: Required, create: `192.168.0.0/16`, update: `192.168.0.0/20`},
4444
"cloud_control_plane_server1": Representation{repType: Required, create: `192.168.19.1`, update: `192.168.19.3`},
4545
"cloud_control_plane_server2": Representation{repType: Required, create: `192.168.19.2`, update: `192.168.19.4`},
4646
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
4747
"corporate_proxy": Representation{repType: Required, create: `http://192.168.19.1:80`, update: `http://192.168.19.2:80`},
4848
"display_name": Representation{repType: Required, create: `tstExaInfra`},
4949
"dns_server": Representation{repType: Required, create: []string{`192.168.10.10`}, update: []string{`192.168.10.11`, `192.168.10.12`}},
5050
"gateway": Representation{repType: Required, create: `192.168.20.1`, update: `192.168.20.2`},
51-
"infini_band_network_cidr": Representation{repType: Required, create: `10.172.19.1/24`, update: `10.172.19.1/20`},
51+
"infini_band_network_cidr": Representation{repType: Required, create: `10.172.0.0/19`, update: `10.172.0.0/20`},
5252
"netmask": Representation{repType: Required, create: `255.255.0.0`, update: `255.254.0.0`},
5353
"ntp_server": Representation{repType: Required, create: []string{`192.168.10.20`}, update: []string{`192.168.10.22`, `192.168.10.24`}},
5454
"shape": Representation{repType: Required, create: `ExadataCC.Quarter3.100`},
@@ -91,15 +91,15 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
9191
Config: config + compartmentIdVariableStr + ExadataInfrastructureResourceDependencies +
9292
generateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", Required, Create, exadataInfrastructureRepresentation),
9393
Check: resource.ComposeAggregateTestCheckFunc(
94-
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.19.2/16"),
94+
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.0.0/16"),
9595
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server1", "192.168.19.1"),
9696
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server2", "192.168.19.2"),
9797
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
9898
resource.TestCheckResourceAttr(resourceName, "corporate_proxy", "http://192.168.19.1:80"),
9999
resource.TestCheckResourceAttr(resourceName, "display_name", "tstExaInfra"),
100100
resource.TestCheckResourceAttr(resourceName, "dns_server.#", "1"),
101101
resource.TestCheckResourceAttr(resourceName, "gateway", "192.168.20.1"),
102-
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.19.1/24"),
102+
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.0.0/19"),
103103
resource.TestCheckResourceAttr(resourceName, "netmask", "255.255.0.0"),
104104
resource.TestCheckResourceAttr(resourceName, "ntp_server.#", "1"),
105105
resource.TestCheckResourceAttr(resourceName, "shape", "ExadataCC.Quarter3.100"),
@@ -121,7 +121,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
121121
Config: config + compartmentIdVariableStr + ExadataInfrastructureResourceDependencies +
122122
generateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", Optional, Create, exadataInfrastructureRepresentation),
123123
Check: resource.ComposeAggregateTestCheckFunc(
124-
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.19.2/16"),
124+
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.0.0/16"),
125125
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server1", "192.168.19.1"),
126126
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server2", "192.168.19.2"),
127127
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -132,7 +132,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
132132
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
133133
resource.TestCheckResourceAttr(resourceName, "gateway", "192.168.20.1"),
134134
resource.TestCheckResourceAttrSet(resourceName, "id"),
135-
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.19.1/24"),
135+
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.0.0/19"),
136136
resource.TestCheckResourceAttr(resourceName, "netmask", "255.255.0.0"),
137137
resource.TestCheckResourceAttr(resourceName, "ntp_server.#", "1"),
138138
resource.TestCheckResourceAttr(resourceName, "shape", "ExadataCC.Quarter3.100"),
@@ -159,7 +159,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
159159
"compartment_id": Representation{repType: Required, create: `${var.compartment_id_for_update}`},
160160
})),
161161
Check: resource.ComposeAggregateTestCheckFunc(
162-
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.19.2/16"),
162+
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.0.0/16"),
163163
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server1", "192.168.19.1"),
164164
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server2", "192.168.19.2"),
165165
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
@@ -170,7 +170,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
170170
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
171171
resource.TestCheckResourceAttr(resourceName, "gateway", "192.168.20.1"),
172172
resource.TestCheckResourceAttrSet(resourceName, "id"),
173-
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.19.1/24"),
173+
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.0.0/19"),
174174
resource.TestCheckResourceAttr(resourceName, "netmask", "255.255.0.0"),
175175
resource.TestCheckResourceAttr(resourceName, "ntp_server.#", "1"),
176176
resource.TestCheckResourceAttr(resourceName, "shape", "ExadataCC.Quarter3.100"),
@@ -192,7 +192,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
192192
Config: config + compartmentIdVariableStr + ExadataInfrastructureResourceDependencies +
193193
generateResourceFromRepresentationMap("oci_database_exadata_infrastructure", "test_exadata_infrastructure", Optional, Update, exadataInfrastructureRepresentation),
194194
Check: resource.ComposeAggregateTestCheckFunc(
195-
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.19.2/20"),
195+
resource.TestCheckResourceAttr(resourceName, "admin_network_cidr", "192.168.0.0/20"),
196196
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server1", "192.168.19.3"),
197197
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server2", "192.168.19.4"),
198198
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
@@ -203,7 +203,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
203203
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
204204
resource.TestCheckResourceAttr(resourceName, "gateway", "192.168.20.2"),
205205
resource.TestCheckResourceAttrSet(resourceName, "id"),
206-
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.19.1/20"),
206+
resource.TestCheckResourceAttr(resourceName, "infini_band_network_cidr", "10.172.0.0/20"),
207207
resource.TestCheckResourceAttr(resourceName, "netmask", "255.254.0.0"),
208208
resource.TestCheckResourceAttr(resourceName, "ntp_server.#", "2"),
209209
resource.TestCheckResourceAttr(resourceName, "shape", "ExadataCC.Quarter3.100"),
@@ -231,7 +231,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
231231
resource.TestCheckResourceAttr(datasourceName, "state", "REQUIRES_ACTIVATION"),
232232

233233
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.#", "1"),
234-
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.admin_network_cidr", "192.168.19.2/20"),
234+
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.admin_network_cidr", "192.168.0.0/20"),
235235
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.cloud_control_plane_server1", "192.168.19.3"),
236236
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.cloud_control_plane_server2", "192.168.19.4"),
237237
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.compartment_id", compartmentId),
@@ -244,7 +244,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
244244
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.freeform_tags.%", "1"),
245245
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.gateway", "192.168.20.2"),
246246
resource.TestCheckResourceAttrSet(datasourceName, "exadata_infrastructures.0.id"),
247-
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.infini_band_network_cidr", "10.172.19.1/20"),
247+
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.infini_band_network_cidr", "10.172.0.0/20"),
248248
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.netmask", "255.254.0.0"),
249249
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.ntp_server.#", "2"),
250250
resource.TestCheckResourceAttr(datasourceName, "exadata_infrastructures.0.shape", "ExadataCC.Quarter3.100"),
@@ -261,7 +261,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
261261
Check: resource.ComposeAggregateTestCheckFunc(
262262
resource.TestCheckResourceAttrSet(singularDatasourceName, "exadata_infrastructure_id"),
263263

264-
resource.TestCheckResourceAttr(singularDatasourceName, "admin_network_cidr", "192.168.19.2/20"),
264+
resource.TestCheckResourceAttr(singularDatasourceName, "admin_network_cidr", "192.168.0.0/20"),
265265
resource.TestCheckResourceAttr(singularDatasourceName, "cloud_control_plane_server1", "192.168.19.3"),
266266
resource.TestCheckResourceAttr(singularDatasourceName, "cloud_control_plane_server2", "192.168.19.4"),
267267
resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
@@ -274,7 +274,7 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
274274
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
275275
resource.TestCheckResourceAttr(singularDatasourceName, "gateway", "192.168.20.2"),
276276
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
277-
resource.TestCheckResourceAttr(singularDatasourceName, "infini_band_network_cidr", "10.172.19.1/20"),
277+
resource.TestCheckResourceAttr(singularDatasourceName, "infini_band_network_cidr", "10.172.0.0/20"),
278278
resource.TestCheckResourceAttr(singularDatasourceName, "netmask", "255.254.0.0"),
279279
resource.TestCheckResourceAttr(singularDatasourceName, "ntp_server.#", "2"),
280280
resource.TestCheckResourceAttr(singularDatasourceName, "shape", "ExadataCC.Quarter3.100"),

0 commit comments

Comments
 (0)