qemublocktest: Convert all 'gluster' instances to 'nbd' in 'xml2json' cases

Gluster will be deprecated in the upcoming qemu version thus we need to
replace the network protocol by something which will stay supported so
that we can keep the tests around.

Convert all cases referencing 'gluster' to 'nbd'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json
index f510c43edbcacbb1efc12492305ecef6350204c3..b32e2181dcebc88c3d782f0c1fa19272d66833eb 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json
@@ -36,16 +36,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml
index 610c091f3e45e8dd4536124e08d063a0fc3ecaa6..b5a868113be292e2b38ad1c4683c00ad072db1f0 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json
index e77421d372c54630d313e78cac5477b4b2f26ded..62189e7ea426d42f77705ab6a08a702f6118558e 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json
@@ -36,16 +36,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml
index ad84fab7202a301c3f03bc4d3a34ded438363334..dc8ace1b8a9d25bc3c6d56a0b48deec2fa9bb14f 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json
index 7a8d0686f6479347f960c7fa3e0e620515bba526..caf8928d37dae3b95be88e3f2bfb1b88cd479137 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml
index cf4197ea86f518389c4943e225426bad3a1ecc35..d7760613649672961b6dc85ebd5c7824d7c32cfb 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json
index 7a8d0686f6479347f960c7fa3e0e620515bba526..caf8928d37dae3b95be88e3f2bfb1b88cd479137 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml
index 240afa85d2324487a07841fea875d920aaceeaf6..308f0208889253e89c87dbcaf99aaf3c49fd0210 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json
index 15c8293f635632834658eda226c801a9d6e42274..58a83ad7cf1fb1cf3e4943cbf2794a2fe0d4cb8f 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml
index e18d33ce3c07d45e12f853556712e27d1cc77854..cfc5225acbebae3744616b477ee32b41d429d070 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json
index 5918eed73ff4b0deba1661e0d1a0e9ec83dd1aef..5124b0328c543be053c0794eb8e2989aacbb03cb 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml
index 7040388040d4ef5cf222291da88e85acc5efd5e2..407efe4b38c5fa4b297e9443e277e18fc85bea62 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json
index 5918eed73ff4b0deba1661e0d1a0e9ec83dd1aef..5124b0328c543be053c0794eb8e2989aacbb03cb 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml
index d2fe1b780b05b412c1562616a433b0fe8fa0949e..0b60a4987a160225a8b2b0f78ff573fd53420bc5 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json
index 6be2df9d1d1a0bb7d57e0db5364632f6b9787c65..c27233269baf13d58879e1e7ce6c20f6612a187e 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json
@@ -35,16 +35,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml
index eaf89d316a97fdf111d5eec57e8f5419209e05aa..5502f7d61277e4acb934a0aa6f11ae091f8dd74b 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json
index 27e6e5ab60a18bffe5b9683183695a19336f3c4c..1ec0b8fffc472323b346c7c74a378cdd5bbe3a26 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json
@@ -38,16 +38,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml
index 4638a78541af06364878a7e81eb5c3d857cec1ff..d783f8c5830631a3a0b89f5a737e25133375803a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json
index 63c5cd2799d14f7dbe94991f501d25162c00c5ae..315a17323a100fa7c5e2a063e2bf0fb3b7e9395e 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json
@@ -38,16 +38,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml
index b2d599fc6c717788daf8dce62d1547e7d11abeab..760440d16cabadaf8b2bbb6b1cb40baef716d844 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json
index 65a3773b972426aed745931756c20552ea679c6e..8549314e92b4259139bcb5a2bb5a5c5bd5990f2a 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json
index ac952c8acd210633def8d7d131b16f51d78c1b49..8557d4de929c47c9613437107d98a3fdc4f786ad 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json
@@ -37,16 +37,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"

diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml
index 68484991c11789d9f155df667d122233f49e4150..666b87b94f7ca5b40d2b230767d24b552e990a36 100644 (file)
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>