tests: qemumigparamsdata: Drop deprecated fields

Migration compression parameters 'compress-level', 'compress-threads',
'decompress-threads' were deprecated by qemu. Drop them from the tests.

Note that the migration code automatically checks whether given
capability is supported by qemu and thus we don't need to add any
further code to prepare for the legacy compression to be dropped.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemumigparamsdata/basic.json b/tests/qemumigparamsdata/basic.json
index b810d7cc87146e858e84dccea299c9d79dad3e86..9dae86fcbcdcf5fbdce9086220850bfff91edf04 100644 (file)
--- a/tests/qemumigparamsdata/basic.json
+++ b/tests/qemumigparamsdata/basic.json
@@ -1,7 +1,4 @@
 {
-  "compress-level": 1,
-  "compress-threads": 8,
-  "decompress-threads": 2,
   "cpu-throttle-initial": 20,
   "cpu-throttle-increment": 10,
   "max-bandwidth": 33554432,

diff --git a/tests/qemumigparamsdata/basic.reply b/tests/qemumigparamsdata/basic.reply
index dd8c5287a54c4ffc1f9987d3288e3829ee710807..e9c3c4714e46a4b2a878222494f612615c4d8cce 100644 (file)
--- a/tests/qemumigparamsdata/basic.reply
+++ b/tests/qemumigparamsdata/basic.reply
@@ -1,10 +1,7 @@
 {
   "id": "libvirt-1",
   "return": {
-    "decompress-threads": 2,
     "cpu-throttle-increment": 10,
-    "compress-threads": 8,
-    "compress-level": 1,
     "cpu-throttle-initial": 20,
     "max-bandwidth": 33554432,
     "downtime-limit": 300

diff --git a/tests/qemumigparamsdata/basic.xml b/tests/qemumigparamsdata/basic.xml
index 2ca532eff5a0537653a215b5958a4b1f9d8f15eb..e8af42dff51cfe1467ad3e22002dbd6033ba4073 100644 (file)
--- a/tests/qemumigparamsdata/basic.xml
+++ b/tests/qemumigparamsdata/basic.xml
@@ -1,8 +1,5 @@
 <test>
   <migParams>
-    <param name='compress-level' value='1'/>
-    <param name='compress-threads' value='8'/>
-    <param name='decompress-threads' value='2'/>
     <param name='cpu-throttle-initial' value='20'/>
     <param name='cpu-throttle-increment' value='10'/>
     <param name='max-bandwidth' value='33554432'/>

diff --git a/tests/qemumigparamsdata/tls-enabled.json b/tests/qemumigparamsdata/tls-enabled.json
index d42684a9de8eb4966bbc270f97a6e88dad82169f..098d3ae1480f71ef326202d978c9694a0b341b14 100644 (file)
--- a/tests/qemumigparamsdata/tls-enabled.json
+++ b/tests/qemumigparamsdata/tls-enabled.json
@@ -1,7 +1,4 @@
 {
-  "compress-level": 1,
-  "compress-threads": 8,
-  "decompress-threads": 2,
   "cpu-throttle-initial": 20,
   "cpu-throttle-increment": 10,
   "tls-creds": "objlibvirt_migrate_tls0",

diff --git a/tests/qemumigparamsdata/tls-enabled.reply b/tests/qemumigparamsdata/tls-enabled.reply
index 001241b07534d1bcde9a9e955adfd90e7d6d9690..e3ce8e77785e759e425a2ce36983da73b8c93c06 100644 (file)
--- a/tests/qemumigparamsdata/tls-enabled.reply
+++ b/tests/qemumigparamsdata/tls-enabled.reply
@@ -1,11 +1,8 @@
 {
   "id": "libvirt-1",
   "return": {
-    "decompress-threads": 2,
     "cpu-throttle-increment": 10,
-    "compress-threads": 8,
     "tls-hostname": "",
-    "compress-level": 1,
     "cpu-throttle-initial": 20,
     "tls-creds": "objlibvirt_migrate_tls0",
     "max-bandwidth": 33554432,

diff --git a/tests/qemumigparamsdata/tls-enabled.xml b/tests/qemumigparamsdata/tls-enabled.xml
index 3e60c4dec37d576d8e5f92a87bda2327cf3e1aa2..554b6855d4d13f847485bccfab3ba2c23a38bead 100644 (file)
--- a/tests/qemumigparamsdata/tls-enabled.xml
+++ b/tests/qemumigparamsdata/tls-enabled.xml
@@ -1,8 +1,5 @@
 <test>
   <migParams>
-    <param name='compress-level' value='1'/>
-    <param name='compress-threads' value='8'/>
-    <param name='decompress-threads' value='2'/>
     <param name='cpu-throttle-initial' value='20'/>
     <param name='cpu-throttle-increment' value='10'/>
     <param name='tls-creds' value='objlibvirt_migrate_tls0'/>

diff --git a/tests/qemumigparamsdata/tls-hostname.json b/tests/qemumigparamsdata/tls-hostname.json
index abbd9f124b549bcd9ad7114dcd30b4bcf2bbd66b..2943df769b476947fe18a7de1d2229f0dcc48376 100644 (file)
--- a/tests/qemumigparamsdata/tls-hostname.json
+++ b/tests/qemumigparamsdata/tls-hostname.json
@@ -1,7 +1,4 @@
 {
-  "compress-level": 1,
-  "compress-threads": 8,
-  "decompress-threads": 2,
   "cpu-throttle-initial": 20,
   "cpu-throttle-increment": 10,
   "tls-creds": "objlibvirt_migrate_tls0",

diff --git a/tests/qemumigparamsdata/tls-hostname.reply b/tests/qemumigparamsdata/tls-hostname.reply
index 74f069f7807e953e6196037637786303fb95cc58..f7e7a96bc5223c85e351e59e31284e8de456b723 100644 (file)
--- a/tests/qemumigparamsdata/tls-hostname.reply
+++ b/tests/qemumigparamsdata/tls-hostname.reply
@@ -1,11 +1,8 @@
 {
   "id": "libvirt-1",
   "return": {
-    "decompress-threads": 2,
     "cpu-throttle-increment": 10,
-    "compress-threads": 8,
     "tls-hostname": "f27-1.virt",
-    "compress-level": 1,
     "cpu-throttle-initial": 20,
     "tls-creds": "objlibvirt_migrate_tls0",
     "max-bandwidth": 33554432,

diff --git a/tests/qemumigparamsdata/tls-hostname.xml b/tests/qemumigparamsdata/tls-hostname.xml
index 4310e789a03ba8a34b4e0878ad0a14c5b4684fca..addb5e68a4a5638b9f033e1f614cad3e9c2e4999 100644 (file)
--- a/tests/qemumigparamsdata/tls-hostname.xml
+++ b/tests/qemumigparamsdata/tls-hostname.xml
@@ -1,8 +1,5 @@
 <test>
   <migParams>
-    <param name='compress-level' value='1'/>
-    <param name='compress-threads' value='8'/>
-    <param name='decompress-threads' value='2'/>
     <param name='cpu-throttle-initial' value='20'/>
     <param name='cpu-throttle-increment' value='10'/>
     <param name='tls-creds' value='objlibvirt_migrate_tls0'/>

diff --git a/tests/qemumigparamsdata/tls.json b/tests/qemumigparamsdata/tls.json
index 02e90c60ea94bd5da31b4c7da172fbfaf399eaae..2bfd4a2635517c4d9caf19278d4d2d601aa2dc73 100644 (file)
--- a/tests/qemumigparamsdata/tls.json
+++ b/tests/qemumigparamsdata/tls.json
@@ -1,7 +1,4 @@
 {
-  "compress-level": 1,
-  "compress-threads": 8,
-  "decompress-threads": 2,
   "cpu-throttle-initial": 20,
   "cpu-throttle-increment": 10,
   "tls-creds": "",

diff --git a/tests/qemumigparamsdata/tls.reply b/tests/qemumigparamsdata/tls.reply
index 591eca692607eab5ef067dbc465b6d67b247e78e..cd5bb26cca666f8050ec95000d0a01f49764600f 100644 (file)
--- a/tests/qemumigparamsdata/tls.reply
+++ b/tests/qemumigparamsdata/tls.reply
@@ -1,11 +1,8 @@
 {
   "id": "libvirt-1",
   "return": {
-    "decompress-threads": 2,
     "cpu-throttle-increment": 10,
-    "compress-threads": 8,
     "tls-hostname": "",
-    "compress-level": 1,
     "cpu-throttle-initial": 20,
     "tls-creds": "",
     "max-bandwidth": 33554432,

diff --git a/tests/qemumigparamsdata/tls.xml b/tests/qemumigparamsdata/tls.xml
index 71e5bbb7cbad1d3ee0259f5922e4b7be55cb6be9..37ea8e90ecdb87d2c8c0c1bd1ee7457172531d84 100644 (file)
--- a/tests/qemumigparamsdata/tls.xml
+++ b/tests/qemumigparamsdata/tls.xml
@@ -1,8 +1,5 @@
 <test>
   <migParams>
-    <param name='compress-level' value='1'/>
-    <param name='compress-threads' value='8'/>
-    <param name='decompress-threads' value='2'/>
     <param name='cpu-throttle-initial' value='20'/>
     <param name='cpu-throttle-increment' value='10'/>
     <param name='tls-creds' value=''/>