replication: fix regression tests

diff --git a/bin/test/replication_test5.log b/bin/test/replication_test5.log
index b365048e1bada56057ad403dfd9ec60e44ff6691..5c82af9eda379598b427966b200964653dcf6a09 100644 (file)
--- a/bin/test/replication_test5.log
+++ b/bin/test/replication_test5.log
@@ -1,6 +1,6 @@
 1000 job_900_to_node2: new job next_sync => 900
 1000 job_900_to_node2: start replication job
-1000 job_900_to_node2: guest => 900, type => qemu, running => 0
+1000 job_900_to_node2: guest => VM 900, running => 0
 1000 job_900_to_node2: volumes => local-zfs:vm-900-disk-1
 1000 job_900_to_node2: create snapshot '__replicate_job_900_to_node2_1000__' on local-zfs:vm-900-disk-1
 1000 job_900_to_node2: full sync 'local-zfs:vm-900-disk-1' (__replicate_job_900_to_node2_1000__)
@@ -9,7 +9,7 @@
 1000 job_900_to_node2: changed state last_node => node1, last_try => 1000, last_sync => 1000
 1000 job_900_to_node2: changed storeid list local-zfs
 1840 job_900_to_node2: start replication job
-1840 job_900_to_node2: guest => 900, type => qemu, running => 0
+1840 job_900_to_node2: guest => VM 900, running => 0
 1840 job_900_to_node2: volumes => local-zfs:vm-900-disk-1
 1840 job_900_to_node2: create snapshot '__replicate_job_900_to_node2_1840__' on local-zfs:vm-900-disk-1
 1840 job_900_to_node2: incremental sync 'local-zfs:vm-900-disk-1' (__replicate_job_900_to_node2_1000__ => __replicate_job_900_to_node2_1840__)
@@ -18,7 +18,7 @@
 1840 job_900_to_node2: changed config next_sync => 2700
 1840 job_900_to_node2: changed state last_try => 1840, last_sync => 1840
 2740 job_900_to_node2: start replication job
-2740 job_900_to_node2: guest => 900, type => qemu, running => 0
+2740 job_900_to_node2: guest => VM 900, running => 0
 2740 job_900_to_node2: volumes => local-zfs:vm-900-disk-1,local-zfs:vm-900-disk-2
 2740 job_900_to_node2: create snapshot '__replicate_job_900_to_node2_2740__' on local-zfs:vm-900-disk-1
 2740 job_900_to_node2: create snapshot '__replicate_job_900_to_node2_2740__' on local-zfs:vm-900-disk-2
@@ -27,7 +27,7 @@
 2740 job_900_to_node2: changed config next_sync => 3040
 2740 job_900_to_node2: changed state last_try => 2740, fail_count => 1, error => no such volid 'local-zfs:vm-900-disk-2'
 3040 job_900_to_node2: start replication job
-3040 job_900_to_node2: guest => 900, type => qemu, running => 0
+3040 job_900_to_node2: guest => VM 900, running => 0
 3040 job_900_to_node2: volumes => local-zfs:vm-900-disk-1,local-zfs:vm-900-disk-2
 3040 job_900_to_node2: create snapshot '__replicate_job_900_to_node2_3040__' on local-zfs:vm-900-disk-1
 3040 job_900_to_node2: create snapshot '__replicate_job_900_to_node2_3040__' on local-zfs:vm-900-disk-2
@@ -38,7 +38,7 @@
 3040 job_900_to_node2: changed config next_sync => 3600
 3040 job_900_to_node2: changed state last_try => 3040, last_sync => 3040, fail_count => 0, error => 
 3640 job_900_to_node2: start replication job
-3640 job_900_to_node2: guest => 900, type => qemu, running => 0
+3640 job_900_to_node2: guest => VM 900, running => 0
 3640 job_900_to_node2: volumes => local-zfs:vm-900-disk-1,local-zfs:vm-900-disk-2
 3640 job_900_to_node2: create snapshot '__replicate_job_900_to_node2_3640__' on local-zfs:vm-900-disk-1
 3640 job_900_to_node2: create snapshot '__replicate_job_900_to_node2_3640__' on local-zfs:vm-900-disk-2
@@ -50,7 +50,7 @@
 3640 job_900_to_node2: changed config next_sync => 4500
 3640 job_900_to_node2: changed state last_try => 3640, last_sync => 3640
 3700 job_900_to_node2: start replication job
-3700 job_900_to_node2: guest => 900, type => qemu, running => 0
+3700 job_900_to_node2: guest => VM 900, running => 0
 3700 job_900_to_node2: volumes => local-zfs:vm-900-disk-1,local-zfs:vm-900-disk-2
 3700 job_900_to_node2: start job removal - mode 'full'
 3700 job_900_to_node2: delete stale replication snapshot '__replicate_job_900_to_node2_3640__' on local-zfs:vm-900-disk-1

diff --git a/bin/test/replication_test6.log b/bin/test/replication_test6.log
index a58ad26d156e936cfd1737bce6c8e2bc31bac660..91754544581186e213d2a4d0d68234793b236744 100644 (file)
--- a/bin/test/replication_test6.log
+++ b/bin/test/replication_test6.log
@@ -1,6 +1,6 @@
 1000 job_900_to_node1: new job next_sync => 1
 1000 job_900_to_node1: start replication job
-1000 job_900_to_node1: guest => 900, type => qemu, running => 0
+1000 job_900_to_node1: guest => VM 900, running => 0
 1000 job_900_to_node1: volumes => local-zfs:vm-900-disk-1
 1000 job_900_to_node1: start job removal - mode 'full'
 1000 job_900_to_node1: job removed