Fix VM Usage histroy response

Author: Pearl1594

cloudstack/SystemVMService.go

@@ -1085,12 +1085,29 @@ type ListSystemVmsUsageHistoryResponse struct {
 }
 
 type SystemVmsUsageHistory struct {
-	Displayname string   `json:"displayname"`
-	Id          string   `json:"id"`
-	JobID       string   `json:"jobid"`
-	Jobstatus   int      `json:"jobstatus"`
-	Name        string   `json:"name"`
-	Stats       []string `json:"stats"`
+	Displayname string                       `json:"displayname"`
+	Id          string                       `json:"id"`
+	JobID       string                       `json:"jobid"`
+	Jobstatus   int                          `json:"jobstatus"`
+	Name        string                       `json:"name"`
+	Stats       []SystemVmsUsageHistoryStats `json:"stats"`
+}
+
+type SystemVmsUsageHistoryStats struct {
+	Cpuused          string `json:"cpuused"`
+	Diskiopstotal    int64  `json:"diskiopstotal"`
+	Diskioread       int64  `json:"diskioread"`
+	Diskiowrite      int64  `json:"diskiowrite"`
+	Diskkbsread      int64  `json:"diskkbsread"`
+	Diskkbswrite     int64  `json:"diskkbswrite"`
+	Memoryintfreekbs int64  `json:"memoryintfreekbs"`
+	Memorykbs        int64  `json:"memorykbs"`
+	Memorytargetkbs  int64  `json:"memorytargetkbs"`
+	Networkkbsread   int64  `json:"networkkbsread"`
+	Networkkbswrite  int64  `json:"networkkbswrite"`
+	Networkread      string `json:"networkread"`
+	Networkwrite     string `json:"networkwrite"`
+	Timestamp        string `json:"timestamp"`
 }
 
 type MigrateSystemVmParams struct {

cloudstack/VirtualMachineService.go

@@ -10752,16 +10752,33 @@ func (s *VirtualMachineService) ListVirtualMachinesUsageHistory(p *ListVirtualMa
 
 type ListVirtualMachinesUsageHistoryResponse struct {
 	Count                       int                            `json:"count"`
-	VirtualMachinesUsageHistory []*VirtualMachinesUsageHistory `json:"virtualmachinesusagehistory"`
+	VirtualMachinesUsageHistory []*VirtualMachinesUsageHistory `json:"virtualmachine"`
 }
 
 type VirtualMachinesUsageHistory struct {
-	Displayname string   `json:"displayname"`
-	Id          string   `json:"id"`
-	JobID       string   `json:"jobid"`
-	Jobstatus   int      `json:"jobstatus"`
-	Name        string   `json:"name"`
-	Stats       []string `json:"stats"`
+	Displayname string                             `json:"displayname"`
+	Id          string                             `json:"id"`
+	JobID       string                             `json:"jobid"`
+	Jobstatus   int                                `json:"jobstatus"`
+	Name        string                             `json:"name"`
+	Stats       []VirtualMachinesUsageHistoryStats `json:"stats"`
+}
+
+type VirtualMachinesUsageHistoryStats struct {
+	Cpuused          string `json:"cpuused"`
+	Diskiopstotal    int64  `json:"diskiopstotal"`
+	Diskioread       int64  `json:"diskioread"`
+	Diskiowrite      int64  `json:"diskiowrite"`
+	Diskkbsread      int64  `json:"diskkbsread"`
+	Diskkbswrite     int64  `json:"diskkbswrite"`
+	Memoryintfreekbs int64  `json:"memoryintfreekbs"`
+	Memorykbs        int64  `json:"memorykbs"`
+	Memorytargetkbs  int64  `json:"memorytargetkbs"`
+	Networkkbsread   int64  `json:"networkkbsread"`
+	Networkkbswrite  int64  `json:"networkkbswrite"`
+	Networkread      string `json:"networkread"`
+	Networkwrite     string `json:"networkwrite"`
+	Timestamp        string `json:"timestamp"`
 }
 
 type ImportVmParams struct {

cloudstack/cloudstack.go

@@ -39,7 +39,7 @@ import (
 	"strings"
 	"time"
 
-        gomock "go.uber.org/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // UnlimitedResourceID is a special ID to define an unlimited resource

generate/generate.go

@@ -2014,6 +2014,9 @@ func (s *service) generateResponseType(a *API) {
 		case "listSecondaryStorageSelectors":
 			pn("	Count int `json:\"count\"`")
 			pn("	%s []*%s `json:\"%s\"`", ln, parseSingular(ln), "heuristics")
+		case "listVirtualMachinesUsageHistory":
+			pn("    Count                       int                            `json:\"count\"`")
+			pn("    VirtualMachinesUsageHistory []*VirtualMachinesUsageHistory `json:\"virtualmachine\"`")
 		case "listHostHAResources":
 			pn("	Count int `json:\"count\"`")
 			pn("	%s []*%s `json:\"%s\"`", ln, parseSingular(ln), "hostha")