Skip to content
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

Follow upstream changes of libvirt-xml-go #376

Merged
merged 2 commits into from
Aug 8, 2017
Merged

Follow upstream changes of libvirt-xml-go #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eeb635
Follow upstream changes of libvirt-xml-go
miha-plesko Aug 3, 2017
610ceb1
Adjust golden test to the latest libvirt-go-xml
miha-plesko Aug 7, 2017
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
7 changes: 3 additions & 4 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import:
- package: github.com/libvirt/libvirt-go
version: c3209e4ba8b8dda65c85ca0ac04302e55895caf7
- package: github.com/libvirt/libvirt-go-xml
version: cc4025ea01eee7c73a7c75b4211b07125a8119ae
version: 83a754119fc7239caffd1f50e08cb13b1b3825ef
- package: k8s.io/kubernetes
version: v1.7.0
- package: k8s.io/apiserver
Expand Down
103 changes: 46 additions & 57 deletions libvirt-xml-go.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
diff --git a/domain.go b/domain.go
index eb7ff9e..46cd806 100644
index a5d3203..d15af6b 100644
--- a/domain.go
+++ b/domain.go
@@ -522,27 +522,70 @@ type DomainFeatureList struct {
@@ -597,6 +597,32 @@ type DomainFeatureList struct {
SMM *DomainFeatureState `xml:"smm"`
}

+type QemuArg struct {
+ Value string `xml:"value,attr"`
+}
+
+type QemuEnv struct {
+ Name string `xml:"name,attr"`
+ Value string `xml:"value,attr,omitempty"`
+}
+
+type DomainCMDLine struct {
+ Args []QemuArg `xml:"arg"`
+ Envs []QemuEnv `xml:"env"`
+}
+

+type DomainCPUTuneShares struct {
+ Value uint `xml:",chardata"`
+}
Expand All @@ -46,47 +32,50 @@ index eb7ff9e..46cd806 100644
+ Locked *DomainMemoryBackingLocked `xml:"locked"`
+}
+
// NB, try to keep the order of fields in this struct
type DomainQEMUCommandlineArg struct {
Value string `xml:"value,attr"`
}
@@ -616,24 +642,26 @@ type DomainQEMUCommandline struct {
// matching the order of XML elements that libvirt
// will generate when dumping XML.
type Domain struct {
- XMLName xml.Name `xml:"domain"`
- Type string `xml:"type,attr,omitempty"`
- Name string `xml:"name"`
- UUID string `xml:"uuid,omitempty"`
- Memory *DomainMemory `xml:"memory"`
- CurrentMemory *DomainMemory `xml:"currentMemory"`
- MaximumMemory *DomainMaxMemory `xml:"maxMemory"`
- VCPU *DomainVCPU `xml:"vcpu"`
- Resource *DomainResource `xml:"resource"`
- SysInfo *DomainSysInfo `xml:"sysinfo"`
- OS *DomainOS `xml:"os"`
- Features *DomainFeatureList `xml:"features"`
- CPU *DomainCPU `xml:"cpu"`
- OnPoweroff string `xml:"on_poweroff,omitempty"`
- OnReboot string `xml:"on_reboot,omitempty"`
- OnCrash string `xml:"on_crash,omitempty"`
- Devices *DomainDeviceList `xml:"devices"`
+ XMLName xml.Name `xml:"domain"`
+ Type string `xml:"type,attr,omitempty"`
+ Name string `xml:"name"`
+ UUID string `xml:"uuid,omitempty"`
+ Memory *DomainMemory `xml:"memory"`
+ CurrentMemory *DomainMemory `xml:"currentMemory"`
+ MaximumMemory *DomainMaxMemory `xml:"maxMemory"`
+ MemoryBacking *DomainMemoryBacking `xml:"memoryBacking"`
+ VCPU *DomainVCPU `xml:"vcpu"`
+ CPUTune *DomainCPUTune `xml:"cputune"`
+ Resource *DomainResource `xml:"resource"`
+ SysInfo *DomainSysInfo `xml:"sysinfo"`
+ OS *DomainOS `xml:"os"`
+ Features *DomainFeatureList `xml:"features"`
+ CPU *DomainCPU `xml:"cpu"`
+ OnPoweroff string `xml:"on_poweroff,omitempty"`
+ OnReboot string `xml:"on_reboot,omitempty"`
+ OnCrash string `xml:"on_crash,omitempty"`
+ Devices *DomainDeviceList `xml:"devices"`
+ CMDLine *DomainCMDLine `xml:"http://libvirt.org/schemas/domain/qemu/1.0 commandline"`
- XMLName xml.Name `xml:"domain"`
- Type string `xml:"type,attr,omitempty"`
- Name string `xml:"name"`
- UUID string `xml:"uuid,omitempty"`
- Memory *DomainMemory `xml:"memory"`
- CurrentMemory *DomainMemory `xml:"currentMemory"`
- MaximumMemory *DomainMaxMemory `xml:"maxMemory"`
- VCPU *DomainVCPU `xml:"vcpu"`
- Resource *DomainResource `xml:"resource"`
- SysInfo *DomainSysInfo `xml:"sysinfo"`
- OS *DomainOS `xml:"os"`
- Features *DomainFeatureList `xml:"features"`
- CPU *DomainCPU `xml:"cpu"`
- Clock *DomainClock `xml:"clock,omitempty"`
- OnPoweroff string `xml:"on_poweroff,omitempty"`
- OnReboot string `xml:"on_reboot,omitempty"`
- OnCrash string `xml:"on_crash,omitempty"`
- Devices *DomainDeviceList `xml:"devices"`
+ XMLName xml.Name `xml:"domain"`
+ Type string `xml:"type,attr,omitempty"`
+ Name string `xml:"name"`
+ UUID string `xml:"uuid,omitempty"`
+ Memory *DomainMemory `xml:"memory"`
+ CurrentMemory *DomainMemory `xml:"currentMemory"`
+ MaximumMemory *DomainMaxMemory `xml:"maxMemory"`
+ MemoryBacking *DomainMemoryBacking `xml:"memoryBacking"`
+ VCPU *DomainVCPU `xml:"vcpu"`
+ CPUTune *DomainCPUTune `xml:"cputune"`
+ Resource *DomainResource `xml:"resource"`
+ SysInfo *DomainSysInfo `xml:"sysinfo"`
+ OS *DomainOS `xml:"os"`
+ Features *DomainFeatureList `xml:"features"`
+ CPU *DomainCPU `xml:"cpu"`
+ Clock *DomainClock `xml:"clock,omitempty"`
+ OnPoweroff string `xml:"on_poweroff,omitempty"`
+ OnReboot string `xml:"on_reboot,omitempty"`
+ OnCrash string `xml:"on_crash,omitempty"`
+ Devices *DomainDeviceList `xml:"devices"`
QEMUCommandline *DomainQEMUCommandline
}

func (d *Domain) Unmarshal(doc string) error {
28 changes: 22 additions & 6 deletions pkg/libvirttools/TestContainerLifecycle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
"SMM": null
},
"CPU": null,
"Clock": null,
"OnPoweroff": "destroy",
"OnReboot": "restart",
"OnCrash": "restart",
Expand Down Expand Up @@ -224,7 +225,8 @@
"Type": "qcow2",
"Cache": "",
"IO": "",
"ErrorPolicy": ""
"ErrorPolicy": "",
"Discard": ""
},
"Auth": null,
"Source": {
Expand All @@ -241,6 +243,7 @@
"Dev": "sda",
"Bus": "scsi"
},
"IOTune": null,
"Serial": "",
"ReadOnly": null,
"Shareable": null,
Expand All @@ -255,7 +258,8 @@
"Target": 0,
"Unit": 0
},
"Boot": null
"Boot": null,
"WWN": ""
},
{
"XMLName": {
Expand All @@ -270,7 +274,8 @@
"Type": "raw",
"Cache": "",
"IO": "",
"ErrorPolicy": ""
"ErrorPolicy": "",
"Discard": ""
},
"Auth": null,
"Source": {
Expand All @@ -287,6 +292,7 @@
"Dev": "sdb",
"Bus": "scsi"
},
"IOTune": null,
"Serial": "",
"ReadOnly": {},
"Shareable": null,
Expand All @@ -301,7 +307,8 @@
"Target": 0,
"Unit": 1
},
"Boot": null
"Boot": null,
"WWN": ""
}
],
"Filesystems": null,
Expand Down Expand Up @@ -351,6 +358,10 @@
],
"Graphics": [
{
"XMLName": {
"Space": "",
"Local": ""
},
"Type": "vnc",
"AutoPort": "",
"Port": -1,
Expand Down Expand Up @@ -390,9 +401,14 @@
],
"Channels": null,
"MemBalloon": null,
"Sounds": null
"Sounds": null,
"RNGs": null
},
"CMDLine": {
"QEMUCommandline": {
"XMLName": {
"Space": "",
"Local": ""
},
"Args": null,
"Envs": [
{
Expand Down
35 changes: 27 additions & 8 deletions pkg/libvirttools/TestDomainDefinitions__ceph_flexvolume.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
"SMM": null
},
"CPU": null,
"Clock": null,
"OnPoweroff": "destroy",
"OnReboot": "restart",
"OnCrash": "restart",
Expand Down Expand Up @@ -243,7 +244,8 @@
"Type": "qcow2",
"Cache": "",
"IO": "",
"ErrorPolicy": ""
"ErrorPolicy": "",
"Discard": ""
},
"Auth": null,
"Source": {
Expand All @@ -260,6 +262,7 @@
"Dev": "sda",
"Bus": "scsi"
},
"IOTune": null,
"Serial": "",
"ReadOnly": null,
"Shareable": null,
Expand All @@ -274,7 +277,8 @@
"Target": 0,
"Unit": 0
},
"Boot": null
"Boot": null,
"WWN": ""
},
{
"XMLName": {
Expand All @@ -289,7 +293,8 @@
"Type": "raw",
"Cache": "",
"IO": "",
"ErrorPolicy": ""
"ErrorPolicy": "",
"Discard": ""
},
"Auth": {
"Username": "libvirt",
Expand Down Expand Up @@ -320,6 +325,7 @@
"Dev": "sdb",
"Bus": "scsi"
},
"IOTune": null,
"Serial": "",
"ReadOnly": null,
"Shareable": null,
Expand All @@ -334,7 +340,8 @@
"Target": 0,
"Unit": 1
},
"Boot": null
"Boot": null,
"WWN": ""
},
{
"XMLName": {
Expand All @@ -349,7 +356,8 @@
"Type": "raw",
"Cache": "",
"IO": "",
"ErrorPolicy": ""
"ErrorPolicy": "",
"Discard": ""
},
"Auth": null,
"Source": {
Expand All @@ -366,6 +374,7 @@
"Dev": "sdc",
"Bus": "scsi"
},
"IOTune": null,
"Serial": "",
"ReadOnly": {},
"Shareable": null,
Expand All @@ -380,7 +389,8 @@
"Target": 0,
"Unit": 2
},
"Boot": null
"Boot": null,
"WWN": ""
}
],
"Filesystems": null,
Expand Down Expand Up @@ -430,6 +440,10 @@
],
"Graphics": [
{
"XMLName": {
"Space": "",
"Local": ""
},
"Type": "vnc",
"AutoPort": "",
"Port": -1,
Expand Down Expand Up @@ -469,9 +483,14 @@
],
"Channels": null,
"MemBalloon": null,
"Sounds": null
"Sounds": null,
"RNGs": null
},
"CMDLine": {
"QEMUCommandline": {
"XMLName": {
"Space": "",
"Local": ""
},
"Args": null,
"Envs": [
{
Expand Down
Loading