External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: update LXC config dataset to support V3 indexes

Browse Source 
LXC version 3 config files are still using network old style definition.
So, as LXC supports it now, they can be converted to use this new
definition.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Julio Faracco 2020-02-02 22:28:35 -03:00 committed by Michal Privoznik
parent 6cf9577498
commit 2245287cbe
8 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/lxcconf2xmldata/lxcconf2xml-ethernet-v3.config
View File

@ -1,14 +1,14 @@
# Template used to create this container: opensuse # Template used to create this container: opensuse
# Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
lxc.network.type = veth lxc.net.0.type = veth
lxc.network.flags = up lxc.net.0.flags = up
lxc.network.hwaddr = 02:00:15:8f:05:c1 lxc.net.0.hwaddr = 02:00:15:8f:05:c1
lxc.network.name = eth0 lxc.net.0.name = eth0
lxc.network.ipv4 = 192.168.122.2/24 lxc.net.0.ipv4 = 192.168.122.2/24
lxc.network.ipv4.gateway = 192.168.122.1 lxc.net.0.ipv4.gateway = 192.168.122.1
lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64 lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595 lxc.net.0.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595
#remove next line if host DNS configuration should not be available to container #remove next line if host DNS configuration should not be available to container
lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0

10
tests/lxcconf2xmldata/lxcconf2xml-fstab-v3.config
View File

@ -1,11 +1,11 @@
# Template used to create this container: opensuse # Template used to create this container: opensuse
# Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
lxc.network.type = veth lxc.net.0.type = veth
lxc.network.flags = up lxc.net.0.flags = up
lxc.network.link = virbr0 lxc.net.0.link = virbr0
lxc.network.hwaddr = 02:00:15:8f:05:c1 lxc.net.0.hwaddr = 02:00:15:8f:05:c1
lxc.network.name = eth0 lxc.net.0.name = eth0
#remove next line if host DNS configuration should not be available to container #remove next line if host DNS configuration should not be available to container
lxc.mount.fstab = /var/lib/lxc/migrate_test/fstab lxc.mount.fstab = /var/lib/lxc/migrate_test/fstab

10
tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork-v3.config
View File

@ -1,11 +1,11 @@
# Template used to create this container: opensuse # Template used to create this container: opensuse
# Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
lxc.network.type = macvlan lxc.net.0.type = macvlan
lxc.network.flags = up lxc.net.0.flags = up
lxc.network.link = eth0 lxc.net.0.link = eth0
lxc.network.hwaddr = 02:00:15:8f:05:c1 lxc.net.0.hwaddr = 02:00:15:8f:05:c1
lxc.network.macvlan.mode = vepa lxc.net.0.macvlan.mode = vepa
#remove next line if host DNS configuration should not be available to container #remove next line if host DNS configuration should not be available to container
lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs

34
tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config
View File

@ -1,22 +1,22 @@
lxc.network.type = phys lxc.net.0.type = phys
lxc.network.link = eth0 lxc.net.0.link = eth0
lxc.network.name = eth1 lxc.net.0.name = eth1
lxc.network.ipv4 = 192.168.122.2/24 lxc.net.0.ipv4 = 192.168.122.2/24
lxc.network.ipv4.gateway = 192.168.122.1 lxc.net.0.ipv4.gateway = 192.168.122.1
lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64 lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595 lxc.net.0.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595
lxc.network.type = vlan lxc.net.1.type = vlan
lxc.network.flags = up lxc.net.1.flags = up
lxc.network.link = eth0 lxc.net.1.link = eth0
lxc.network.hwaddr = 02:00:15:8f:05:c1 lxc.net.1.hwaddr = 02:00:15:8f:05:c1
lxc.network.vlan.id = 2 lxc.net.1.vlan.id = 2
lxc.network.type = macvlan lxc.net.2.type = macvlan
lxc.network.flags = up lxc.net.2.flags = up
lxc.network.link = eth0 lxc.net.2.link = eth0
lxc.network.hwaddr = 02:00:15:8f:05:c1 lxc.net.2.hwaddr = 02:00:15:8f:05:c1
lxc.network.macvlan.mode = vepa lxc.net.2.macvlan.mode = vepa
lxc.rootfs = /var/lib/lxc/migrate_test/rootfs lxc.rootfs = /var/lib/lxc/migrate_test/rootfs
lxc.utsname = migrate_test lxc.utsname = migrate_test

2
tests/lxcconf2xmldata/lxcconf2xml-nonenetwork-v3.config
View File

@ -1,4 +1,4 @@
lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs
lxc.uts.name = migrate_test lxc.uts.name = migrate_test
lxc.autodev=1 lxc.autodev=1
lxc.network.type = none lxc.net.0.type = none

14
tests/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config
View File

@ -1,10 +1,10 @@
lxc.network.type = phys lxc.net.0.type = phys
lxc.network.link = eth0 lxc.net.0.link = eth0
lxc.network.name = eth1 lxc.net.0.name = eth1
lxc.network.ipv4 = 192.168.122.2/24 lxc.net.0.ipv4 = 192.168.122.2/24
lxc.network.ipv4.gateway = 192.168.122.1 lxc.net.0.ipv4.gateway = 192.168.122.1
lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64 lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595 lxc.net.0.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595
lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs
lxc.uts.name = migrate_test lxc.uts.name = migrate_test

18
tests/lxcconf2xmldata/lxcconf2xml-simple-v3.config
View File

@ -1,15 +1,15 @@
# Template used to create this container: opensuse # Template used to create this container: opensuse
# Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
lxc.network.type = veth lxc.net.0.type = veth
lxc.network.flags = up lxc.net.0.flags = up
lxc.network.link = virbr0 lxc.net.0.link = virbr0
lxc.network.hwaddr = 02:00:15:8f:05:c1 lxc.net.0.hwaddr = 02:00:15:8f:05:c1
lxc.network.name = eth0 lxc.net.0.name = eth0
lxc.network.ipv4 = 192.168.122.2/24 lxc.net.0.ipv4 = 192.168.122.2/24
lxc.network.ipv4.gateway = 192.168.122.1 lxc.net.0.ipv4.gateway = 192.168.122.1
lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64 lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595 lxc.net.0.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595
#remove next line if host DNS configuration should not be available to container #remove next line if host DNS configuration should not be available to container
lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0

10
tests/lxcconf2xmldata/lxcconf2xml-vlannetwork-v3.config
View File

@ -1,11 +1,11 @@
# Template used to create this container: opensuse # Template used to create this container: opensuse
# Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
lxc.network.type = vlan lxc.net.1.type = vlan
lxc.network.flags = up lxc.net.1.flags = up
lxc.network.link = eth0 lxc.net.1.link = eth0
lxc.network.hwaddr = 02:00:15:8f:05:c1 lxc.net.1.hwaddr = 02:00:15:8f:05:c1
lxc.network.vlan.id = 2 lxc.net.1.vlan.id = 2
lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs
lxc.uts.name = migrate_test lxc.uts.name = migrate_test