4.7.0

internal/service/cloudbroker/kvmvm/flattens.go

@@ -38,6 +38,7 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("boot_disk_id", bootDisk.ID)
 	// we intentionally use the SizeMax field, do not change it until the BootDiskSize field is fixed on the platform
 	d.Set("boot_disk_size", bootDisk.SizeMax)
+	d.Set("chipset", computeRec.Chipset)
 	d.Set("cd_image_id", computeRec.CdImageId)
 	d.Set("clone_reference", computeRec.CloneReference)
 	d.Set("clones", computeRec.Clones)
@@ -156,31 +157,49 @@ func flattenInterfaces(ifaces compute.ListInterfaces) []map[string]interface{} {
 
 	for _, iface := range ifaces {
 		res = append(res, map[string]interface{}{
-			"conn_id":       iface.ConnID,
-			"conn_type":     iface.ConnType,
-			"def_gw":        iface.DefGW,
-			"enabled":       iface.Enabled,
-			"flip_group_id": iface.FLIPGroupID,
-			"guid":          iface.GUID,
-			"ip_address":    iface.IPAddress,
-			"listen_ssh":    iface.ListenSSH,
-			"mac":           iface.MAC,
-			"name":          iface.Name,
-			"net_id":        iface.NetID,
-			"netmask":       iface.NetMask,
-			"net_type":      iface.NetType,
-			"node_id":       iface.NodeID,
-			"pci_slot":      iface.PCISlot,
-			"qos":           flattenQOS(iface.QOS),
-			"target":        iface.Target,
-			"type":          iface.Type,
-			"vnfs":          iface.VNFs,
+			"bus_number":       iface.BusNumber,
+			"conn_id":          iface.ConnID,
+			"conn_type":        iface.ConnType,
+			"def_gw":           iface.DefGW,
+			"enabled":          iface.Enabled,
+			"flip_group_id":    iface.FLIPGroupID,
+			"guid":             iface.GUID,
+			"ip_address":       iface.IPAddress,
+			"listen_ssh":       iface.ListenSSH,
+			"mac":              iface.MAC,
+			"mtu":              iface.MTU,
+			"name":             iface.Name,
+			"net_id":           iface.NetID,
+			"netmask":          iface.NetMask,
+			"net_type":         iface.NetType,
+			"node_id":          iface.NodeID,
+			"pci_slot":         iface.PCISlot,
+			"qos":              flattenQOS(iface.QOS),
+			"target":           iface.Target,
+			"type":             iface.Type,
+			"vnfs":             iface.VNFs,
+			"libvirt_settings": flattenLibvirtSettings(iface.LibvirtSettings),
 		})
 	}
 
 	return res
 }
 
+func flattenLibvirtSettings(libvirtSettings compute.LibvirtSettings) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"guid":          libvirtSettings.GUID,
+		"txmode":        libvirtSettings.TXMode,
+		"ioeventfd":     libvirtSettings.IOEventFD,
+		"event_idx":     libvirtSettings.EventIDx,
+		"queues":        libvirtSettings.Queues,
+		"rx_queue_size": libvirtSettings.RXQueueSize,
+		"tx_queue_size": libvirtSettings.TXQueueSize,
+	}
+	res = append(res, temp)
+	return res
+}
+
 func flattenQOS(qos compute.QOS) []map[string]interface{} {
 	return []map[string]interface{}{
 		{
@@ -275,6 +294,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"affinity_weight":     computeItem.AffinityWeight,
 			"anti_affinity_rules": flattenListRules(computeItem.AntiAffinityRules),
 			"arch":                computeItem.Arch,
+			"chipset":             computeItem.Chipset,
 			"cd_image_id":         computeItem.CdImageId,
 			"boot_order":          computeItem.BootOrder,
 			"bootdisk_size":       computeItem.BootDiskSize,
@@ -406,8 +426,9 @@ func flattenDisks(disks []compute.InfoDisk) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, disk := range disks {
 		temp := map[string]interface{}{
-			"disk_id":  disk.ID,
-			"pci_slot": disk.PCISlot,
+			"bus_number": disk.BusNumber,
+			"disk_id":    disk.ID,
+			"pci_slot":   disk.PCISlot,
 		}
 		res = append(res, temp)
 	}
@@ -593,6 +614,7 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("anti_affinity_rules", flattenAffinityRules(compFacts.AntiAffinityRules))
 	d.Set("arch", compFacts.Arch)
 	d.Set("boot_order", compFacts.BootOrder)
+	d.Set("chipset", compFacts.Chipset)
 	d.Set("cd_image_id", compFacts.CdImageId)
 	d.Set("clone_reference", compFacts.CloneReference)
 	d.Set("clones", compFacts.Clones)
@@ -708,6 +730,7 @@ func flattenDisk(diskList compute.ListDisks) []map[string]interface{} {
 			"meta":                  flattens.FlattenMeta(disk.Meta),
 			"account_id":            disk.AccountID,
 			"boot_partition":        disk.BootPartition,
+			"bus_number":            disk.BusNumber,
 			"created_time":          disk.CreatedTime,
 			"deleted_time":          disk.DeletedTime,
 			"desc":                  disk.Description,