From 987fef81d7329cf2821db045e6aed62dee4f20df Mon Sep 17 00:00:00 2001
From: Alexey Fetisov <aafetisov@basistech.ru>
Date: Mon, 22 Dec 2025 15:43:18 +0300
Subject: [PATCH] 4.9.6

---
 CHANGELOG.md                                  |  5 ++--
 Makefile                                      |  2 +-
 .../cloudapi/kvmvm/resource_compute.go        | 26 ------------------
 .../cloudbroker/kvmvm/resource_compute.go     | 27 -------------------
 4 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3b68a78..667f743f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,8 @@
-## Version 4.9.5
+## Version 4.9.6
 
 ### Исправлено
 
 #### kvmvm
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-1122 | Перезагрузка виртуальной машины при изменении поля "disks" в resources `decort_kvmvm` и `decort_cb_kvmvm` в cloudapi/kvmvm и в cloudbroker/kvmvm |
-| BATF-1128 | Перезагрузка виртуальной машины при изменении полей "hot_resize", "cpu" в resources `decort_kvmvm` и `decort_cb_kvmvm` в cloudapi/kvmvm и в cloudbroker/kvmvm |
\ No newline at end of file
+| BATF-1147 | Остановка виртуальной машины перед удалением в resources `decort_kvmvm` и `decort_cb_kvmvm` в cloudapi/kvmvm и в cloudbroker/kvmvm |
\ No newline at end of file
diff --git a/Makefile b/Makefile
index e9180fa1..cbc04625 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ ZIPDIR = ./zip
 BINARY=${NAME}
 WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} 
 MAINPATH = ./cmd/decort/
-VERSION=4.9.5
+VERSION=4.9.6
 OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
 
 FILES = ${BINARY}_${VERSION}_darwin_amd64\
diff --git a/internal/service/cloudapi/kvmvm/resource_compute.go b/internal/service/cloudapi/kvmvm/resource_compute.go
index 04ee469f..c9973732 100644
--- a/internal/service/cloudapi/kvmvm/resource_compute.go
+++ b/internal/service/cloudapi/kvmvm/resource_compute.go
@@ -1754,32 +1754,6 @@ func resourceComputeDelete(ctx context.Context, d *schema.ResourceData, m interf
 	c := m.(*controller.ControllerCfg)
 	computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
 
-	if start, ok := d.GetOk("started"); ok {
-		if start.(bool) {
-			req := compute.StopRequest{ComputeID: computeId}
-			log.Debugf("resourceComputeDelete: stoping Compute ID %d", computeId)
-			if _, err := c.CloudAPI().Compute().Stop(ctx, req); err != nil {
-				diag.FromErr(err)
-			}
-		}
-	}
-
-	pciList, ok := d.GetOk("pci_devices")
-
-	if d.Get("permanently").(bool) && ok {
-		pciDevices := pciList.(*schema.Set).List()
-		for _, v := range pciDevices {
-			pciID := v.(int)
-			req := compute.DetachPCIDeviceRequest{
-				ComputeID: computeId,
-				DeviceID:  uint64(pciID),
-			}
-			_, err := c.CloudAPI().Compute().DetachPCIDevice(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
 	req := compute.DeleteRequest{
 		ComputeID:   computeId,
 		Permanently: d.Get("permanently").(bool),
diff --git a/internal/service/cloudbroker/kvmvm/resource_compute.go b/internal/service/cloudbroker/kvmvm/resource_compute.go
index 1b2250d0..66344d23 100644
--- a/internal/service/cloudbroker/kvmvm/resource_compute.go
+++ b/internal/service/cloudbroker/kvmvm/resource_compute.go
@@ -875,33 +875,6 @@ func resourceComputeDelete(ctx context.Context, d *schema.ResourceData, m interf
 	c := m.(*controller.ControllerCfg)
 	computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
 
-	if start, ok := d.GetOk("started"); ok {
-		if start.(bool) {
-			req := compute.StopRequest{ComputeID: computeId}
-			log.Debugf("resourceComputeDelete: stoping Compute ID %d", computeId)
-			if _, err := c.CloudBroker().Compute().Stop(ctx, req); err != nil {
-				diag.FromErr(err)
-			}
-		}
-	}
-
-	pciList, ok := d.GetOk("pci_devices")
-
-	if d.Get("permanently").(bool) && ok {
-		pciDevices := pciList.(*schema.Set).List()
-		for _, v := range pciDevices {
-			pciID := v.(int)
-			req := compute.DetachPCIDeviceRequest{
-				ComputeID: computeId,
-				DeviceID:  uint64(pciID),
-			}
-			_, err := c.CloudBroker().Compute().DetachPciDevice(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
 	req := compute.DeleteRequest{
 		ComputeID:   computeId,
 		Permanently: d.Get("permanently").(bool),