Now, it is time to use the new pattern for LXC 3.X inside config test
cases. In the past, we kept the old style to keep all functionalities.
Now, it is possible to use indexes properly.

Signed-off-by: Julio Faracco <jcfara...@gmail.com>
---
 .../lxcconf2xml-ethernet-v3.config            | 16 ++++----
 .../lxcconf2xml-fstab-v3.config               | 10 ++---
 .../lxcconf2xml-macvlannetwork-v3.config      | 10 ++---
 .../lxcconf2xml-miscnetwork-v3.config         | 38 +++++++++----------
 .../lxcconf2xml-nonenetwork-v3.config         |  2 +-
 .../lxcconf2xml-physnetwork-v3.config         | 14 +++----
 .../lxcconf2xml-simple-v3.config              | 18 ++++-----
 .../lxcconf2xmldata/lxcconf2xml-simple.config | 18 ++++-----
 .../lxcconf2xml-vlannetwork-v3.config         | 10 ++---
 9 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/tests/lxcconf2xmldata/lxcconf2xml-ethernet-v3.config 
b/tests/lxcconf2xmldata/lxcconf2xml-ethernet-v3.config
index 630cb2ebb6..0a641549f3 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-ethernet-v3.config
+++ b/tests/lxcconf2xmldata/lxcconf2xml-ethernet-v3.config
@@ -1,14 +1,14 @@
 # Template used to create this container: opensuse
 # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
 
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.hwaddr = 02:00:15:8f:05:c1
-lxc.network.name = eth0
-lxc.network.ipv4 = 192.168.122.2/24
-lxc.network.ipv4.gateway = 192.168.122.1
-lxc.network.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.type = veth
+lxc.net.0.flags = up
+lxc.net.0.hwaddr = 02:00:15:8f:05:c1
+lxc.net.0.name = eth0
+lxc.net.0.ipv4 = 192.168.122.2/24
+lxc.net.0.ipv4.gateway = 192.168.122.1
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
+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
 lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-fstab-v3.config 
b/tests/lxcconf2xmldata/lxcconf2xml-fstab-v3.config
index 8b62818657..315ad45ad1 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-fstab-v3.config
+++ b/tests/lxcconf2xmldata/lxcconf2xml-fstab-v3.config
@@ -1,11 +1,11 @@
 # Template used to create this container: opensuse
 # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
 
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.link = virbr0
-lxc.network.hwaddr = 02:00:15:8f:05:c1
-lxc.network.name = eth0
+lxc.net.1.type = veth
+lxc.net.1.flags = up
+lxc.net.1.link = virbr0
+lxc.net.1.hwaddr = 02:00:15:8f:05:c1
+lxc.net.1.name = eth0
 
 #remove next line if host DNS configuration should not be available to 
container
 lxc.mount.fstab = /var/lib/lxc/migrate_test/fstab
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork-v3.config 
b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork-v3.config
index 631f07ecca..ab8d85361f 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork-v3.config
+++ b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork-v3.config
@@ -1,11 +1,11 @@
 # Template used to create this container: opensuse
 # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
 
-lxc.network.type = macvlan
-lxc.network.flags = up
-lxc.network.link = eth0
-lxc.network.hwaddr = 02:00:15:8f:05:c1
-lxc.network.macvlan.mode = vepa
+lxc.net.0.type = macvlan
+lxc.net.0.flags = up
+lxc.net.0.link = eth0
+lxc.net.0.hwaddr = 02:00:15:8f:05:c1
+lxc.net.0.macvlan.mode = vepa
 
 #remove next line if host DNS configuration should not be available to 
container
 lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config 
b/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config
index b46cb3ee7d..9be8cf95ea 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config
+++ b/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config
@@ -1,23 +1,23 @@
-lxc.network.type = phys
-lxc.network.link = eth0
-lxc.network.name = eth1
-lxc.network.ipv4 = 192.168.122.2/24
-lxc.network.ipv4.gateway = 192.168.122.1
-lxc.network.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.type = phys
+lxc.net.0.link = eth0
+lxc.net.0.name = eth1
+lxc.net.0.ipv4 = 192.168.122.2/24
+lxc.net.0.ipv4.gateway = 192.168.122.1
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
+lxc.net.0.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595
 
-lxc.network.type = vlan
-lxc.network.flags = up
-lxc.network.link = eth0
-lxc.network.hwaddr = 02:00:15:8f:05:c1
-lxc.network.vlan.id = 2
+lxc.net.1.type = vlan
+lxc.net.1.flags = up
+lxc.net.1.link = eth0
+lxc.net.1.hwaddr = 02:00:15:8f:05:c1
+lxc.net.1.vlan.id = 2
 
-lxc.network.type = macvlan
-lxc.network.flags = up
-lxc.network.link = eth0
-lxc.network.hwaddr = 02:00:15:8f:05:c1
-lxc.network.macvlan.mode = vepa
+lxc.net.2.type = macvlan
+lxc.net.2.flags = up
+lxc.net.2.link = eth0
+lxc.net.2.hwaddr = 02:00:15:8f:05:c1
+lxc.net.2.macvlan.mode = vepa
 
-lxc.rootfs = /var/lib/lxc/migrate_test/rootfs
-lxc.utsname = migrate_test
+lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs
+lxc.uts.name = migrate_test
 lxc.autodev=1
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork-v3.config 
b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork-v3.config
index f81a786f1e..2402723d9e 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork-v3.config
+++ b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork-v3.config
@@ -1,4 +1,4 @@
 lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs
 lxc.uts.name = migrate_test
 lxc.autodev=1
-lxc.network.type = none
+lxc.net.0.type = none
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config 
b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config
index 92729841d7..23f9d78dbd 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config
+++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config
@@ -1,10 +1,10 @@
-lxc.network.type = phys
-lxc.network.link = eth0
-lxc.network.name = eth1
-lxc.network.ipv4 = 192.168.122.2/24
-lxc.network.ipv4.gateway = 192.168.122.1
-lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
-lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595
+lxc.net.1.type = phys
+lxc.net.1.link = eth0
+lxc.net.1.name = eth1
+lxc.net.1.ipv4 = 192.168.122.2/24
+lxc.net.1.ipv4.gateway = 192.168.122.1
+lxc.net.1.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
+lxc.net.1.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595
 
 lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs
 lxc.uts.name = migrate_test
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple-v3.config 
b/tests/lxcconf2xmldata/lxcconf2xml-simple-v3.config
index a0036a482e..b0656571b2 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-simple-v3.config
+++ b/tests/lxcconf2xmldata/lxcconf2xml-simple-v3.config
@@ -1,15 +1,15 @@
 # Template used to create this container: opensuse
 # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
 
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.link = virbr0
-lxc.network.hwaddr = 02:00:15:8f:05:c1
-lxc.network.name = eth0
-lxc.network.ipv4 = 192.168.122.2/24
-lxc.network.ipv4.gateway = 192.168.122.1
-lxc.network.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.type = veth
+lxc.net.0.flags = up
+lxc.net.0.link = virbr0
+lxc.net.0.hwaddr = 02:00:15:8f:05:c1
+lxc.net.0.name = eth0
+lxc.net.0.ipv4 = 192.168.122.2/24
+lxc.net.0.ipv4.gateway = 192.168.122.1
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
+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
 lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple.config 
b/tests/lxcconf2xmldata/lxcconf2xml-simple.config
index 50a44bba95..a8429e4657 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-simple.config
+++ b/tests/lxcconf2xmldata/lxcconf2xml-simple.config
@@ -1,15 +1,15 @@
 # Template used to create this container: opensuse
 # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
 
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.link = virbr0
-lxc.network.hwaddr = 02:00:15:8f:05:c1
-lxc.network.name = eth0
-lxc.network.ipv4 = 192.168.122.2/24
-lxc.network.ipv4.gateway = 192.168.122.1
-lxc.network.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.type = veth
+lxc.net.0.flags = up
+lxc.net.0.link = virbr0
+lxc.net.0.hwaddr = 02:00:15:8f:05:c1
+lxc.net.0.name = eth0
+lxc.net.0.ipv4 = 192.168.122.2/24
+lxc.net.0.ipv4.gateway = 192.168.122.1
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
+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
 lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork-v3.config 
b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork-v3.config
index 31e26997dd..fb4539261f 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork-v3.config
+++ b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork-v3.config
@@ -1,11 +1,11 @@
 # Template used to create this container: opensuse
 # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef
 
-lxc.network.type = vlan
-lxc.network.flags = up
-lxc.network.link = eth0
-lxc.network.hwaddr = 02:00:15:8f:05:c1
-lxc.network.vlan.id = 2
+lxc.net.1.type = vlan
+lxc.net.1.flags = up
+lxc.net.1.link = eth0
+lxc.net.1.hwaddr = 02:00:15:8f:05:c1
+lxc.net.1.vlan.id = 2
 
 lxc.rootfs.path = /var/lib/lxc/migrate_test/rootfs
 lxc.uts.name = migrate_test
-- 
2.19.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Reply via email to