Skip to content

Fix VM Usage history response #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix VM Usage history response #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b471df6
Fix VM Usage histroy response
Pearl1594 Dec 31, 2024
f89b2c7
Merge branch 'main' of https://github.com/apache/cloudstack-go into f…
Pearl1594 Jan 3, 2025
818910e
linting issue
Pearl1594 Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions cloudstack/SystemVMService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
31 changes: 24 additions & 7 deletions cloudstack/VirtualMachineService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cloudstack/cloudstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading
Loading