F #5656: GOCA - update host schema (#5657)

* host: update monitoring schema
* host: add numa nodes to schema

Signed-off-by: Pierre Lafievre <[email protected]>
(cherry picked from commit ca84cba)

Author: treywelsh

src/oca/go/src/goca/schemas/host/host.go

@@ -19,6 +19,7 @@ package host
 import (
 	"encoding/xml"
 
+	dyn "github.com/OpenNebula/one/src/oca/go/src/goca/dynamic"
 	"github.com/OpenNebula/one/src/oca/go/src/goca/schemas/shared"
 )
 
@@ -30,65 +31,89 @@ type Pool struct {
 
 // Host represents an OpenNebula Host
 type Host struct {
-	XMLName     xml.Name          `xml:"HOST"`
-	ID          int               `xml:"ID,omitempty"`
-	Name        string            `xml:"NAME"`
-	StateRaw    int               `xml:"STATE,omitempty"`
-	IMMAD       string            `xml:"IM_MAD,omitempty"`
-	VMMAD       string            `xml:"VM_MAD,omitempty"`
-	LastMonTime int               `xml:"LAST_MON_TIME,omitempty"`
-	ClusterID   int               `xml:"CLUSTER_ID,omitempty"`
-	Cluster     string            `xml:"CLUSTER,omitempty"`
-	Share       Share             `xml:"HOST_SHARE,omitempty"`
-	VMs         shared.EntitiesID `xml:"VMS,omitempty"`
-	Template    Template          `xml:"TEMPLATE,omitempty"`
+	XMLName         xml.Name          `xml:"HOST"`
+	ID              int               `xml:"ID,omitempty"`
+	Name            string            `xml:"NAME"`
+	StateRaw        int               `xml:"STATE,omitempty"`
+	IMMAD           string            `xml:"IM_MAD,omitempty"`
+	VMMAD           string            `xml:"VM_MAD,omitempty"`
+	ClusterID       int               `xml:"CLUSTER_ID,omitempty"`
+	Cluster         string            `xml:"CLUSTER,omitempty"`
+	Share           Share             `xml:"HOST_SHARE,omitempty"`
+	VMs             shared.EntitiesID `xml:"VMS,omitempty"`
+	MonitoringInfos Monitoring        `xml:"MONITORING,omitempty"`
+	Template        Template          `xml:"TEMPLATE,omitempty"`
 }
 
-type Share struct {
-	DiskUsage int `xml:"DISK_USAGE,omitempty"`
-	MemUsage  int `xml:"MEM_USAGE,omitempty"`
-	CPUUsage  int `xml:"CPU_USAGE,omitempty"`
-	TotalMem  int `xml:"TOTAL_MEM,omitempty"`
-	TotalCPU  int `xml:"TOTAL_CPU,omitempty"`
-
-	MaxDisk int `xml:"MAX_DISK,omitempty"`
-	MaxMem  int `xml:"MAX_MEM,omitempty"`
-	MaxCPU  int `xml:"MAX_CPU,omitempty"`
+type Monitoring struct {
+	dyn.Template
+}
 
-	FreeDisk int `xml:"FREE_DISK,omitempty"`
-	FreeMem  int `xml:"FREE_MEM,omitempty"`
-	FreeCPU  int `xml:"FREE_CPU,omitempty"`
+type Share struct {
+	MemUsage int `xml:"MEM_USAGE,omitempty"`
+	CPUUsage int `xml:"CPU_USAGE,omitempty"`
+	TotalMem int `xml:"TOTAL_MEM,omitempty"`
+	TotalCPU int `xml:"TOTAL_CPU,omitempty"`
 
-	UsedDisk int `xml:"USED_DISK,omitempty"`
-	UsedMem  int `xml:"USED_MEM,omitempty"`
-	UsedCPU  int `xml:"USED_CPU,omitempty"`
+	MaxMem int `xml:"MAX_MEM,omitempty"`
+	MaxCPU int `xml:"MAX_CPU,omitempty"`
 
 	RunningVMs int          `xml:"RUNNING_VMS,omitempty"`
-	Datastores []Datastores `xml:"DATASTORES>DS,omitempty"`
-	PCIDevices []PCIDevices  `xml:"PCI_DEVICES>PCI,omitempty"`
+	Datastores Datastores   `xml:"DATASTORES,omitempty"`
+	NumaNodes  []NumaNode   `xml:"NUMA_NODES>NODE,omitempty"`
+	PCIDevices []PCIDevices `xml:"PCI_DEVICES>PCI,omitempty"`
 }
 
 type Datastores struct {
-	ID      int `xml:"ID,omitempty"`
-	UsedMB  int `xml:"USED_MB,omitempty"`
-	FreeMB  int `xml:"FREE_MB,omitempty"`
-	TotalMB int `xml:"TOTAL_MB,omitempty"`
+	DiskUsage int `xml:"DISK_USAGE,omitempty"`
+	FreeDisk  int `xml:"FREE_DISK,omitempty"`
+	MaxDisk   int `xml:"MAX_DISK,omitempty"`
+	UsedDisk  int `xml:"USED_DISK,omitempty"`
 }
 
 type PCIDevices struct {
-	Address      string `xml:"ADDRESS,omitempty"`
-	Bus          string `xml:"BUS,omitempty"`
-	Class        string `xml:"CLASS,omitempty"`
-	ClassName    string `xml:"CLASS_NAME,omitempty"`
-	Device       string `xml:"DEVICE,omitempty"`
-	DeviceName   string `xml:"DEVICE_NAME,omitempty"`
-	Domain       string `xml:"DOMAIN,omitempty"`
-	Function     string `xml:"FUNCTION,omitempty"`
-	NumaNode     string `xml:"NUMA_NODE,omitempty"`
-	ShortAddress string `xml:"SHORT_ADDRESS,omitempty"`
-	Slot         string `xml:"SLOT,omitempty"`
-	Type         string `xml:"TYPE,omitempty"`
-	Vendor       string `xml:"VENDOR,omitempty"`
-	VendorName   string `xml:"VENDOR_NAME,omitempty"`
-	VMID         int    `xml:"VMID,omitempty"`
+	Address      string     `xml:"ADDRESS,omitempty"`
+	Bus          string     `xml:"BUS,omitempty"`
+	Class        string     `xml:"CLASS,omitempty"`
+	ClassName    string     `xml:"CLASS_NAME,omitempty"`
+	Device       string     `xml:"DEVICE,omitempty"`
+	DeviceName   string     `xml:"DEVICE_NAME,omitempty"`
+	Domain       string     `xml:"DOMAIN,omitempty"`
+	Function     string     `xml:"FUNCTION,omitempty"`
+	NumaNodes    []NumaNode `xml:"NUMA_NODE,omitempty"`
+	ShortAddress string     `xml:"SHORT_ADDRESS,omitempty"`
+	Slot         string     `xml:"SLOT,omitempty"`
+	Type         string     `xml:"TYPE,omitempty"`
+	Vendor       string     `xml:"VENDOR,omitempty"`
+	VendorName   string     `xml:"VENDOR_NAME,omitempty"`
+	VMID         int        `xml:"VMID,omitempty"`
+}
+
+type NumaNode struct {
+	ID        int        `xml:"NODE_ID,omitempty"`
+	Cores     []Core     `xml:"CORE,omitempty"`
+	HugePages []HugePage `xml:"HUGEPAGE,omitempty"`
+	Memories  []Memory   `xml:"MEMORY,omitempty"`
+}
+
+type HugePage struct {
+	Free  int `xml:"FREE,omitempty"`
+	Pages int `xml:"PAGES,omitempty"`
+	Size  int `xml:"SIZE,omitempty"`
+	Usage int `xml:"USAGE,omitempty"`
+}
+
+type Memory struct {
+	Distance string `xml:"DISTANCE,omitempty"`
+	Free     int    `xml:"FREE,omitempty"`
+	Total    int    `xml:"TOTAL,omitempty"`
+	Usage    int    `xml:"USAGE,omitempty"`
+	Used     int    `xml:"USED,omitempty"`
+}
+
+type Core struct {
+	ID        int    `xml:"ID,omitempty"`
+	CPUs      string `xml:"CPUS,omitempty"`
+	Dedicated string `xml:"DEDICATED,omitempty"`
+	Free      int    `xml:"FREE,omitempty"`
 }