Skip to content

Commit 5af3418

Browse files
shubham yadavsankhsin
shubham yadav
authored and
sankhsin
committed
Bug Fix - database_cloud_vm_cluster_test.go
1 parent 53d0d29 commit 5af3418

File tree

1 file changed

+19
-23
lines changed

1 file changed

+19
-23
lines changed

‎internal/integrationtest/database_cloud_vm_cluster_test.go‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ var (
5353
}
5454

5555
DatabaseCloudVmClusterRepresentation = map[string]interface{}{
56-
"depends_on": []string{"time_sleep.wait_180_seconds"},
56+
"depends_on": []string{"time_sleep.wait_30_seconds"},
5757
"file_system_configuration_details": []acctest.RepresentationGroup{
5858
{RepType: acctest.Optional, Group: DatabaseCloudVmClusterFileSystemConfigurationDetailsRepresentation0},
5959
{RepType: acctest.Optional, Group: DatabaseCloudVmClusterFileSystemConfigurationDetailsRepresentation1},
@@ -368,9 +368,9 @@ var (
368368
acctest.GenerateDataSourceFromRepresentationMap("oci_core_vcn_dns_resolver_association", "test_vcn_dns_resolver_association", acctest.Optional, acctest.Create, CoreCoreVcnDnsResolverAssociationRepresentation) +
369369
acctest.GenerateDataSourceFromRepresentationMap("oci_database_db_servers", "test_db_servers", acctest.Optional, acctest.Create, DatabaseDbServerDataSourceRepresentation)
370370

371-
DatabaseDatabaseCloudVmClusterResourceDependencies = DatabaseCloudVmClusterResourceDependencies + acctest.GenerateResourceFromRepresentationMap("oci_dns_resolver", "test_resolver", acctest.Optional, acctest.Create, ResolverRepresentation) + Sleep180
371+
DatabaseDatabaseCloudVmClusterResourceDependencies = DatabaseCloudVmClusterResourceDependencies + acctest.GenerateResourceFromRepresentationMap("oci_dns_resolver", "test_resolver", acctest.Optional, acctest.Create, ResolverRepresentation) + Sleep30
372372

373-
Sleep180 = "resource \"time_sleep\" \"wait_180_seconds\" {\n depends_on = [oci_dns_resolver.test_resolver] \n create_duration = \"180s\"\n}" +
373+
Sleep30 = "resource \"time_sleep\" \"wait_30_seconds\" {\n depends_on = [oci_dns_resolver.test_resolver] \n create_duration = \"30s\"\n}" +
374374
`
375375
terraform {
376376
required_providers {
@@ -395,7 +395,7 @@ var (
395395

396396
CloudVmClusterResourceUpdateStorageDependencies = ad_subnet_security + acctest.GenerateResourceFromRepresentationMap("oci_database_cloud_exadata_infrastructure", "test_cloud_exadata_infrastructure", acctest.Required, acctest.Update,
397397
acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(DatabaseCloudExadataInfrastructureRepresentation, []string{"storage_count"}), map[string]interface{}{
398-
"storage_count": acctest.Representation{RepType: acctest.Required, Create: `3`, Update: `4`},
398+
"storage_count": acctest.Representation{RepType: acctest.Required, Create: `3`},
399399
}))
400400
)
401401

@@ -425,7 +425,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
425425

426426
// verify Create
427427
{
428-
Config: config + compartmentIdVariableStr + DatabaseCloudVmClusterResourceDependencies + DefinedTagsDependencies + AvailabilityDomainConfig +
428+
Config: config + compartmentIdVariableStr + DatabaseDatabaseCloudVmClusterResourceDependencies + DefinedTagsDependencies + AvailabilityDomainConfig +
429429
acctest.GenerateResourceFromRepresentationMap("oci_database_cloud_vm_cluster", "test_cloud_vm_cluster", acctest.Required, acctest.Create, DatabaseCloudVmClusterRepresentation),
430430
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
431431
resource.TestCheckResourceAttrSet(resourceName, "backup_subnet_id"),
@@ -448,7 +448,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
448448

449449
// delete before next Create
450450
{
451-
Config: config + compartmentIdVariableStr + DatabaseCloudVmClusterResourceDependencies + DefinedTagsDependencies + AvailabilityDomainConfig,
451+
Config: config + compartmentIdVariableStr + DatabaseDatabaseCloudVmClusterResourceDependencies + DefinedTagsDependencies + AvailabilityDomainConfig,
452452
},
453453
// verify Create with optionals
454454
{
@@ -458,10 +458,6 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
458458
"domain": acctest.Representation{RepType: acctest.Required, Create: `${oci_dns_zone.test_zone.name}`},
459459
})),
460460
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
461-
func(s *terraform.State) (err error) {
462-
time.Sleep(5 * time.Minute)
463-
return nil
464-
},
465461
resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
466462
resource.TestCheckResourceAttrSet(resourceName, "backup_subnet_id"),
467463
resource.TestCheckResourceAttr(resourceName, "cloud_automation_update_details.#", "1"),
@@ -490,7 +486,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
490486
resource.TestCheckResourceAttr(resourceName, "file_system_configuration_details.0.file_system_size_gb", "15"),
491487
resource.TestCheckResourceAttr(resourceName, "file_system_configuration_details.0.mount_point", "/"),
492488
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
493-
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "0"),
489+
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "2"),
494490
resource.TestCheckResourceAttr(resourceName, "gi_version", "19.9.0.0.0"),
495491
resource.TestCheckResourceAttrSet(resourceName, "hostname"),
496492
resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -524,7 +520,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
524520
),
525521
},
526522

527-
// verify update to the compartment (the compartment will be switched back in the next step)
523+
//verify update to the compartment (the compartment will be switched back in the next step)
528524
{
529525
Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + DatabaseDatabaseCloudVmClusterResourceDependencies + DefinedTagsDependencies + AvailabilityDomainConfig +
530526
acctest.GenerateResourceFromRepresentationMap("oci_database_cloud_vm_cluster", "test_cloud_vm_cluster", acctest.Optional, acctest.Create,
@@ -560,7 +556,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
560556
resource.TestCheckResourceAttr(resourceName, "file_system_configuration_details.0.file_system_size_gb", "15"),
561557
resource.TestCheckResourceAttr(resourceName, "file_system_configuration_details.0.mount_point", "/"),
562558
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
563-
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "0"),
559+
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "2"),
564560
resource.TestCheckResourceAttr(resourceName, "gi_version", "19.9.0.0.0"),
565561
resource.TestCheckResourceAttrSet(resourceName, "hostname"),
566562
resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -626,7 +622,7 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
626622
resource.TestCheckResourceAttr(resourceName, "file_system_configuration_details.0.file_system_size_gb", "20"),
627623
resource.TestCheckResourceAttr(resourceName, "file_system_configuration_details.0.mount_point", "/"),
628624
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
629-
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "0"),
625+
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "2"),
630626
resource.TestCheckResourceAttr(resourceName, "gi_version", "19.9.0.0.0"),
631627
resource.TestCheckResourceAttrSet(resourceName, "hostname"),
632628
resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -699,12 +695,12 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
699695
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.data_storage_percentage", "40"),
700696
resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.disk_redundancy"),
701697
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.display_name", "displayName2"),
702-
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.file_system_configuration_details.#", "7"),
698+
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.file_system_configuration_details.#", "9"),
703699
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.file_system_configuration_details.0.file_system_size_gb", "20"),
704700
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.file_system_configuration_details.0.mount_point", "/"),
705701
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.domain", "sicdbaas.exacs.zonetest"),
706702
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.freeform_tags.%", "1"),
707-
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.system_tags.%", "0"),
703+
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.system_tags.%", "2"),
708704
resource.TestCheckResourceAttr(datasourceName, "cloud_vm_clusters.0.gi_version", "19.9.0.0.0"),
709705
resource.TestCheckResourceAttrSet(resourceName, "hostname"),
710706
resource.TestCheckResourceAttrSet(datasourceName, "cloud_vm_clusters.0.id"),
@@ -767,12 +763,12 @@ func TestDatabaseCloudVmClusterResource_basic(t *testing.T) {
767763
resource.TestCheckResourceAttr(singularDatasourceName, "data_storage_percentage", "40"),
768764
resource.TestCheckResourceAttrSet(singularDatasourceName, "disk_redundancy"),
769765
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
770-
resource.TestCheckResourceAttr(singularDatasourceName, "file_system_configuration_details.#", "7"),
766+
resource.TestCheckResourceAttr(singularDatasourceName, "file_system_configuration_details.#", "9"),
771767
resource.TestCheckResourceAttr(singularDatasourceName, "file_system_configuration_details.0.file_system_size_gb", "20"),
772768
resource.TestCheckResourceAttr(singularDatasourceName, "file_system_configuration_details.0.mount_point", "/"),
773769
resource.TestCheckResourceAttr(singularDatasourceName, "domain", "sicdbaas.exacs.zonetest"),
774770
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
775-
resource.TestCheckResourceAttr(singularDatasourceName, "system_tags.%", "0"),
771+
resource.TestCheckResourceAttr(singularDatasourceName, "system_tags.%", "2"),
776772
resource.TestCheckResourceAttr(singularDatasourceName, "gi_version", "19.9.0.0.0"),
777773
resource.TestCheckResourceAttrSet(resourceName, "hostname"),
778774
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
@@ -879,7 +875,7 @@ func TestDatabaseCloudVmClusterUpdate(t *testing.T) {
879875
resource.TestCheckResourceAttr(resourceName, "display_name", "cloudVmCluster"),
880876
resource.TestCheckResourceAttrSet(resourceName, "domain"),
881877
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
882-
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "0"),
878+
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "2"),
883879
resource.TestCheckResourceAttr(resourceName, "gi_version", "19.9.0.0.0"),
884880
resource.TestCheckResourceAttrSet(resourceName, "hostname"),
885881
resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -904,7 +900,7 @@ func TestDatabaseCloudVmClusterUpdate(t *testing.T) {
904900
),
905901
},
906902

907-
// verify update to the compartment (the compartment will be switched back in the next step)
903+
//verify update to the compartment (the compartment will be switched back in the next step)
908904
{
909905
Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + DatabaseCloudVmClusterResourceDependencies + DefinedTagsDependencies + AvailabilityDomainConfig +
910906
acctest.GenerateResourceFromRepresentationMap("oci_database_cloud_vm_cluster", "test_cloud_vm_cluster", acctest.Optional, acctest.Create,
@@ -923,7 +919,7 @@ func TestDatabaseCloudVmClusterUpdate(t *testing.T) {
923919
resource.TestCheckResourceAttr(resourceName, "display_name", "cloudVmCluster"),
924920
resource.TestCheckResourceAttrSet(resourceName, "domain"),
925921
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
926-
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "0"),
922+
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "2"),
927923
resource.TestCheckResourceAttr(resourceName, "gi_version", "19.9.0.0.0"),
928924
resource.TestCheckResourceAttrSet(resourceName, "hostname"),
929925
resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -964,7 +960,7 @@ func TestDatabaseCloudVmClusterUpdate(t *testing.T) {
964960
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
965961
resource.TestCheckResourceAttrSet(resourceName, "domain"),
966962
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
967-
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "0"),
963+
resource.TestCheckResourceAttr(resourceName, "system_tags.%", "2"),
968964
resource.TestCheckResourceAttr(resourceName, "gi_version", "19.9.0.0.0"),
969965
resource.TestCheckResourceAttrSet(resourceName, "hostname"),
970966
resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -992,7 +988,7 @@ func TestDatabaseCloudVmClusterUpdate(t *testing.T) {
992988

993989
func testAccCheckDatabaseCloudVmClusterDestroy(s *terraform.State) error {
994990
noResourceFound := true
995-
client := acctest.TestAccProvider.Meta().(*client.OracleClients).DatabaseClient()
991+
client := acctest.GetTestClients(&schema.ResourceData{}).DatabaseClient()
996992
for _, rs := range s.RootModule().Resources {
997993
if rs.Type == "oci_database_cloud_vm_cluster" {
998994
noResourceFound = false

0 commit comments

Comments
 (0)