4.11.0

2026-02-11 13:02:14 +03:00
parent 069d63a65c
commit b8283ebfaf
277 changed files with 2184 additions and 4192 deletions
--- a/internal/service/cloudbroker/kvmvm/flattens.go
+++ b/internal/service/cloudbroker/kvmvm/flattens.go
@@ -78,7 +78,7 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("need_reboot", computeRec.NeedReboot)
 	d.Set("numa_node_id", computeRec.NumaNodeId)
 	d.Set("os_users", flattenOSUsers(computeRec.OSUsers))
-	d.Set("pinned", computeRec.PinnedToStack)
+	d.Set("pinned", computeRec.PinnedToNode)
 	d.Set("preferred_cpu", computeRec.PreferredCPU)
 	d.Set("ram", computeRec.RAM)
 	d.Set("reference_id", computeRec.ReferenceID)
@@ -88,9 +88,9 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("rg_name", computeRec.RGName)
 	d.Set("rg_id", computeRec.RGID)
 	d.Set("snap_sets", flattenSnapSets(computeRec.SnapSets))
-	d.Set("stack_id", computeRec.StackID)
-	d.Set("stack_name", computeRec.StackName)
 	d.Set("started", computeRec.TechStatus == "STARTED")
+	d.Set("node_id", computeRec.NodeID)
+	d.Set("node_name", computeRec.NodeName)
 	d.Set("stateless_sep_id", computeRec.StatelessSEPID)
 	d.Set("stateless_sep_type", computeRec.StatelessSEPType)
 	d.Set("status", computeRec.Status)
@@ -100,11 +100,9 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("updated_time", computeRec.UpdatedTime)
 	d.Set("user_data", string(userData))
 	d.Set("user_managed", computeRec.UserManaged)
+	d.Set("read_only", computeRec.ReadOnly)
 	d.Set("vnc_password", computeRec.VNCPassword)
 	d.Set("vgpus", flattenVGPUs(computeRec.VGPUs))
-	//TODO
-	// d.Set("virtual_image_id", computeRec.VirtualImageID)
-	// d.Set("virtual_image_name", computeRec.VirtualImageName)
 	d.Set("pci_devices", flattenPCI(*pciList))
 	d.Set("loader_type", computeRec.LoaderType)
 	d.Set("boot_type", computeRec.BootType)
@@ -286,6 +284,8 @@ func flattenComputeDisks(disksList compute.ListDisks, disksBlocks, extraDisks []
 			"delete_by":         disk.DeletedBy,
 			"delete_time":       disk.DeletedTime,
 			"update_time":       disk.UpdatedTime,
+			"cache":             disk.Cache,
+			"blk_discard":       disk.BLKDiscard,
 		}
 		res = append(res, temp)
 		indexDataDisks++
@@ -327,79 +327,78 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 		devices, _ := json.Marshal(computeItem.Devices)
 		userData, _ := json.Marshal(computeItem.Userdata)
 		temp := map[string]interface{}{
-			"acl":                   flattenListACLInterface(computeItem.ACL),
-			"account_id":            computeItem.AccountID,
-			"account_name":          computeItem.AccountName,
-			"affinity_label":        computeItem.AffinityLabel,
-			"affinity_rules":        flattenListRules(computeItem.AffinityRules),
-			"affinity_weight":       computeItem.AffinityWeight,
-			"anti_affinity_rules":   flattenListRules(computeItem.AntiAffinityRules),
-			"arch":                  computeItem.Arch,
-			"auto_start_w_node":     computeItem.AutoStart,
-			"chipset":               computeItem.Chipset,
-			"cd_image_id":           computeItem.CdImageId,
-			"boot_order":            computeItem.BootOrder,
-			"boot_image_id":         computeItem.BootImageID,
-			"bootdisk_size":         computeItem.BootDiskSize,
-			"clone_reference":       computeItem.CloneReference,
-			"clones":                computeItem.Clones,
-			"computeci_id":          computeItem.ComputeCIID,
-			"cpus":                  computeItem.CPUs,
-			"created_by":            computeItem.CreatedBy,
-			"created_time":          computeItem.CreatedTime,
-			"custom_fields":         string(customFields),
-			"deleted_by":            computeItem.DeletedBy,
-			"deleted_time":          computeItem.DeletedTime,
-			"desc":                  computeItem.Description,
-			"devices":               string(devices),
-			"disks":                 flattenDisks(computeItem.Disks),
-			"driver":                computeItem.Driver,
-			"gid":                   computeItem.GID,
-			"guid":                  computeItem.GUID,
-			"hp_backed":             computeItem.HPBacked,
-			"compute_id":            computeItem.ID,
-			"cpu_pin":               computeItem.CPUPin,
-			"interfaces":            flattenInterfaces(computeItem.Interfaces),
-			"live_migration_job_id": computeItem.LiveMigrationJobID,
-			"lock_status":           computeItem.LockStatus,
-			"manager_id":            computeItem.ManagerID,
-			"manager_type":          computeItem.ManagerType,
-			"migrationjob":          computeItem.MigrationJob,
-			"milestones":            computeItem.Milestones,
-			"nid":                   computeItem.NID,
-			"name":                  computeItem.Name,
-			"need_reboot":           computeItem.NeedReboot,
-			"numa_affinity":         computeItem.NumaAffinity,
-			"numa_node_id":          computeItem.NumaNodeId,
-			"os_users":              flattenOSUsers(computeItem.OSUsers),
-			"os_version":            computeItem.OSVersion,
-			"pinned":                computeItem.PinnedToStack,
-			"preferred_cpu":         computeItem.PreferredCPU,
-			"qemu_guest":            flattenQemuQuest(computeItem.QemuQuest),
-			"ram":                   computeItem.RAM,
-			"reference_id":          computeItem.ReferenceID,
-			"registered":            computeItem.Registered,
-			"res_name":              computeItem.ResName,
-			"reserved_node_cpus":    computeItem.ReservedNodeCpus,
-			"rg_id":                 computeItem.RGID,
-			"rg_name":               computeItem.RGName,
-			"snap_sets":             flattenSnapSets(computeItem.SnapSets),
-			"stack_id":              computeItem.StackID,
-			"stack_name":            computeItem.StackName,
-			"stateless_sep_id":      computeItem.StatelessSEPID,
-			"stateless_sep_type":    computeItem.StatelessSEPType,
-			"status":                computeItem.Status,
-			"tags":                  flattenTags(computeItem.Tags),
-			"tech_status":           computeItem.TechStatus,
-			"total_disk_size":       computeItem.TotalDiskSize,
-			"updated_by":            computeItem.UpdatedBy,
-			"updated_time":          computeItem.UpdatedTime,
-			"user_data":             string(userData),
-			"user_managed":          computeItem.UserManaged,
-			"vgpus":                 computeItem.VGPUs,
-			"vins_connected":        computeItem.VINSConnected,
-			//TODO
-			// "virtual_image_id":         computeItem.VirtualImageID,
+			"acl":                      flattenListACLInterface(computeItem.ACL),
+			"account_id":               computeItem.AccountID,
+			"account_name":             computeItem.AccountName,
+			"affinity_label":           computeItem.AffinityLabel,
+			"affinity_rules":           flattenListRules(computeItem.AffinityRules),
+			"affinity_weight":          computeItem.AffinityWeight,
+			"anti_affinity_rules":      flattenListRules(computeItem.AntiAffinityRules),
+			"arch":                     computeItem.Arch,
+			"auto_start_w_node":        computeItem.AutoStart,
+			"chipset":                  computeItem.Chipset,
+			"cd_image_id":              computeItem.CdImageId,
+			"boot_order":               computeItem.BootOrder,
+			"boot_image_id":            computeItem.BootImageID,
+			"bootdisk_size":            computeItem.BootDiskSize,
+			"clone_reference":          computeItem.CloneReference,
+			"clones":                   computeItem.Clones,
+			"computeci_id":             computeItem.ComputeCIID,
+			"cpus":                     computeItem.CPUs,
+			"created_by":               computeItem.CreatedBy,
+			"created_time":             computeItem.CreatedTime,
+			"custom_fields":            string(customFields),
+			"deleted_by":               computeItem.DeletedBy,
+			"deleted_time":             computeItem.DeletedTime,
+			"desc":                     computeItem.Description,
+			"devices":                  string(devices),
+			"disks":                    flattenDisks(computeItem.Disks),
+			"driver":                   computeItem.Driver,
+			"gid":                      computeItem.GID,
+			"guid":                     computeItem.GUID,
+			"hp_backed":                computeItem.HPBacked,
+			"compute_id":               computeItem.ID,
+			"cpu_pin":                  computeItem.CPUPin,
+			"interfaces":               flattenInterfaces(computeItem.Interfaces),
+			"live_migration_job_id":    computeItem.LiveMigrationJobID,
+			"lock_status":              computeItem.LockStatus,
+			"manager_id":               computeItem.ManagerID,
+			"manager_type":             computeItem.ManagerType,
+			"migrationjob":             computeItem.MigrationJob,
+			"milestones":               computeItem.Milestones,
+			"nid":                      computeItem.NID,
+			"name":                     computeItem.Name,
+			"need_reboot":              computeItem.NeedReboot,
+			"numa_affinity":            computeItem.NumaAffinity,
+			"numa_node_id":             computeItem.NumaNodeId,
+			"os_users":                 flattenOSUsers(computeItem.OSUsers),
+			"os_version":               computeItem.OSVersion,
+			"pinned":                   computeItem.PinnedToNode,
+			"preferred_cpu":            computeItem.PreferredCPU,
+			"qemu_guest":               flattenQemuQuest(computeItem.QemuQuest),
+			"ram":                      computeItem.RAM,
+			"reference_id":             computeItem.ReferenceID,
+			"registered":               computeItem.Registered,
+			"res_name":                 computeItem.ResName,
+			"reserved_node_cpus":       computeItem.ReservedNodeCpus,
+			"rg_id":                    computeItem.RGID,
+			"rg_name":                  computeItem.RGName,
+			"snap_sets":                flattenSnapSets(computeItem.SnapSets),
+			"node_id":                  computeItem.NodeID,
+			"node_name":                computeItem.NodeName,
+			"stateless_sep_id":         computeItem.StatelessSEPID,
+			"stateless_sep_type":       computeItem.StatelessSEPType,
+			"status":                   computeItem.Status,
+			"tags":                     flattenTags(computeItem.Tags),
+			"tech_status":              computeItem.TechStatus,
+			"total_disk_size":          computeItem.TotalDiskSize,
+			"updated_by":               computeItem.UpdatedBy,
+			"updated_time":             computeItem.UpdatedTime,
+			"user_data":                string(userData),
+			"user_managed":             computeItem.UserManaged,
+			"read_only":                computeItem.ReadOnly,
+			"vgpus":                    computeItem.VGPUs,
+			"vins_connected":           computeItem.VINSConnected,
 			"loader_type":              computeItem.LoaderType,
 			"boot_type":                computeItem.BootType,
 			"hot_resize":               computeItem.HotResize,
@@ -419,78 +418,74 @@ func flattenDeletedComputeList(computes *compute.ListDeletedComputes) []map[stri
 		devices, _ := json.Marshal(computeItem.Devices)
 		userData, _ := json.Marshal(computeItem.Userdata)
 		temp := map[string]interface{}{
-			"acl":                 flattenListACLInterface(computeItem.ACL),
-			"account_id":          computeItem.AccountID,
-			"account_name":        computeItem.AccountName,
-			"affinity_label":      computeItem.AffinityLabel,
-			"affinity_rules":      flattenListRules(computeItem.AffinityRules),
-			"affinity_weight":     computeItem.AffinityWeight,
-			"anti_affinity_rules": flattenListRules(computeItem.AntiAffinityRules),
-			"arch":                computeItem.Arch,
-			"auto_start_w_node":   computeItem.AutoStart,
-			"chipset":             computeItem.Chipset,
-			"cd_image_id":         computeItem.CdImageId,
-			"boot_order":          computeItem.BootOrder,
-			"bootdisk_size":       computeItem.BootDiskSize,
-			"boot_image_id":       computeItem.BootImageID,
-			"clone_reference":     computeItem.CloneReference,
-			"clones":              computeItem.Clones,
-			"computeci_id":        computeItem.ComputeCIID,
-			"cpus":                computeItem.CPUs,
-			"created_by":          computeItem.CreatedBy,
-			"created_time":        computeItem.CreatedTime,
-			"custom_fields":       string(customFields),
-			"deleted_by":          computeItem.DeletedBy,
-			"deleted_time":        computeItem.DeletedTime,
-			"desc":                computeItem.Description,
-			"devices":             string(devices),
-			"disks":               flattenDisks(computeItem.Disks),
-			"driver":              computeItem.Driver,
-			"gid":                 computeItem.GID,
-			"guid":                computeItem.GUID,
-			"hp_backed":           computeItem.HPBacked,
-			"compute_id":          computeItem.ID,
-			"cpu_pin":             computeItem.CPUPin,
-			//TODO
-			// "image_id":                 computeItem.ImageID,
-			"interfaces":         flattenInterfaces(computeItem.Interfaces),
-			"lock_status":        computeItem.LockStatus,
-			"manager_id":         computeItem.ManagerID,
-			"manager_type":       computeItem.ManagerType,
-			"migrationjob":       computeItem.MigrationJob,
-			"milestones":         computeItem.Milestones,
-			"name":               computeItem.Name,
-			"need_reboot":        computeItem.NeedReboot,
-			"numa_affinity":      computeItem.NumaAffinity,
-			"numa_node_id":       computeItem.NumaNodeId,
-			"os_users":           flattenOSUsers(computeItem.OSUsers),
-			"os_version":         computeItem.OSVersion,
-			"pinned":             computeItem.PinnedToStack,
-			"preferred_cpu":      computeItem.PreferredCPU,
-			"ram":                computeItem.RAM,
-			"reference_id":       computeItem.ReferenceID,
-			"registered":         computeItem.Registered,
-			"res_name":           computeItem.ResName,
-			"reserved_node_cpus": computeItem.ReservedNodeCpus,
-			"rg_id":              computeItem.RGID,
-			"rg_name":            computeItem.RGName,
-			"snap_sets":          flattenSnapSets(computeItem.SnapSets),
-			"stack_id":           computeItem.StackID,
-			"stack_name":         computeItem.StackName,
-			"stateless_sep_id":   computeItem.StatelessSEPID,
-			"stateless_sep_type": computeItem.StatelessSEPType,
-			"status":             computeItem.Status,
-			"tags":               flattenTags(computeItem.Tags),
-			"tech_status":        computeItem.TechStatus,
-			"total_disk_size":    computeItem.TotalDiskSize,
-			"updated_by":         computeItem.UpdatedBy,
-			"updated_time":       computeItem.UpdatedTime,
-			"user_data":          string(userData),
-			"user_managed":       computeItem.UserManaged,
-			"vgpus":              computeItem.VGPUs,
-			"vins_connected":     computeItem.VINSConnected,
-			//TODO
-			// "virtual_image_id":         computeItem.VirtualImageID,
+			"acl":                      flattenListACLInterface(computeItem.ACL),
+			"account_id":               computeItem.AccountID,
+			"account_name":             computeItem.AccountName,
+			"affinity_label":           computeItem.AffinityLabel,
+			"affinity_rules":           flattenListRules(computeItem.AffinityRules),
+			"affinity_weight":          computeItem.AffinityWeight,
+			"anti_affinity_rules":      flattenListRules(computeItem.AntiAffinityRules),
+			"arch":                     computeItem.Arch,
+			"auto_start_w_node":        computeItem.AutoStart,
+			"chipset":                  computeItem.Chipset,
+			"cd_image_id":              computeItem.CdImageId,
+			"boot_order":               computeItem.BootOrder,
+			"bootdisk_size":            computeItem.BootDiskSize,
+			"boot_image_id":            computeItem.BootImageID,
+			"clone_reference":          computeItem.CloneReference,
+			"clones":                   computeItem.Clones,
+			"computeci_id":             computeItem.ComputeCIID,
+			"cpus":                     computeItem.CPUs,
+			"created_by":               computeItem.CreatedBy,
+			"created_time":             computeItem.CreatedTime,
+			"custom_fields":            string(customFields),
+			"deleted_by":               computeItem.DeletedBy,
+			"deleted_time":             computeItem.DeletedTime,
+			"desc":                     computeItem.Description,
+			"devices":                  string(devices),
+			"disks":                    flattenDisks(computeItem.Disks),
+			"driver":                   computeItem.Driver,
+			"gid":                      computeItem.GID,
+			"guid":                     computeItem.GUID,
+			"hp_backed":                computeItem.HPBacked,
+			"compute_id":               computeItem.ID,
+			"cpu_pin":                  computeItem.CPUPin,
+			"interfaces":               flattenInterfaces(computeItem.Interfaces),
+			"lock_status":              computeItem.LockStatus,
+			"manager_id":               computeItem.ManagerID,
+			"manager_type":             computeItem.ManagerType,
+			"migrationjob":             computeItem.MigrationJob,
+			"milestones":               computeItem.Milestones,
+			"name":                     computeItem.Name,
+			"need_reboot":              computeItem.NeedReboot,
+			"numa_affinity":            computeItem.NumaAffinity,
+			"numa_node_id":             computeItem.NumaNodeId,
+			"os_users":                 flattenOSUsers(computeItem.OSUsers),
+			"os_version":               computeItem.OSVersion,
+			"pinned":                   computeItem.PinnedToNode,
+			"preferred_cpu":            computeItem.PreferredCPU,
+			"ram":                      computeItem.RAM,
+			"reference_id":             computeItem.ReferenceID,
+			"registered":               computeItem.Registered,
+			"res_name":                 computeItem.ResName,
+			"reserved_node_cpus":       computeItem.ReservedNodeCpus,
+			"rg_id":                    computeItem.RGID,
+			"rg_name":                  computeItem.RGName,
+			"snap_sets":                flattenSnapSets(computeItem.SnapSets),
+			"node_id":                  computeItem.NodeID,
+			"node_name":                computeItem.NodeName,
+			"stateless_sep_id":         computeItem.StatelessSEPID,
+			"stateless_sep_type":       computeItem.StatelessSEPType,
+			"status":                   computeItem.Status,
+			"tags":                     flattenTags(computeItem.Tags),
+			"tech_status":              computeItem.TechStatus,
+			"total_disk_size":          computeItem.TotalDiskSize,
+			"updated_by":               computeItem.UpdatedBy,
+			"updated_time":             computeItem.UpdatedTime,
+			"user_data":                string(userData),
+			"user_managed":             computeItem.UserManaged,
+			"vgpus":                    computeItem.VGPUs,
+			"vins_connected":           computeItem.VINSConnected,
 			"loader_type":              computeItem.LoaderType,
 			"boot_type":                computeItem.BootType,
 			"hot_resize":               computeItem.HotResize,
@@ -574,6 +569,7 @@ func flattenDisks(disks []compute.InfoDisk) []map[string]interface{} {
 			// "bus_number": disk.BusNumber,
 			"disk_id": disk.ID,
 			// "pci_slot": disk.PCISlot,
+			"sep_id": disk.SepID,
 		}
 		res = append(res, temp)
 	}
@@ -690,7 +686,7 @@ func flattenPCIDevice(deviceList []compute.ItemPCIDevice) []map[string]interface
 			"device_id":   dev.ID,
 			"name":        dev.Name,
 			"rg_id":       dev.RGID,
-			"stack_id":    dev.StackID,
+			"node_id":     dev.NodeID,
 			"status":      dev.Status,
 			"system_name": dev.SystemName,
 		}
@@ -809,7 +805,7 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("numa_affinity", compFacts.NumaAffinity)
 	d.Set("numa_node_id", compFacts.NumaNodeId)
 	d.Set("os_users", flattenOSUsers(compFacts.OSUsers))
-	d.Set("pinned", compFacts.PinnedToStack)
+	d.Set("pinned", compFacts.PinnedToNode)
 	d.Set("preferred_cpu", compFacts.PreferredCPU)
 	d.Set("qemu_guest", flattenQemuQuest(compFacts.QemuQuest))
 	d.Set("ram", compFacts.RAM)
@@ -820,8 +816,8 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("rg_id", compFacts.RGID)
 	d.Set("rg_name", compFacts.RGName)
 	d.Set("snap_sets", flattenSnapSets(compFacts.SnapSets))
-	d.Set("stack_id", compFacts.StackID)
-	d.Set("stack_name", compFacts.StackName)
+	d.Set("node_id", compFacts.NodeID)
+	d.Set("node_name", compFacts.NodeName)
 	d.Set("stateless_sep_id", compFacts.StatelessSEPID)
 	d.Set("stateless_sep_type", compFacts.StatelessSEPType)
 	d.Set("status", compFacts.Status)
@@ -831,11 +827,9 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("updated_time", compFacts.UpdatedTime)
 	d.Set("user_data", string(userData))
 	d.Set("user_managed", compFacts.UserManaged)
+	d.Set("read_only", compFacts.ReadOnly)
 	d.Set("vnc_password", compFacts.VNCPassword)
 	d.Set("vgpus", flattenVGPUs(compFacts.VGPUs))
-	//TODO
-	// d.Set("virtual_image_id", compFacts.VirtualImageID)
-	// d.Set("virtual_image_name", compFacts.VirtualImageName)
 	d.Set("pci_devices", flattenPCI(*pciList))
 	d.Set("loader_type", compFacts.LoaderType)
 	d.Set("boot_type", compFacts.BootType)
@@ -872,6 +866,7 @@ func parseComputeInterfacesToNetworks(networks []interface{}, ifaces compute.Lis
 		elem["ip_address"] = value.IPAddress
 		elem["mac"] = value.MAC
 		elem["mtu"] = value.MTU
+		elem["net_mask"] = value.NetMask
 		elem["sdn_interface_id"] = value.SDNInterfaceID
 		elem["weight"] = flattenNetworkWeight(networks, value.NetID, value.NetType)
 		elem["enabled"] = value.Enabled
@@ -900,6 +895,7 @@ func flattenDisk(diskList compute.ListDisks) []map[string]interface{} {
 			"ckey":                  disk.CKey,
 			"meta":                  flattens.FlattenMeta(disk.Meta),
 			"account_id":            disk.AccountID,
+			"blk_discard":           disk.BLKDiscard,
 			"boot_partition":        disk.BootPartition,
 			"bus_number":            disk.BusNumber,
 			"created_time":          disk.CreatedTime,