8:27 p.m.
---
changed in v2:
- add tests for xenconfig driver too
---
tests/libxlxml2domconfigdata/multiple-ip.json | 37 +++++++++++++++-
tests/libxlxml2domconfigdata/multiple-ip.xml | 22 +++++++++-
tests/libxlxml2domconfigtest.c | 1 +-
tests/xlconfigdata/test-vif-multi-ip.cfg | 25 ++++++++++-
tests/xlconfigdata/test-vif-multi-ip.xml | 48 ++++++++++++++++++++-
tests/xlconfigtest.c | 1 +-
6 files changed, 134 insertions(+)
create mode 100644 tests/libxlxml2domconfigdata/multiple-ip.json
create mode 100644 tests/libxlxml2domconfigdata/multiple-ip.xml
create mode 100644 tests/xlconfigdata/test-vif-multi-ip.cfg
create mode 100644 tests/xlconfigdata/test-vif-multi-ip.xml
diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json
b/tests/libxlxml2domconfigdata/multiple-ip.json
new file mode 100644
index 0000000..4aff61d
--- /dev/null
+++ b/tests/libxlxml2domconfigdata/multiple-ip.json
@@ -0,0 +1,37 @@
+{
+ "c_info": {
+ "type": "pv",
+ "name": "test-pv",
+ "uuid": "039e9ee6-4a84-3055-4c81-8ba426ae2656"
+ },
+ "b_info": {
+ "max_vcpus": 4,
+ "avail_vcpus": [
+ 0,
+ 1,
+ 2,
+ 3
+ ],
+ "max_memkb": 524288,
+ "target_memkb": 524288,
+ "sched_params": {
+ "weight": 1000
+ },
+ "type.pv": {
+ "bootloader": "pygrub"
+ },
+ "arch_arm": {
+
+ }
+ },
+ "nics": [
+ {
+ "devid": 0,
+ "mac": "00:16:3e:3e:86:60",
+ "ip": "10.0.0.1 2000:abcd::1",
+ "script": "/etc/xen/scripts/vif-bridge",
+ "nictype": "vif"
+ }
+ ],
+ "on_reboot": "restart"
+}
diff --git a/tests/libxlxml2domconfigdata/multiple-ip.xml
b/tests/libxlxml2domconfigdata/multiple-ip.xml
new file mode 100644
index 0000000..5188935
--- /dev/null
+++ b/tests/libxlxml2domconfigdata/multiple-ip.xml
@@ -0,0 +1,22 @@
+<domain type='xen'>
+ <name>test-pv</name>
+ <uuid>039e9ee6-4a84-3055-4c81-8ba426ae2656</uuid>
+ <memory>524288</memory>
+ <currentMemory>524288</currentMemory>
+ <vcpu>4</vcpu>
+ <os>
+ <type arch='x86_64' machine='xenpv'>linux</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <interface type='ethernet'>
+ <ip address='10.0.0.1' family='ipv4'/>
+ <ip address='2000:abcd::1' family='ipv6'/>
+ <mac address='00:16:3e:3e:86:60'/>
+ <script path='/etc/xen/scripts/vif-bridge'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index c8379f1..bd4c3af 100644
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -190,6 +190,7 @@ mymain(void)
DO_TEST("basic-hvm");
DO_TEST("moredevs-hvm");
DO_TEST("vnuma-hvm");
+ DO_TEST("multiple-ip");
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
diff --git a/tests/xlconfigdata/test-vif-multi-ip.cfg
b/tests/xlconfigdata/test-vif-multi-ip.cfg
new file mode 100644
index 0000000..4a5d37f
--- /dev/null
+++ b/tests/xlconfigdata/test-vif-multi-ip.cfg
@@ -0,0 +1,25 @@
+name = "XenGuest2"
+uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
+maxmem = 579
+memory = 394
+vcpus = 1
+pae = 1
+acpi = 1
+apic = 1
+viridian = 0
+rtc_timeoffset = 0
+localtime = 0
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
+sdl = 0
+vnc = 1
+vncunused = 1
+vnclisten = "127.0.0.1"
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,ip=10.0.0.1 10.1.1.1
2000::1,script=vif-bridge,type=vif" ]
+parallel = "none"
+serial = "none"
+builder = "hvm"
+boot = "d"
+disk = [
"format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2" ]
diff --git a/tests/xlconfigdata/test-vif-multi-ip.xml
b/tests/xlconfigdata/test-vif-multi-ip.xml
new file mode 100644
index 0000000..7e831cf
--- /dev/null
+++ b/tests/xlconfigdata/test-vif-multi-ip.xml
@@ -0,0 +1,48 @@
+<domain type='xen'>
+ <name>XenGuest2</name>
+ <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>592896</memory>
+ <currentMemory unit='KiB'>403456</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64' machine='xenfv'>hvm</type>
+ <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
+ <boot dev='cdrom'/>
+ </os>
+ <features>
+ <acpi/>
+ <apic/>
+ <pae/>
+ </features>
+ <clock offset='variable' adjustment='0' basis='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>restart</on_crash>
+ <devices>
+ <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
+ <disk type='block' device='disk'>
+ <driver name='phy' type='raw'/>
+ <source dev='/dev/HostVG/XenGuest2'/>
+ <target dev='hda' bus='ide'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
+ </disk>
+ <controller type='ide' index='0'/>
+ <interface type='bridge'>
+ <mac address='00:16:3e:66:92:9c'/>
+ <source bridge='xenbr1'/>
+ <ip address='10.0.0.1' family='ipv4'/>
+ <ip address='10.1.1.1' family='ipv4'/>
+ <ip address='2000::1' family='ipv6'/>
+ <script path='vif-bridge'/>
+ <model type='netfront'/>
+ </interface>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc' port='-1' autoport='yes'
listen='127.0.0.1'>
+ <listen type='address' address='127.0.0.1'/>
+ </graphics>
+ <video>
+ <model type='cirrus' vram='8192' heads='1'
primary='yes'/>
+ </video>
+ </devices>
+</domain>
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index e6fdfe8..57a0a67 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -298,6 +298,7 @@ mymain(void)
DO_TEST_FORMAT("fullvirt-direct-kernel-boot-bogus-extra", false);
#endif
DO_TEST("vif-typename");
+ DO_TEST("vif-multi-ip");
DO_TEST("usb");
DO_TEST("usbctrl");
--
git-series 0.9.1