Bug fix - multiple terminating lifescyle states issue for integration test

Author: sagarp337

internal/integrationtest/core_public_ip_test.go

@@ -532,7 +532,7 @@ func getCorePublicIpIds(compartment string) ([]string, error) {
 func CorePublicIpSweepWaitCondition(response common.OCIOperationResponse) bool {
 	// Only stop if the resource is available beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
 	if publicIpResponse, ok := response.Response.(oci_core.GetPublicIpResponse); ok {
-		return publicIpResponse.LifecycleState != oci_core.PublicIpLifecycleStateTerminated
+		return publicIpResponse.LifecycleState != oci_core.PublicIpLifecycleStateUnassigned && publicIpResponse.LifecycleState != oci_core.PublicIpLifecycleStateTerminated
 	}
 	return false
 }

internal/integrationtest/database_database_software_image_test.go

@@ -367,7 +367,7 @@ func getDatabaseDatabaseSoftwareImageIds(compartment string) ([]string, error) {
 func DatabaseDatabaseSoftwareImageSweepWaitCondition(response common.OCIOperationResponse) bool {
 	// Only stop if the resource is available beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
 	if databaseSoftwareImageResponse, ok := response.Response.(oci_database.GetDatabaseSoftwareImageResponse); ok {
-		return (databaseSoftwareImageResponse.LifecycleState != oci_database.DatabaseSoftwareImageLifecycleStateDeleted) && (databaseSoftwareImageResponse.LifecycleState != oci_database.DatabaseSoftwareImageLifecycleStateTerminated)
+		return databaseSoftwareImageResponse.LifecycleState != oci_database.DatabaseSoftwareImageLifecycleStateDeleted && databaseSoftwareImageResponse.LifecycleState != oci_database.DatabaseSoftwareImageLifecycleStateTerminated
 	}
 	return false
 }

internal/integrationtest/management_agent_management_agent_install_key_test.go

@@ -309,7 +309,7 @@ func getManagementAgentInstallKeyIds(compartment string) ([]string, error) {
 func managementAgentInstallKeySweepWaitCondition(response common.OCIOperationResponse) bool {
 	// Only stop if the resource is available beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
 	if managementAgentInstallKeyResponse, ok := response.Response.(oci_management_agent.GetManagementAgentInstallKeyResponse); ok {
-		return managementAgentInstallKeyResponse.LifecycleState != oci_management_agent.LifecycleStatesTerminated
+		return managementAgentInstallKeyResponse.LifecycleState != oci_management_agent.LifecycleStatesTerminated && managementAgentInstallKeyResponse.LifecycleState != oci_management_agent.LifecycleStatesDeleted
 	}
 	return false
 }

internal/integrationtest/management_agent_management_agent_test.go

@@ -418,7 +418,7 @@ func getManagementAgentIds(compartment string) ([]string, error) {
 func managementAgentSweepWaitCondition(response common.OCIOperationResponse) bool {
 	// Only stop if the resource is available beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
 	if managementAgentResponse, ok := response.Response.(oci_management_agent.GetManagementAgentResponse); ok {
-		return managementAgentResponse.LifecycleState != oci_management_agent.LifecycleStatesTerminated
+		return managementAgentResponse.LifecycleState != oci_management_agent.LifecycleStatesTerminated && managementAgentResponse.LifecycleState != oci_management_agent.LifecycleStatesDeleted
 	}
 	return false
 }

internal/integrationtest/operator_access_control_operator_control_test.go

@@ -385,7 +385,7 @@ func getOperatorAccessControlOperatorControlIds(compartment string) ([]string, e
 func OperatorAccessControlOperatorControlSweepWaitCondition(response common.OCIOperationResponse) bool {
 	// Only stop if the resource is available beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
 	if operatorControlResponse, ok := response.Response.(oci_operator_access_control.GetOperatorControlResponse); ok {
-		return operatorControlResponse.LifecycleState != oci_operator_access_control.OperatorControlLifecycleStatesDeleted
+		return operatorControlResponse.LifecycleState != oci_operator_access_control.OperatorControlLifecycleStatesUnassigned && operatorControlResponse.LifecycleState != oci_operator_access_control.OperatorControlLifecycleStatesDeleted
 	}
 	return false
 }