[Fix] Fixes state change conf for stopping servers

opentelekomcloud/acceptance/ecs/resource_opentelekomcloud_compute_instance_v2_test.go

@@ -776,7 +776,7 @@ resource "opentelekomcloud_compute_instance_v2" "instance_1" {
   security_groups = ["default"]
   network {
     uuid        = data.opentelekomcloud_vpc_subnet_v1.shared_subnet.network_id
-    fixed_ip_v4 = "10.0.0.24"
+    fixed_ip_v4 = cidrhost(data.opentelekomcloud_vpc_subnet_v1.shared_subnet.cidr, 24)
   }
   stop_before_destroy = true
 }

opentelekomcloud/services/ecs/resource_opentelekomcloud_compute_instance_v2.go

@@ -981,11 +981,25 @@ func resourceComputeInstanceV2Delete(ctx context.Context, d *schema.ResourceData
 	}
 	client.Microversion = microversion
 	if d.Get("stop_before_destroy").(bool) {
-		if err := startstop.Stop(client, d.Id()).ExtractErr(); err != nil {
+		err = startstop.Stop(client, d.Id()).ExtractErr()
+		if err != nil {
 			log.Printf("[WARN] Error stopping OpenTelekomCloud instance: %s", err)
+		} else {
+			stopStateConf := &resource.StateChangeConf{
+				Pending:    []string{"ACTIVE"},
+				Target:     []string{"SHUTOFF"},
+				Refresh:    ServerV2StateRefreshFunc(client, d.Id()),
+				Timeout:    d.Timeout(schema.TimeoutDelete),
+				Delay:      10 * time.Second,
+				MinTimeout: 3 * time.Second,
+			}
+			log.Printf("[DEBUG] Waiting for instance (%s) to stop", d.Id())
+			_, err = stopStateConf.WaitForStateContext(ctx)
+			if err != nil {
+				log.Printf("[WARN] Error waiting for instance (%s) to stop: %s, proceeding to delete", d.Id(), err)
+			}
 		}
 	}
-
 	log.Printf("[DEBUG] Deleting OpenTelekomCloud Instance %s", d.Id())
 	if err := servers.Delete(client, d.Id()).ExtractErr(); err != nil {
 		return fmterr.Errorf("error deleting OpenTelekomCloud server: %w", err)

releasenotes/notes/compute-instance-v2-stop-state-9409c8e329287910.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    **[ECS]** Fixed ``stop_before_destroy`` state check before delete in ``resource/opentelekomcloud_compute_instance_v2`` (`#2703 <https://github.com/opentelekomcloud/terraform-provider-opentelekomcloud/pull/2703>`_)