Makefile

@@ -141,7 +141,7 @@ $(BZIMAGE_TEST): can_upgrade is_root
 	cp "$(BZIMAGE)" "$@"
 
 _virsh_test: $(BZIMAGE_TEST) can_upgrade is_root
-	@$(VIRSH_TEST_SCRIPT) "$(TEST_VM_HOSTNAME)" "$(VERSION)" "$(TEST_VM_NAME)" || {\
+	@$(VIRSH_TEST_SCRIPT) "$(TEST_VM_HOSTNAME)" "$(VERSION)" "$(TEST_VM_NAME)" "$(TEST_VM_IFNAME)" "$(TEST_VM_IPV4)" "$(TEST_VM_IPV6)" || {\
 		echo "$(CRED)Kernel $(VERSION) [Error]$(CRAZ): Check /tmp/test_vz5_expect.log" >&2;\
 		false;\
 	} && echo "$(CGRN)Kernel $(VERSION) [OK]$(CRAZ): console logs in /tmp/test_vz5_expect.log" >&2;

config.mk.inc

@@ -9,3 +9,8 @@ TEST_VM_HOSTNAME=test
 BZIMAGE_TEST=/srv/tftpd/boot/bzImageTest
 # virsh test vm name
 TEST_VM_NAME=test
+# test vm ifname
+TEST_VM_IFNAME=enp1s0
+# test vm ips
+TEST_VM_IPV4=10.0.2.42
+TEST_VM_IPV6=fe80::42

scripts/test_libvirt.expect

@@ -6,6 +6,9 @@ namespace eval VZ5 {
 	variable KVER "[lindex $argv 1]"
 }
 variable VMNAME "[lindex $argv 2]"
+variable VM_IFNAME "[lindex $argv 3]"
+variable VM_IPV4 "[lindex $argv 4]"
+variable VM_IPV6 "[lindex $argv 5]"
 
 set where [file dirname [info script]]
 source [file join $where testlib.expect]
@@ -37,7 +40,8 @@ test_base
 test_kernel_version $::VZ5::KVER
 test_swap
 test_ssh
-test_vz5_netconfig
+test_netconfig_ipv4 "$VM_IFNAME" "$VM_IPV4"
+test_netconfig_ipv6 "$VM_IFNAME" "$VM_IPV6"
 test_ping
 test_vda_rw
 test_apt

scripts/testlib.expect

@@ -51,20 +51,24 @@ proc login {} {
 	if { [exp_pid] == 0 } { destroy }
 	set timeout 15
 	expect "Console: " { termconfig } timeout destroy
-	expect {
-		"$::VZ5::HOSTNAME login:" {}
-		"FAIL" {
-			expect "\r"
-			expect "\r" {
-				sleep 2;
-				expect "login:" {
-					send "root\r";
-					vm_stty;
-					debug_interact;
+	if {[catch {
+		expect {
+			"$::VZ5::HOSTNAME login:" {}
+			"FAIL" {
+				expect "\r"
+				expect "\r" {
+					sleep 2;
+					expect "login:" {
+						send "root\r";
+						vm_stty;
+						debug_interact;
+					} timeout destroy
 				} timeout destroy
-			} timeout destroy
+			}
+			timeout destroy
 		}
-		timeout destroy
+	} err]} {
+		destroy
 	}
 	set timeout 5
 	if {[catch {send "root\r"} err]} {
@@ -132,15 +136,20 @@ proc test_ssh {} {
 
 }
 
-# Check for vz5 network address configuration
-proc test_vz5_netconfig {} {
-	set timeout 3
-	expect {
-		"[prompt]" { send "ip a\r" }
-		"2: enp1s0: <BROADCAST,MULTICAST,UP,LOWER_UP>" {} timeout abort
-		"inet 192.168.242." {} timeout abort
-		"inet6 2001:41d0:203:10ae:1312::" {} timeout abort
-	}
+# Check that given ifname has given IP (prefix, 10.0.2. will match 10.0.2.42)
+proc test_netconfig_ipv4 {ifname ip_prefix} {
+	set timeout 2
+	expect "[prompt]" { send "ip addr show $ifname\r" } timeout abort
+	expect ": $ifname: <BROADCAST,MULTICAST,UP,LOWER_UP>" {} timeout abort
+	expect "inet $ip_prefix" {} timeout abort
+}
+
+# Check that given ifname has given Ip (prefix, fe80:: will match fe80::1312)
+proc test_netconfig_ipv6 {ifname ip6_prefix} {
+	set timeout 5
+	expect "[prompt]" { send "ip a show $ifname\r" } timeout abort
+	expect ": $ifname: <BROADCAST,MULTICAST,UP,LOWER_UP>" {} timeout abort
+	expect "inet6 $ip6_prefix" {} timeout abort
 }
 
 # Testing that apt runs