4.13.0

internal/service/cloudapi/kvmvm/flattens.go

@@ -50,7 +50,8 @@ func flattenDisks(disks []compute.InfoDisk) []map[string]interface{} {
 			// "bus_number": disk.BusNumber,
 			"disk_id": disk.ID,
 			// "pci_slot":   disk.PCISlot,
-			"sep_id": disk.SepID,
+			"sep_id":    disk.SepID,
+			"read_only": disk.ReadOnly,
 		}
 		res = append(res, temp)
 	}
@@ -71,32 +72,33 @@ func flattenInterfaces(interfaces compute.ListInterfaces) []map[string]interface
 	res := make([]map[string]interface{}, 0, len(interfaces))
 	for _, interfaceItem := range interfaces {
 		temp := map[string]interface{}{
-			"bus_number":       interfaceItem.BusNumber,
-			"conn_id":          interfaceItem.ConnID,
-			"conn_type":        interfaceItem.ConnType,
-			"def_gw":           interfaceItem.DefGW,
-			"enabled":          interfaceItem.Enabled,
-			"enable_secgroups": interfaceItem.EnableSecGroups,
-			"flip_group_id":    interfaceItem.FLIPGroupID,
-			"guid":             interfaceItem.GUID,
-			"ip_address":       interfaceItem.IPAddress,
-			"listen_ssh":       interfaceItem.ListenSSH,
-			"mac":              interfaceItem.MAC,
-			"mtu":              interfaceItem.MTU,
-			"name":             interfaceItem.Name,
-			"net_id":           interfaceItem.NetID,
-			"netmask":          interfaceItem.NetMask,
-			"net_type":         interfaceItem.NetType,
-			"node_id":          interfaceItem.NodeID,
-			"pci_slot":         interfaceItem.PCISlot,
-			"qos":              flattenQOS(interfaceItem.QOS),
-			"security_groups":  interfaceItem.SecGroups,
-			"sdn_interface_id": interfaceItem.SDNInterfaceID,
-			"target":           interfaceItem.Target,
-			"type":             interfaceItem.Type,
-			"trunk_tags":       interfaceItem.TrunkTags,
-			"vnfs":             interfaceItem.VNFs,
-			"libvirt_settings": flattenLibvirtSettings(interfaceItem.LibvirtSettings),
+			"bus_number":             interfaceItem.BusNumber,
+			"conn_id":                interfaceItem.ConnID,
+			"conn_type":              interfaceItem.ConnType,
+			"def_gw":                 interfaceItem.DefGW,
+			"enabled":                interfaceItem.Enabled,
+			"enable_secgroups":       interfaceItem.EnableSecGroups,
+			"enable_default_gateway": interfaceItem.EnableDefaultGateway,
+			"flip_group_id":          interfaceItem.FLIPGroupID,
+			"guid":                   interfaceItem.GUID,
+			"ip_address":             interfaceItem.IPAddress,
+			"listen_ssh":             interfaceItem.ListenSSH,
+			"mac":                    interfaceItem.MAC,
+			"mtu":                    interfaceItem.MTU,
+			"name":                   interfaceItem.Name,
+			"net_id":                 interfaceItem.NetID,
+			"netmask":                interfaceItem.NetMask,
+			"net_type":               interfaceItem.NetType,
+			"node_id":                interfaceItem.NodeID,
+			"pci_slot":               interfaceItem.PCISlot,
+			"qos":                    flattenQOS(interfaceItem.QOS),
+			"security_groups":        interfaceItem.SecGroups,
+			"sdn_interface_id":       interfaceItem.SDNInterfaceID,
+			"target":                 interfaceItem.Target,
+			"type":                   interfaceItem.Type,
+			"trunk_tags":             interfaceItem.TrunkTags,
+			"vnfs":                   interfaceItem.VNFs,
+			"libvirt_settings":       flattenLibvirtSettings(interfaceItem.LibvirtSettings),
 		}
 		res = append(res, temp)
 	}
@@ -122,10 +124,11 @@ func flattenSnapSets(snapSets compute.ListSnapSets) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(snapSets))
 	for _, snapSet := range snapSets {
 		temp := map[string]interface{}{
-			"disks":     snapSet.Disks,
-			"guid":      snapSet.GUID,
-			"label":     snapSet.Label,
-			"timestamp": snapSet.Timestamp,
+			"disks":             snapSet.Disks,
+			"guid":              snapSet.GUID,
+			"label":             snapSet.Label,
+			"timestamp":         snapSet.Timestamp,
+			"memory_dump_image": snapSet.MemoryDumpImage,
 		}
 		res = append(res, temp)
 	}
@@ -193,10 +196,12 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"bootdisk_size":            compute.BootDiskSize,
 			"boot_image_id":            compute.BootImageID,
 			"chipset":                  compute.Chipset,
+			"clock":                    compute.Clock,
 			"cd_image_id":              compute.CdImageId,
 			"clone_reference":          compute.CloneReference,
 			"clones":                   compute.Clones,
 			"computeci_id":             compute.ComputeCIID,
+			"cpu_alignment_profiles":   flattenCPUAlignmentProfile(compute.CPUAlignmentProfile),
 			"cpu_pin":                  compute.CPUPin,
 			"cpus":                     compute.CPU,
 			"created_by":               compute.CreatedBy,
@@ -232,6 +237,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"registered":               compute.Registered,
 			"res_name":                 compute.ResName,
 			"reserved_node_cpus":       compute.ReservedNodeCpus,
+			"resized_online":           compute.ResizedOnline,
 			"rg_id":                    compute.RGID,
 			"rg_name":                  compute.RGName,
 			"snap_sets":                flattenSnapSets(compute.SnapSets),
@@ -278,7 +284,7 @@ func flattenBootDisk(bootDisk *compute.ItemComputeDisk) []map[string]interface{}
 		"storage_policy_id": bootDisk.StoragePolicyID,
 		"to_clean":          bootDisk.ToClean,
 		"cache":             bootDisk.Cache,
-		"blk_discard":       bootDisk.BLKDiscard,
+		"discard":           bootDisk.Discard,
 		"block_size":        bootDisk.BlockSize,
 		"bus_number":        bootDisk.BusNumber,
 		"provision":         bootDisk.Provision,
@@ -289,6 +295,7 @@ func flattenBootDisk(bootDisk *compute.ItemComputeDisk) []map[string]interface{}
 		"deleted_time":      bootDisk.DeletedTime,
 		"updated_time":      bootDisk.UpdatedTime,
 		"devicename":        bootDisk.DeviceName,
+		"read_only":         bootDisk.ReadOnly,
 	}
 
 	res = append(res, temp)
@@ -346,10 +353,11 @@ func flattenComputeDisksDemo(disksList compute.ListComputeDisks, disksBlocks, ex
 			"updated_time":      disk.UpdatedTime,
 			"permanently":       pernamentlyValue,
 			"cache":             disk.Cache,
-			"blk_discard":       disk.BLKDiscard,
+			"discard":           disk.Discard,
 			"block_size":        disk.BlockSize,
 			"provision":         disk.Provision,
 			"iotune":            flattenIotune(disk.IOTune),
+			"read_only":         disk.ReadOnly,
 		}
 		res = append(res, temp)
 		indexDataDisks++
@@ -363,15 +371,16 @@ func flattenNetwork(networks []interface{}, interfaces compute.ListInterfaces) [
 
 	for _, network := range interfaces {
 		temp := map[string]interface{}{
-			"net_id":           network.NetID,
-			"net_type":         network.NetType,
-			"ip_address":       network.IPAddress,
-			"mac":              network.MAC,
-			"mtu":              network.MTU,
-			"net_mask":         network.NetMask,
-			"sdn_interface_id": network.SDNInterfaceID,
-			"weight":           flattenNetworkWeight(networks, network.NetID, network.NetType),
-			"enabled":          network.Enabled,
+			"net_id":                 network.NetID,
+			"net_type":               network.NetType,
+			"ip_address":             network.IPAddress,
+			"mac":                    network.MAC,
+			"mtu":                    network.MTU,
+			"net_mask":               network.NetMask,
+			"sdn_interface_id":       network.SDNInterfaceID,
+			"weight":                 flattenNetworkWeight(networks, network.NetID, network.NetType),
+			"enabled":                network.Enabled,
+			"enable_default_gateway": network.EnableDefaultGateway,
 		}
 		res = append(res, temp)
 	}
@@ -440,6 +449,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("sep_id", bootDisk.SepID)
 	d.Set("pool", bootDisk.Pool)
 	d.Set("chipset", computeRec.Chipset)
+	d.Set("clock", computeRec.Clock)
 	d.Set("clone_reference", computeRec.CloneReference)
 	d.Set("clones", computeRec.Clones)
 	d.Set("computeci_id", computeRec.ComputeCIID)
@@ -484,6 +494,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("registered", computeRec.Registered)
 	d.Set("res_name", computeRec.ResName)
 	d.Set("reserved_node_cpus", computeRec.ReservedNodeCpus)
+	d.Set("resized_online", computeRec.ResizedOnline)
 	d.Set("rg_id", computeRec.RGID)
 	d.Set("rg_name", computeRec.RGName)
 	d.Set("snap_sets", flattenSnapSets(computeRec.SnapSets))
@@ -505,6 +516,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("zone_id", computeRec.ZoneID)
 	d.Set("loader_meta_iso", flattenLoaderMetaIso(computeRec.LoaderMetaIso))
 	d.Set("cpu_pin", computeRec.CPUPin)
+	d.Set("cpu_alignment_profile", computeRec.CPUAlignmentProfile.Name)
 	d.Set("numa_affinity", computeRec.NumaAffinity)
 	d.Set("hp_backed", computeRec.HPBacked)
 	d.Set("weight", computeRec.Weight)
@@ -565,6 +577,20 @@ func flattenAffinityRules(affinityRules compute.ListRules) []map[string]interfac
 	return res
 }
 
+/*func flattenDisksACL(acl compute.ItemDisksACL) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"user_group_id": acl.UserGroupID,
+		"type":          acl.Type,
+		"right":         acl.Right,
+		"status":        acl.Status,
+		"explicit":      acl.Explicit,
+	}
+
+	res = append(res, temp)
+	return res
+}*/
+
 func flattenIotune(iotune compute.IOTune) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
@@ -593,6 +619,7 @@ func flattenSnapshots(snapshots compute.SnapshotExtendList) []map[string]interfa
 		temp := map[string]interface{}{
 			"guid":          snapshot.GUID,
 			"label":         snapshot.Label,
+			"pool_name":     snapshot.PoolName,
 			"res_id":        snapshot.ResID,
 			"reference_id":  snapshot.ReferenceID,
 			"snap_set_guid": snapshot.SnapSetGUID,
@@ -607,13 +634,14 @@ func flattenSnapshots(snapshots compute.SnapshotExtendList) []map[string]interfa
 
 func flattenListComputeDisks(disks compute.ListComputeDisks) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(disks))
+	log.Debug("flattenListComputeDisks:", disks)
 	for _, disk := range disks {
-		acl, _ := json.Marshal(disk.ACL)
 		temp := map[string]interface{}{
-			"_ckey":                 disk.CKey,
-			"acl":                   string(acl),
+			//"_ckey":                 disk.CKey,
+			// TODO
+			//"acl":                   flattenDisksACL(disk.ACL),
 			"account_id":            disk.AccountID,
-			"blk_discard":           disk.BLKDiscard,
+			"discard":               disk.Discard,
 			"block_size":            disk.BlockSize,
 			"boot_partition":        disk.BootPartition,
 			"bus_number":            disk.BusNumber,
@@ -660,6 +688,7 @@ func flattenListComputeDisks(disks compute.ListComputeDisks) []map[string]interf
 			"to_clean":              disk.ToClean,
 			"provision":             disk.Provision,
 			"updated_time":          disk.UpdatedTime,
+			"read_only":             disk.ReadOnly,
 		}
 		res = append(res, temp)
 	}
@@ -713,6 +742,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("auto_start_w_node", computeRec.AutoStart)
 	d.Set("arch", computeRec.Architecture)
 	d.Set("chipset", computeRec.Chipset)
+	d.Set("clock", computeRec.Clock)
 	d.Set("boot_order", computeRec.BootOrder)
 	d.Set("bootdisk_size", computeRec.BootDiskSize)
 	d.Set("boot_image_id", computeRec.BootImageID)
@@ -729,7 +759,10 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("deleted_time", computeRec.DeletedTime)
 	d.Set("desc", computeRec.Description)
 	d.Set("devices", string(devices))
-	d.Set("disks", flattenListComputeDisks(computeRec.Disks))
+	err := d.Set("disks", flattenListComputeDisks(computeRec.Disks))
+	if err != nil {
+		log.Debugf("error in flattenDataCompute: %v", err)
+	}
 	d.Set("driver", computeRec.Driver)
 	d.Set("gid", computeRec.GID)
 	d.Set("guid", computeRec.GUID)
@@ -762,6 +795,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("registered", computeRec.Registered)
 	d.Set("res_name", computeRec.ResName)
 	d.Set("reserved_node_cpus", computeRec.ReservedNodeCpus)
+	d.Set("resized_online", computeRec.ResizedOnline)
 	d.Set("rg_id", computeRec.RGID)
 	d.Set("rg_name", computeRec.RGName)
 	d.Set("snap_sets", flattenSnapSets(computeRec.SnapSets))
@@ -785,9 +819,23 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("zone_id", computeRec.ZoneID)
 	d.Set("loader_meta_iso", flattenLoaderMetaIso(computeRec.LoaderMetaIso))
 	d.Set("os_version", computeRec.OSVersion)
+	d.Set("cpu_alignment_profiles", flattenCPUAlignmentProfile(computeRec.CPUAlignmentProfile))
 	d.Set("weight", computeRec.Weight)
 }
 
+func flattenCPUAlignmentProfile(profile compute.CPUAlignmentProfile) []map[string]interface{} {
+	if profile.Name == "" && profile.Model == "" && profile.Vendor == "" {
+		return nil
+	}
+	return []map[string]interface{}{
+		{
+			"name":   profile.Name,
+			"model":  profile.Model,
+			"vendor": profile.Vendor,
+		},
+	}
+}
+
 func flattenPCI(pciList compute.ListPCIDevices) []uint64 {
 	res := make([]uint64, 0, len(pciList.Data))