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>

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:

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"

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>

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:

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"

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>

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:

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",

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>

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:

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",

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>

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:

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",

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>

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:

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",

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>

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:

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",

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>

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:

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"

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>

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:

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"

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>

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:

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"

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>

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:

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"

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>